This is an automated email from the git hooks/post-receive script. ochosi pushed a commit to branch master in repository apps/xfce4-notifyd.
commit a53c120e3faf393d2df49ebba9f126b587baf15f Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Wed Jun 29 23:10:10 2016 +0200 Drop deprecated widgets from settings, make sure preview always shows --- xfce4-notifyd-config/xfce4-notifyd-config.glade | 155 +++++++++++------------- 1 file changed, 69 insertions(+), 86 deletions(-) diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade b/xfce4-notifyd-config/xfce4-notifyd-config.glade index a6b2fcd..90b7990 100644 --- a/xfce4-notifyd-config/xfce4-notifyd-config.glade +++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-requires libxfce4ui 4.5 --> - <!-- interface-naming-policy toplevel-contextual --> + <requires lib="gtk+" version="3.14"/> + <requires lib="libxfce4ui" version="4.12"/> + <requires lib="libxfce4ui-2" version="4.12"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">480</property> @@ -44,37 +45,22 @@ <property name="icon_name">xfce4-notifyd</property> <property name="type_hint">dialog</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">edge</property> - <child> - <object class="GtkButton" id="preview_button"> - <property name="label" translatable="yes">_Preview</property> - <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_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> <child> <object class="GtkButton" id="close_btn"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <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> @@ -93,20 +79,19 @@ </packing> </child> <child> - <object class="GtkVBox" id="plug-child"> + <object class="GtkBox" id="plug-child"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">6</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkHScale" id="opacity_slider"> + <object class="GtkScale" id="opacity_slider"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="adjustment">adjustment2</property> @@ -116,63 +101,43 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkButton" id="preview_button"> + <property name="label" translatable="yes">_Preview</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Opacity:</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Disappear after:</property> + <property name="label" translatable="yes">_Theme:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">expire_timeout_sbtn</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <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">Default _position:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">position_combo</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="position_combo"> + <object class="GtkComboBox" id="theme_combo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">model1</property> <child> - <object class="GtkCellRendererText" id="renderer1"/> + <object class="GtkCellRendererText" id="renderer2"/> <attributes> <attribute name="text">0</attribute> </attributes> @@ -180,30 +145,29 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <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">_Theme:</property> + <property name="label" translatable="yes">Default _position:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">position_combo</property> + <property name="xalign">0</property> </object> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="theme_combo"> + <object class="GtkComboBox" id="position_combo"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="model">model1</property> <child> - <object class="GtkCellRendererText" id="renderer2"/> + <object class="GtkCellRendererText" id="renderer1"/> <attributes> <attribute name="text">0</attribute> </attributes> @@ -211,12 +175,11 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkBox" id="hbox4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -225,11 +188,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> - <property name="invisible_char_set">True</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> <property name="adjustment">adjustment1</property> <property name="numeric">True</property> </object> @@ -243,8 +203,8 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">seconds</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -256,17 +216,41 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Disappear after:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">expire_timeout_sbtn</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Opacity:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -279,7 +263,6 @@ </object> </child> <action-widgets> - <action-widget response="0">preview_button</action-widget> <action-widget response="1">close_btn</action-widget> </action-widgets> </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