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 7892e32efebcaa62e101d341092df6f5a8161b20 Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Wed Oct 26 13:01:45 2016 +0200 Action buttons: fix prefs dialog --- plugins/actions/actions-dialog.glade | 203 +++++++++++++++++------------------ 1 file changed, 98 insertions(+), 105 deletions(-) diff --git a/plugins/actions/actions-dialog.glade b/plugins/actions/actions-dialog.glade index 7b1a424..aee151d 100644 --- a/plugins/actions/actions-dialog.glade +++ b/plugins/actions/actions-dialog.glade @@ -1,8 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <requires lib="gtk+" version="2.24"/> - <!-- interface-requires libxfce4ui 4.5 --> - <!-- interface-naming-policy project-wide --> + <requires lib="gtk+" version="3.20"/> + <requires lib="libxfce4ui-2" version="4.12"/> + <object class="GtkListStore" id="items-store"> + <columns> + <!-- column-name hidden --> + <column type="gboolean"/> + <!-- column-name display-name --> + <column type="gchararray"/> + <!-- column-name name --> + <column type="gchararray"/> + <!-- column-name type --> + <column type="guint"/> + </columns> + </object> + <object class="GtkListStore" id="mode-store"> + <columns> + <!-- column-name title --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Action Buttons</col> + </row> + <row> + <col id="0" translatable="yes">Session Menu</col> + </row> + </data> + </object> <object class="XfceTitledDialog" id="dialog"> <property name="can_focus">False</property> <property name="title" translatable="yes">Action Buttons</property> @@ -11,12 +37,13 @@ <property name="icon_name">gtk-properties</property> <property name="type_hint">normal</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> @@ -26,7 +53,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -41,7 +67,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -60,10 +85,11 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1"> <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> <child> <object class="GtkFrame" id="frame1"> @@ -72,83 +98,75 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="margin_left">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkComboBox" id="combo-mode"> <property name="visible">True</property> <property name="can_focus">False</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> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Appeara_nce:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">combo-mode</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="invert-orientation"> - <property name="label" translatable="yes">Invert buttons _orientation</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="model">mode-store</property> <child> - <object class="GtkComboBox" id="combo-mode"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">mode-store</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="confirmation-dialog"> - <property name="label" translatable="yes">_Show confirmation dialog</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Show a confirmation dialog with a 30 second timeout for some of the actions.</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="invert-orientation"> + <property name="label" translatable="yes">Invert buttons _orientation</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="confirmation-dialog"> + <property name="label" translatable="yes">_Show confirmation dialog</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show a confirmation dialog with a 30 second timeout for some of the actions.</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Appeara_nce:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -185,8 +203,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">6</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">etched-in</property> <child> <object class="GtkTreeView" id="actions-treeview"> @@ -196,6 +212,9 @@ <property name="headers_clickable">False</property> <property name="reorderable">True</property> <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn1"> <property name="title" translatable="yes">Visible</property> @@ -257,30 +276,4 @@ <action-widget response="0">help-button</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="items-store"> - <columns> - <!-- column-name hidden --> - <column type="gboolean"/> - <!-- column-name display-name --> - <column type="gchararray"/> - <!-- column-name name --> - <column type="gchararray"/> - <!-- column-name type --> - <column type="guint"/> - </columns> - </object> - <object class="GtkListStore" id="mode-store"> - <columns> - <!-- column-name title --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">Action Buttons</col> - </row> - <row> - <col id="0" translatable="yes">Session Menu</col> - </row> - </data> - </object> </interface> -- 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