[Xfce4-commits] <xfce4-panel:devel> * Save glade files with latest version of glade-3. This fixes the dialog response. * Add cell renderers in glade and remove them from the code.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:26:26 CEST 2009
Updating branch refs/heads/devel
to 507f358480020e1a3ad1ce22220839572f77f88f (commit)
from 40e21cfae3875cca9e1a0c00c34a6c7dafca81b5 (commit)
commit 507f358480020e1a3ad1ce22220839572f77f88f
Author: Nick Schermer <nick at xfce.org>
Date: Thu Dec 11 19:43:02 2008 +0100
* Save glade files with latest version of glade-3. This fixes the
dialog response.
* Add cell renderers in glade and remove them from the code.
panel/panel-preferences-dialog.c | 11 ----
panel/panel-preferences-dialog.glade | 64 ++++++++++++++++----------
plugins/clock/clock-dialog.glade | 16 ++++++-
plugins/clock/clock.c | 6 --
plugins/launcher/launcher-dialog.c | 6 --
plugins/launcher/launcher-dialog.glade | 74 ++++++++++++++++-------------
plugins/separator/Makefile.am | 2 +-
plugins/separator/separator-dialog.glade | 14 ++++-
plugins/separator/separator.c | 6 --
plugins/showdesktop/showdesktop.c | 4 +-
plugins/systray/systray-dialog.glade | 8 ++-
plugins/tasklist/tasklist-dialog.glade | 27 ++++++++---
plugins/tasklist/tasklist.c | 6 --
13 files changed, 133 insertions(+), 111 deletions(-)
diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index 41e7b39..b341a1b 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -193,17 +193,6 @@ panel_preferences_dialog_init (PanelPreferencesDialog *dialog)
gtk_tree_view_column_set_attributes (column, renderer, "text", COLUMN_DISPLAY_NAME, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
- /* TODO remove when implemented by glade */
- GtkCellRenderer *cell1 = gtk_cell_renderer_text_new ();
- object = gtk_builder_get_object (GTK_BUILDER (dialog), "panel-combobox");
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell1, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell1, "text", 0, NULL);
-
- GtkCellRenderer *cell2 = gtk_cell_renderer_text_new ();
- object = gtk_builder_get_object (GTK_BUILDER (dialog), "horizontal");
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell2, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell2, "text", 0, NULL);
-
/* rebuild the panel combobox */
panel_preferences_dialog_panel_combobox_rebuild (dialog);
diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade
index bd3e87e..0d9a40c 100644
--- a/panel/panel-preferences-dialog.glade
+++ b/panel/panel-preferences-dialog.glade
@@ -3,6 +3,27 @@
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-requires xfce4 0.0 -->
<!-- interface-naming-policy project-wide -->
+ <object class="GtkListStore" id="orientation-store">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Vertical</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Horizontal</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="panel-liststore">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="item-liststore"/>
<object class="XfceTitledDialog" id="dialog">
<property name="title" translatable="yes">Xfce Panel Preferences</property>
<property name="window_position">center-on-parent</property>
@@ -26,6 +47,12 @@
<object class="GtkComboBox" id="panel-combobox">
<property name="visible">True</property>
<property name="model">panel-liststore</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="position">0</property>
@@ -118,6 +145,12 @@
<object class="GtkComboBox" id="horizontal">
<property name="visible">True</property>
<property name="model">orientation-store</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -622,7 +655,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</object>
<packing>
<property name="position">0</property>
@@ -635,7 +667,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</object>
<packing>
<property name="position">1</property>
@@ -651,26 +682,10 @@
</child>
</object>
</child>
- </object>
- <object class="GtkListStore" id="orientation-store">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Vertical</col>
- </row>
- <row>
- <col id="0" translatable="yes">Horizontal</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="panel-liststore">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
+ <action-widgets>
+ <action-widget response="0">button-close</action-widget>
+ <action-widget response="0">button-help</action-widget>
+ </action-widgets>
</object>
<object class="GtkAdjustment" id="size">
<property name="value">16</property>
@@ -704,12 +719,11 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="item-liststore"/>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
- <widget name="label7"/>
- <widget name="label9"/>
<widget name="label10"/>
+ <widget name="label9"/>
+ <widget name="label7"/>
</widgets>
</object>
</interface>
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade
index dbc1734..b5d4f7a 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.glade
@@ -51,6 +51,12 @@
<object class="GtkComboBox" id="mode">
<property name="visible">True</property>
<property name="model">mode-model</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -88,6 +94,9 @@
<child>
<object class="GtkComboBox" id="combobox1">
<property name="visible">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -210,6 +219,9 @@
<child>
<object class="GtkComboBox" id="digital-format">
<property name="visible">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -287,7 +299,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</object>
<packing>
<property name="position">0</property>
@@ -302,6 +313,9 @@
</child>
</object>
</child>
+ <action-widgets>
+ <action-widget response="0">close-button</action-widget>
+ </action-widgets>
</object>
<object class="GtkListStore" id="mode-model">
<columns>
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 6f27a5f..ab7ca90 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -422,12 +422,6 @@ clock_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
create_binding ("show-meridiem", G_TYPE_BOOLEAN, "active");
create_binding ("fuzziness", G_TYPE_UINT, "value");
- /* TODO remove when implemented by glade */
- GtkCellRenderer *cell1 = gtk_cell_renderer_text_new ();
- object = gtk_builder_get_object (builder, "mode");
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell1, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell1, "text", 0, NULL);
-
gtk_widget_show (GTK_WIDGET (dialog));
}
else
diff --git a/plugins/launcher/launcher-dialog.c b/plugins/launcher/launcher-dialog.c
index 9fc7d3c..cd968fd 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -74,12 +74,6 @@ launcher_dialog_show (LauncherPlugin *plugin)
object = gtk_builder_get_object (builder, "arrow-position");
xfconf_g_property_bind (plugin->channel, "/arrow-position", G_TYPE_UINT, object, "active");
- /* TODO remove when implemented by glade */
- GtkCellRenderer *cell1 = gtk_cell_renderer_text_new ();
- object = gtk_builder_get_object (builder, "arrow-position");
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell1, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell1, "text", 0, NULL);
-
gtk_widget_show (GTK_WIDGET (dialog));
}
else
diff --git a/plugins/launcher/launcher-dialog.glade b/plugins/launcher/launcher-dialog.glade
index 06fba05..dbd3339 100644
--- a/plugins/launcher/launcher-dialog.glade
+++ b/plugins/launcher/launcher-dialog.glade
@@ -3,6 +3,32 @@
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-requires xfce4 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkListStore" id="arrow-position-store">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Default</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Left</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Top</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Bottom</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Inside Button</col>
+ </row>
+ </data>
+ </object>
<object class="XfceTitledDialog" id="dialog">
<property name="title" translatable="yes">Launcher Properties</property>
<property name="window_position">center</property>
@@ -294,12 +320,12 @@
</child>
<child>
<object class="GtkCheckButton" id="entry-terminal2">
+ <property name="label" translatable="yes">Run in _terminal</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>
- <property name="label" translatable="yes">Run in _terminal</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -311,12 +337,12 @@
</child>
<child>
<object class="GtkCheckButton" id="entry-startup-notify2">
+ <property name="label" translatable="yes">Use _statup notification</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>
- <property name="label" translatable="yes">Use _statup notification</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -400,12 +426,12 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="disable-tooltips">
+ <property name="label" translatable="yes">Disable t_ooltips</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>
- <property name="label" translatable="yes">Disable t_ooltips</property>
</object>
<packing>
<property name="expand">False</property>
@@ -414,12 +440,12 @@
</child>
<child>
<object class="GtkCheckButton" id="show-labels">
+ <property name="label" translatable="yes">Show _labels instead of icons</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>
- <property name="label" translatable="yes">Show _labels instead of icons</property>
</object>
<packing>
<property name="expand">False</property>
@@ -428,12 +454,12 @@
</child>
<child>
<object class="GtkCheckButton" id="move-first">
+ <property name="label" translatable="yes">Show last _used entry in panel</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>
- <property name="label" translatable="yes">Show last _used entry in panel</property>
</object>
<packing>
<property name="expand">False</property>
@@ -461,6 +487,12 @@
<property name="visible">True</property>
<property name="model">arrow-position-store</property>
<property name="button_sensitivity">on</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -499,12 +531,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
+ <property name="label" translatable="yes">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>
- <property name="response_id">0</property>
- <property name="label" translatable="yes">gtk-close</property>
</object>
<packing>
<property name="position">0</property>
@@ -519,31 +550,8 @@
</child>
</object>
</child>
- </object>
- <object class="GtkListStore" id="arrow-position-store">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Default</col>
- </row>
- <row>
- <col id="0" translatable="yes">Left</col>
- </row>
- <row>
- <col id="0" translatable="yes">Right</col>
- </row>
- <row>
- <col id="0" translatable="yes">Top</col>
- </row>
- <row>
- <col id="0" translatable="yes">Bottom</col>
- </row>
- <row>
- <col id="0" translatable="yes">Inside Button</col>
- </row>
- </data>
+ <action-widgets>
+ <action-widget response="0">close-button</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 1943b86..c94f9c5 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -50,7 +50,7 @@ BUILT_SOURCES = \
$(libseparator_built_sources)
DISTCLEANFILES = \
- $(libclock_built_sources)
+ $(libseparator_built_sources)
separator-dialog_glade.h: separator-dialog.glade
exo-csource --static --strip-comments --strip-content --name=separator_dialog_glade $< >$@
diff --git a/plugins/separator/separator-dialog.glade b/plugins/separator/separator-dialog.glade
index 82f3d43..13daa9e 100644
--- a/plugins/separator/separator-dialog.glade
+++ b/plugins/separator/separator-dialog.glade
@@ -49,6 +49,12 @@
<object class="GtkComboBox" id="style">
<property name="visible">True</property>
<property name="model">style-model</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -61,12 +67,12 @@
</child>
<child>
<object class="GtkCheckButton" id="expand">
+ <property name="label" translatable="yes">_Expand</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>
- <property name="label" translatable="yes">_Expand</property>
</object>
<packing>
<property name="position">1</property>
@@ -95,12 +101,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
+ <property name="label" translatable="yes">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>
- <property name="response_id">0</property>
- <property name="label" translatable="yes">gtk-close</property>
</object>
<packing>
<property name="position">0</property>
@@ -115,6 +120,9 @@
</child>
</object>
</child>
+ <action-widgets>
+ <action-widget response="0">close-button</action-widget>
+ </action-widgets>
</object>
<object class="GtkListStore" id="style-model">
<columns>
diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c
index 70d1916..59b442d 100644
--- a/plugins/separator/separator.c
+++ b/plugins/separator/separator.c
@@ -303,12 +303,6 @@ separator_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
object = gtk_builder_get_object (builder, "style");
xfconf_g_property_bind (plugin->channel, "/style", G_TYPE_UINT, object, "active");
- /* TODO remove when implemented by glade */
- GtkCellRenderer *cell1 = gtk_cell_renderer_text_new ();
- object = gtk_builder_get_object (builder, "style");
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell1, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell1, "text", 0, NULL);
-
gtk_widget_show (GTK_WIDGET (dialog));
}
else
diff --git a/plugins/showdesktop/showdesktop.c b/plugins/showdesktop/showdesktop.c
index 10a0011..f404e67 100644
--- a/plugins/showdesktop/showdesktop.c
+++ b/plugins/showdesktop/showdesktop.c
@@ -188,8 +188,8 @@ show_desktop_plugin_toggled (GtkToggleButton *button,
/* update the tooltip */
gtk_widget_set_tooltip_text (GTK_WIDGET (button),
- active ? _("Restore hidden windows") :
- _("Hide windows and show desktop"));
+ active ? _("Restore the minimized windows") :
+ _("Minimize all open windows and show the desktop"));
}
diff --git a/plugins/systray/systray-dialog.glade b/plugins/systray/systray-dialog.glade
index 5dfbbb2..2cfffc8 100644
--- a/plugins/systray/systray-dialog.glade
+++ b/plugins/systray/systray-dialog.glade
@@ -67,12 +67,12 @@
</child>
<child>
<object class="GtkCheckButton" id="style-show-frame">
+ <property name="label" translatable="yes">Show _frame</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>
- <property name="label" translatable="yes">Show _frame</property>
</object>
<packing>
<property name="position">1</property>
@@ -145,12 +145,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
+ <property name="label" translatable="yes">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>
- <property name="response_id">0</property>
- <property name="label" translatable="yes">gtk-close</property>
</object>
<packing>
<property name="position">0</property>
@@ -165,5 +164,8 @@
</child>
</object>
</child>
+ <action-widgets>
+ <action-widget response="0">close-button</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.glade
index a2c13cc..d7f4b82 100644
--- a/plugins/tasklist/tasklist-dialog.glade
+++ b/plugins/tasklist/tasklist-dialog.glade
@@ -66,6 +66,12 @@
<object class="GtkComboBox" id="style">
<property name="visible">True</property>
<property name="model">style-model</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -80,12 +86,12 @@
</child>
<child>
<object class="GtkCheckButton" id="flat-buttons">
+ <property name="label" translatable="yes">Show _flat buttons</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>
- <property name="label" translatable="yes">Show _flat buttons</property>
</object>
<packing>
<property name="position">1</property>
@@ -93,12 +99,12 @@
</child>
<child>
<object class="GtkCheckButton" id="show-handle">
+ <property name="label" translatable="yes">Show _handle</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>
- <property name="label" translatable="yes">Show _handle</property>
</object>
<packing>
<property name="position">2</property>
@@ -154,6 +160,9 @@
<child>
<object class="GtkComboBox" id="combobox2">
<property name="visible">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -167,12 +176,12 @@
</child>
<child>
<object class="GtkCheckButton" id="include-all-workspaces">
+ <property name="label" translatable="yes">Show windows from _all workspaces</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>
- <property name="label" translatable="yes">Show windows from _all workspaces</property>
</object>
<packing>
<property name="position">1</property>
@@ -180,12 +189,12 @@
</child>
<child>
<object class="GtkCheckButton" id="show-only-minimized">
+ <property name="label" translatable="yes">Show only _minimized windows</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>
- <property name="label" translatable="yes">Show only _minimized windows</property>
</object>
<packing>
<property name="position">2</property>
@@ -193,12 +202,12 @@
</child>
<child>
<object class="GtkCheckButton" id="switch-workspace-on-unminimize">
+ <property name="label" translatable="yes">Restore minimized windows to current _workspace</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>
- <property name="label" translatable="yes">Restore minimized windows to current _workspace</property>
</object>
<packing>
<property name="position">3</property>
@@ -206,12 +215,12 @@
</child>
<child>
<object class="GtkCheckButton" id="show-wireframes">
+ <property name="label" translatable="yes">D_raw window frame when hovering a button</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>
- <property name="label" translatable="yes">D_raw window frame when hovering a button</property>
</object>
<packing>
<property name="position">4</property>
@@ -246,12 +255,11 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close-button">
+ <property name="label" translatable="yes">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>
- <property name="response_id">0</property>
- <property name="label" translatable="yes">gtk-close</property>
</object>
<packing>
<property name="position">0</property>
@@ -266,5 +274,8 @@
</child>
</object>
</child>
+ <action-widgets>
+ <action-widget response="0">close-button</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c
index dc1ed86..4db9b9b 100644
--- a/plugins/tasklist/tasklist.c
+++ b/plugins/tasklist/tasklist.c
@@ -201,12 +201,6 @@ tasklist_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
object = gtk_builder_get_object (builder, "show-wireframes");
exo_mutual_binding_new (G_OBJECT (plugin->tasklist), "show-wireframes", object, "active");
- /* TODO remove when implemented by glade */
- GtkCellRenderer *cell1 = gtk_cell_renderer_text_new ();
- object = gtk_builder_get_object (builder, "style");
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell1, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell1, "text", 0, NULL);
-
gtk_widget_show (GTK_WIDGET (dialog));
}
else
More information about the Xfce4-commits
mailing list