Updating branch refs/heads/master to c90af565ed597a79071ea2559451f2c781716cfd (commit) from e79f2b355ddb6600fbea0ebebb03ade066807842 (commit)
commit c90af565ed597a79071ea2559451f2c781716cfd Author: Andrzej <ndrwr...@gmail.com> Date: Sun Apr 1 23:41:53 2012 +0900 Reworked dialog UI. panel-plugin/indicator-dialog.glade | 313 +++++++++++++++++++++++++---------- 1 files changed, 226 insertions(+), 87 deletions(-) diff --git a/panel-plugin/indicator-dialog.glade b/panel-plugin/indicator-dialog.glade index 7c715a4..5194a0d 100644 --- a/panel-plugin/indicator-dialog.glade +++ b/panel-plugin/indicator-dialog.glade @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.14"/> <!-- interface-requires libxfce4ui 0.0 --> @@ -16,44 +16,93 @@ </columns> </object> <object class="XfceTitledDialog" id="dialog"> + <property name="can_focus">False</property> <property name="title" translatable="yes">Indicators</property> - <property name="default_width">325</property> - <property name="default_height">425</property> + <property name="default_width">425</property> + <property name="default_height">525</property> <property name="icon_name">gtk-properties</property> <property name="type_hint">normal</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close-button"> + <property name="label">gtk-close</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> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help-button"> + <property name="label">gtk-help</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> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + <property name="secondary">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkVBox" 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="frame3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox2"> <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="GtkHBox" id="hbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Maximum icon size (px):</property> <property name="use_underline">True</property> @@ -61,6 +110,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -68,32 +118,59 @@ <object class="GtkSpinButton" id="size-max"> <property name="visible">True</property> <property name="can_focus">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">size-adjustment</property> <property name="numeric">True</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">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="show-frame"> - <property name="label" translatable="yes">Show _frame</property> + <object class="GtkRadioButton" id="radiobutton-whitelist"> + <property name="label" translatable="yes">Show indicators unless hidden</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="use_action_appearance">False</property> + <property name="active">True</property> <property name="draw_indicator">True</property> + <property name="group">radiobutton-blacklist</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkRadioButton" id="radiobutton-blacklist"> + <property name="label" translatable="yes">Hide invisible indicators</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="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> </child> </object> @@ -101,6 +178,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Appearance</property> <attributes> <attribute name="weight" value="bold"/> @@ -110,90 +188,184 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox3"> <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="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeView" id="applications-treeview"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">applications-store</property> - <property name="headers_clickable">False</property> - <property name="rules_hint">True</property> - <property name="enable_search">False</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="min_width">24</property> + <object class="GtkTreeView" id="applications-treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">applications-store</property> + <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> + <property name="enable_search">False</property> + <property name="search_column">1</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn-name"> + <property name="title">Indicator</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> <child> - <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn-blacklist"> + <property name="title">Hidden</property> + <child> + <object class="GtkCellRendererToggle" id="hidden-toggle"/> + <attributes> + <attribute name="active">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn-whitelist"> + <property name="title">Visible</property> + <child> + <object class="GtkCellRendererToggle" id="hidden-toggle1"/> + <attributes> + <attribute name="active">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn-icon"> + <property name="title">Icon</property> + <child> + <object class="GtkCellRendererToggle" id="hidden-toggle2"/> + <attributes> + <attribute name="active">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn-label"> + <property name="title">Label</property> + <child> + <object class="GtkCellRendererToggle" id="hidden-toggle3"/> + <attributes> + <attribute name="active">2</attribute> + </attributes> + </child> + </object> </child> </object> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="title">Application</property> - <property name="expand">True</property> + <object class="GtkButton" id="item-up"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-up</property> + </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn3"> - <property name="title">Hidden</property> + <object class="GtkButton" id="item-down"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <child> - <object class="GtkCellRendererToggle" id="hidden-toggle"/> - <attributes> - <attribute name="active">2</attribute> - </attributes> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-down</property> + </object> </child> </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">1</property> + </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="layout_style">start</property> <child> - <object class="GtkButton" id="applications-clear"> - <property name="label" translatable="yes">C_lear Known Applications</property> + <object class="GtkButton" id="indicators-clear"> + <property name="label" translatable="yes">C_lear Known Indicators</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="image">image1</property> <property name="use_underline">True</property> </object> @@ -206,6 +378,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -216,7 +389,8 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="label" translatable="yes">Known Applications</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Known Indicators</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -224,54 +398,18 @@ </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">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close-button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">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="help-button"> - <property name="label">gtk-help</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - <property name="secondary">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> </object> </child> <action-widgets> @@ -279,15 +417,16 @@ <action-widget response="0">help-button</action-widget> </action-widgets> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-clear</property> + </object> <object class="GtkAdjustment" id="size-adjustment"> - <property name="value">32</property> <property name="lower">12</property> <property name="upper">64</property> + <property name="value">32</property> <property name="step_increment">1</property> <property name="page_increment">2</property> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-clear</property> - </object> </interface> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits