This is an automated email from the git hooks/post-receive script. andrzejr pushed a commit to branch master in repository xfce/xfce4-panel.
commit 763da8b2c7a171b8b4e6505e96253527b8d449da Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Wed Oct 26 11:08:17 2016 +0200 Further improvements to the main panel prefs dialog --- panel/panel-preferences-dialog.glade | 290 +++++++++++++++++------------------ 1 file changed, 142 insertions(+), 148 deletions(-) diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index 97998b2..75a7128 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -176,7 +176,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -191,7 +191,11 @@ <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="margin_left">3</property> + <property name="margin_right">3</property> + <property name="margin_top">3</property> + <property name="margin_bottom">3</property> + <property name="icon_name">gtk-add</property> </object> </child> </object> @@ -212,7 +216,11 @@ <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-remove</property> + <property name="margin_left">3</property> + <property name="margin_right">3</property> + <property name="margin_top">3</property> + <property name="margin_bottom">3</property> + <property name="icon_name">gtk-remove</property> </object> </child> </object> @@ -299,7 +307,6 @@ <property name="label" translatable="yes">M_ode:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">mode</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -320,7 +327,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -344,7 +351,6 @@ <property name="label" translatable="yes">O_utput:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">output-name</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -365,7 +371,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -616,54 +622,25 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="vbox4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="margin_left">12</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox4"> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="hbox2"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">background-style</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="background-style"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">styles-store</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">_Style:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">background-style</property> </object> <packing> <property name="expand">False</property> @@ -672,128 +649,148 @@ </packing> </child> <child> - <object class="GtkBox" id="bg-alpha-box"> + <object class="GtkComboBox" id="background-style"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="model">styles-store</property> <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Alpha:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">bg-alpha-scale</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScale" id="bg-alpha-scale"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Alpha value of the panel background, with 0 being fully transparent and 100 fully opaque.</property> - <property name="adjustment">background-alpha</property> - <property name="digits">0</property> - <property name="value_pos">right</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <object class="GtkCellRendererText" id="cellrenderertext4"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="bg-alpha-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Alpha:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">bg-alpha-scale</property> + </object> + <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScale" id="bg-alpha-scale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Alpha value of the panel background, with 0 being fully transparent and 100 fully opaque.</property> + <property name="adjustment">background-alpha</property> + <property name="digits">0</property> + <property name="value_pos">right</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="bg-color-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkBox" id="bg-color-box"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label16"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">C_olor:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">background-color</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkColorButton" id="background-color"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="title" translatable="yes">Pick a Panel Color</property> - <property name="color">#000000000000</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">C_olor:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">background-color</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="background-color"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="title" translatable="yes">Pick a Panel Color</property> + <property name="rgba">rgb(0,0,0)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="bg-image-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_File:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">background-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="bg-image-box"> + <object class="GtkFileChooserButton" id="background-image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_File:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">background-image</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFileChooserButton" id="background-image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Select A Background Image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="title" translatable="yes">Select A Background Image</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> @@ -862,7 +859,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" comments="I18N: label for the enter transparency slider">_Enter:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -875,7 +871,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" comments="I18N: label for the leave transparency slider">_Leave:</property> <property name="use_underline">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -934,7 +929,6 @@ <property name="label" translatable="yes">Enable compositing in the window manager for opacity settings in the panel.</property> <property name="wrap">True</property> <property name="width_chars">0</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -1015,7 +1009,7 @@ <object class="GtkImage" id="image3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-up</property> + <property name="icon_name">gtk-go-up</property> </object> </child> </object> @@ -1036,7 +1030,7 @@ <object class="GtkImage" id="image4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-go-down</property> + <property name="icon_name">gtk-go-down</property> </object> </child> </object> @@ -1057,7 +1051,7 @@ <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-add</property> + <property name="icon_name">gtk-add</property> </object> </child> </object> @@ -1078,7 +1072,7 @@ <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-remove</property> + <property name="icon_name">gtk-remove</property> </object> </child> </object> @@ -1099,7 +1093,7 @@ <object class="GtkImage" id="image7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-properties</property> + <property name="icon_name">gtk-properties</property> </object> </child> </object> @@ -1120,7 +1114,7 @@ <object class="GtkImage" id="image8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-about</property> + <property name="icon_name">gtk-about</property> </object> </child> </object> -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits