Author: jannis Date: 2008-07-16 23:14:49 +0000 (Wed, 16 Jul 2008) New Revision: 27322
Modified: xfce4-settings/trunk/ChangeLog xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade xfce4-settings/trunk/dialogs/accessibility-settings/main.c xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade xfce4-settings/trunk/dialogs/display-settings/display-dialog.glade xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade xfce4-settings/trunk/dialogs/keyboard-settings/main.c xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade Log: * dialogs/accessibility-settings/accessibility-dialog.glade, dialogs/appearance-settings/appearance-dialog.glade, dialogs/display-settings/display-dialog.glade, dialogs/keyboard-settings/keyboard-dialog.glade, dialogs/mouse-settings/mouse-dialog.glade: Make all dialogs use consistent borders/paddings/distances etc. again. Please keep it this way when adding new dialogs/widgets. * dialogs/accesibility-settings/main.c, dialogs/keyboard-settings/main.c: Destroy GladeXML after the dialog is destroyed. Modified: xfce4-settings/trunk/ChangeLog =================================================================== --- xfce4-settings/trunk/ChangeLog 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/ChangeLog 2008-07-16 23:14:49 UTC (rev 27322) @@ -1,3 +1,16 @@ +2008-07-17 Jannis Pohlmann <[EMAIL PROTECTED]> + + * dialogs/accessibility-settings/accessibility-dialog.glade, + dialogs/appearance-settings/appearance-dialog.glade, + dialogs/display-settings/display-dialog.glade, + dialogs/keyboard-settings/keyboard-dialog.glade, + dialogs/mouse-settings/mouse-dialog.glade: Make all dialogs use + consistent borders/paddings/distances etc. again. Please keep it + this way when adding new dialogs/widgets. + * dialogs/accesibility-settings/main.c, + dialogs/keyboard-settings/main.c: Destroy GladeXML after the dialog + is destroyed. + 2008-07-16 Nick Schermer <[EMAIL PROTECTED]> * Mv xfce4-settings-helper/xkb.* xfce4-settings-helper/keyboards.*: Modified: xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade 2008-07-16 23:14:49 UTC (rev 27322) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Tue Jul 1 22:36:17 2008 --> +<!--Generated with glade3 3.4.5 on Thu Jul 17 01:05:41 2008 --> <glade-interface> <requires lib="xfce4"/> <widget class="XfceTitledDialog" id="accessibility-settings-dialog"> @@ -183,7 +183,7 @@ <child> <widget class="GtkVBox" id="vbox9"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="label6"> <property name="visible">True</property> @@ -309,7 +309,7 @@ <child> <widget class="GtkVBox" id="vbox10"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="label9"> <property name="visible">True</property> @@ -453,7 +453,7 @@ <child> <widget class="GtkVBox" id="vbox12"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="label7"> <property name="visible">True</property> @@ -524,7 +524,7 @@ <child> <widget class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="label16"> <property name="visible">True</property> @@ -596,7 +596,7 @@ <child> <widget class="GtkVBox" id="vbox14"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="label19"> <property name="visible">True</property> @@ -668,7 +668,7 @@ <child> <widget class="GtkVBox" id="vbox15"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child> <widget class="GtkLabel" id="label22"> <property name="visible">True</property> Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c =================================================================== --- xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-07-16 23:14:49 UTC (rev 27322) @@ -189,6 +189,9 @@ /* destroy the dialog */ gtk_widget_destroy (dialog); + /* Free Glade XML */ + g_object_unref (G_OBJECT (gxml)); + /* release the channel */ g_object_unref (G_OBJECT (accessibility_channel)); Modified: xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade 2008-07-16 23:14:49 UTC (rev 27322) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Fri Jul 11 21:06:03 2008 --> +<!--Generated with glade3 3.4.5 on Thu Jul 17 01:04:21 2008 --> <glade-interface> <requires lib="xfce4"/> <widget class="XfceTitledDialog" id="appearance-settings-dialog"> @@ -23,7 +23,7 @@ <widget class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> @@ -32,7 +32,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> <property name="show_expanders">False</property> </widget> </child> @@ -52,7 +51,7 @@ <widget class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> @@ -61,7 +60,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> <property name="show_expanders">False</property> </widget> </child> @@ -84,7 +82,7 @@ <child> <widget class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="frame3"> @@ -94,9 +92,9 @@ <child> <widget class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="border_width">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkFontButton" id="gtk_fontname_button"> <property name="visible">True</property> @@ -131,12 +129,12 @@ <child> <widget class="GtkAlignment" id="alignment4"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -158,7 +156,7 @@ <child> <widget class="GtkLabel" id="label10"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Hinting:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">xft_hinting_style_combo_box</property> @@ -172,7 +170,7 @@ <child> <widget class="GtkLabel" id="label11"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Sub-pixel order:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">xft_rgba_combo_box</property> @@ -236,12 +234,12 @@ <child> <widget class="GtkAlignment" id="alignment5"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="spacing">12</property> <child> <widget class="GtkCheckButton" id="xft_custom_dpi_check_button"> @@ -309,8 +307,8 @@ <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> + <property name="border_width">12</property> + <property name="spacing">6</property> <child> <widget class="GtkFrame" id="frame2"> <property name="visible">True</property> @@ -319,9 +317,9 @@ <child> <widget class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="border_width">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkComboBox" id="gtk_toolbar_style_combo_box"> <property name="visible">True</property> @@ -353,13 +351,13 @@ <child> <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="spacing">2</property> + <property name="border_width">6</property> + <property name="spacing">6</property> <child> <widget class="GtkCheckButton" id="gtk_button_images_check_button"> <property name="visible">True</property> Modified: xfce4-settings/trunk/dialogs/display-settings/display-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/display-settings/display-dialog.glade 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/display-settings/display-dialog.glade 2008-07-16 23:14:49 UTC (rev 27322) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Wed Jul 16 20:14:18 2008 --> +<!--Generated with glade3 3.4.5 on Thu Jul 17 01:04:01 2008 --> <glade-interface> <requires lib="xfce4"/> <widget class="XfceTitledDialog" id="display-dialog"> @@ -22,7 +22,7 @@ <child> <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="spacing">12</property> <child> <widget class="GtkScrolledWindow" id="scrolledwindow1"> @@ -36,7 +36,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> <property name="enable_search">False</property> <property name="show_expanders">False</property> </widget> @@ -53,7 +52,7 @@ <child> <widget class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">Ga_mma:</property> <property name="use_underline">True</property> </widget> @@ -67,7 +66,7 @@ <child> <widget class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">Ro_tation:</property> <property name="use_underline">True</property> </widget> @@ -81,7 +80,7 @@ <child> <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">Re_fresh rate:</property> <property name="use_underline">True</property> </widget> @@ -95,7 +94,7 @@ <child> <widget class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">R_esolution:</property> <property name="use_underline">True</property> </widget> @@ -174,7 +173,7 @@ <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="spacing">12</property> <child> <widget class="GtkFrame" id="frame1"> @@ -185,12 +184,12 @@ <child> <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkTable" id="table2"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -220,7 +219,7 @@ <child> <widget class="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Secondary screen:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">dual-secondary-screen</property> @@ -234,7 +233,7 @@ <child> <widget class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Primary screen:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">dual-primary-screen</property> @@ -271,12 +270,12 @@ <child> <widget class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkTable" id="table3"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> Modified: xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade 2008-07-16 23:14:49 UTC (rev 27322) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Tue Jul 15 19:54:16 2008 --> +<!--Generated with glade3 3.4.5 on Thu Jul 17 01:07:20 2008 --> <glade-interface> <requires lib="xfce4"/> <widget class="XfceTitledDialog" id="keyboard-settings-dialog"> @@ -344,6 +344,7 @@ </widget> <packing> <property name="expand">False</property> + <property name="padding">6</property> <property name="position">1</property> </packing> </child> Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c =================================================================== --- xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-07-16 23:14:49 UTC (rev 27322) @@ -598,6 +598,9 @@ gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); + /* Free Glade XML */ + g_object_unref (G_OBJECT (gxml)); + /* Unload channels */ g_object_unref (G_OBJECT (xsettings_channel)); g_object_unref (G_OBJECT (keyboards_channel)); Modified: xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade 2008-07-16 23:12:36 UTC (rev 27321) +++ xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade 2008-07-16 23:14:49 UTC (rev 27322) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Sat Jul 12 20:58:31 2008 --> +<!--Generated with glade3 3.4.5 on Thu Jul 17 01:02:51 2008 --> <glade-interface> <requires lib="xfce4"/> <widget class="XfceTitledDialog" id="mouse-dialog"> @@ -22,7 +22,7 @@ <child> <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="spacing">12</property> <child> <widget class="GtkScrolledWindow" id="scrolledwindow1"> @@ -43,7 +43,7 @@ <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <widget class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -52,17 +52,17 @@ <child> <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkVBox" id="vbox12"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="border_width">6</property> + <property name="spacing">6</property> <child> <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="spacing">2</property> + <property name="spacing">6</property> <child> <widget class="GtkRadioButton" id="mouse-right-handed"> <property name="visible">True</property> @@ -132,13 +132,13 @@ <child> <widget class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="border_width">6</property> + <property name="spacing">6</property> <child> <widget class="GtkVBox" id="vbox7"> <property name="visible">True</property> @@ -204,6 +204,7 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="xscale">0</property> + <property name="top_padding">6</property> <child> <widget class="GtkButton" id="mouse-reset"> <property name="visible">True</property> @@ -260,8 +261,8 @@ <child> <widget class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> + <property name="border_width">12</property> + <property name="spacing">6</property> <child> <widget class="GtkFrame" id="frame3"> <property name="visible">True</property> @@ -270,12 +271,12 @@ <child> <widget class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkVBox" id="vbox4"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="spacing">2</property> <child> <widget class="GtkLabel" id="mouse-dnd-label"> @@ -327,13 +328,13 @@ <child> <widget class="GtkAlignment" id="alignment4"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="border_width">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkVBox" id="vbox5"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <widget class="GtkVBox" id="vbox10"> <property name="visible">True</property> @@ -434,7 +435,7 @@ <child> <widget class="GtkHBox" id="mouse-themes-hbox"> <property name="visible">True</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="spacing">12</property> <child> <widget class="GtkScrolledWindow" id="scrolledwindow2"> @@ -448,7 +449,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> </widget> </child> </widget> @@ -456,7 +456,7 @@ <child> <widget class="GtkVBox" id="vbox9"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <widget class="GtkFrame" id="frame5"> <property name="visible">True</property> @@ -465,9 +465,9 @@ <child> <widget class="GtkAlignment" id="alignment5"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="border_width">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkHBox" id="hbox7"> <property name="visible">True</property> @@ -523,9 +523,9 @@ <child> <widget class="GtkAlignment" id="alignment6"> <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">18</property> - <property name="right_padding">6</property> + <property name="border_width">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> <widget class="GtkImage" id="mouse-theme-preview"> <property name="visible">True</property> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits