This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-panel.
commit 2815f7e44369a4c1356c20cca56238339757d1ba Author: Simon Steinbeiss <[email protected]> Date: Sat Nov 24 00:04:43 2018 +0100 Make compositor info in settings dialog a GtkInfoBar --- panel/panel-preferences-dialog.glade | 218 +++++++++++++++++++---------------- 1 file changed, 119 insertions(+), 99 deletions(-) diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index e01aeac..29135a4 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -749,142 +749,162 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Opacity</b></property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkFrame" id="composited"> + <object class="GtkRevealer" id="composited-info"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="reveal_child">True</property> <child> - <object class="GtkGrid"> + <object class="GtkInfoBar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkScale" id="enter-opacity-scale"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="adjustment">enter-opacity</property> - <property name="digits">0</property> - <property name="value_pos">right</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScale" id="leave-opacity-scale"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Transparency when the pointer is not hovering over the panel, with 0 being fully transparent and 100 fully opaque.</property> - <property name="hexpand">True</property> - <property name="adjustment">leave-opacity</property> - <property name="digits">0</property> - <property name="value_pos">right</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> <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> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> + <child internal-child="content_area"> + <object class="GtkBox"> <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> + <property name="spacing">6</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">dialog-information-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Compositing is currently disabled</b> +Enable compositing in the window manager for opacity settings in the panel.</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="width_chars">0</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Opacity</b></property> - <property name="use_markup">True</property> - <property name="xalign">0</property> - </object> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkAlignment" id="composited-info"> + <object class="GtkGrid" id="composited"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">1</property> - <property name="xscale">0</property> - <property name="yscale">0</property> + <property name="margin_left">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkBox" id="hbox5"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">dialog-information</property> - <property name="icon_size">5</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <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> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <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> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkScale" id="enter-opacity-scale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="adjustment">enter-opacity</property> + <property name="digits">0</property> + <property name="value_pos">right</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <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> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkScale" id="leave-opacity-scale"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Transparency when the pointer is not hovering over the panel, with 0 being fully transparent and 100 fully opaque.</property> + <property name="hexpand">True</property> + <property name="adjustment">leave-opacity</property> + <property name="digits">0</property> + <property name="value_pos">right</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">4</property> </packing> </child> </object> -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
