diff --git a/plugins/pager/pager-dialog.glade b/plugins/pager/pager-dialog.glade
index d70d20fbf9ecdac28dc16288cb8f832e4f7305c1..f0cdb0a7c14a2d6e0470cc7beda09e803f13475e 100644
--- a/plugins/pager/pager-dialog.glade
+++ b/plugins/pager/pager-dialog.glade
@@ -3,6 +3,24 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libxfce4ui-2" version="4.12"/>
+ <object class="GtkListStore" id="appearance-model">
+ <columns>
+ <!-- column-name mode -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Buttons</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Miniature View</col>
+ <col id="1">1</col>
+ </row>
+ </data>
+ </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -42,32 +60,49 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="close-button">
- <property name="label" translatable="yes">_Close</property>
+ <object class="GtkButton" id="help-button">
+ <property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="image">image3</property>
+ <property name="image">image2</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="help-button">
- <property name="label" translatable="yes">_Help</property>
+ <object class="GtkButton" id="close-button">
+ <property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="image">image2</property>
+ <property name="image">image3</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="center">
+ <object class="GtkButton" id="settings-button">
+ <property name="label" translatable="yes">Workspace _Settings...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">start</property>
+ <property name="image">image1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
<property name="secondary">True</property>
</packing>
@@ -81,191 +116,103 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox2">
+ <object class="GtkGrid">
<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>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkComboBox" id="appearance">
<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="hexpand">True</property>
+ <property name="model">appearance-model</property>
+ <property name="active">0</property>
+ <property name="id_column">1</property>
<child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox" id="vbox4">
- <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="GtkBox" id="hbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Number of _rows:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spin1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spin1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">rows</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</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">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="miniature-view">
- <property name="label" translatable="yes">Show mi_niature view</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 miniature view of the workspace with rectangles for the visible windows</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="numbering">
- <property name="label" translatable="yes">Show workspace number</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <child>
- <object class="GtkButton" id="settings-button">
- <property name="label" translatable="yes">Workspace _Settings...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image1</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Appearance</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <object class="GtkCellRendererText" id="renderer"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="scrolling-frame">
+ <object class="GtkLabel" id="label5">
<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="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">18</property>
- <property name="right_padding">6</property>
- <child>
- <object class="GtkCheckButton" id="workspace-scrolling">
- <property name="label" translatable="yes">Switch workspaces using the mouse _wheel</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>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Behaviour</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="label" translatable="yes">Appearance:</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Number of _rows:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spin1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="adjustment">rows</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">if-valid</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="numbering">
+ <property name="label" translatable="yes">Show workspace number</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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="GtkCheckButton" id="workspace-scrolling">
+ <property name="label" translatable="yes">Switch workspaces using the mouse _wheel</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">3</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -273,8 +220,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">close-button</action-widget>
<action-widget response="0">help-button</action-widget>
+ <action-widget response="0">close-button</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 2a4069c22d6a8e99717f06f84d0e81a8f6e570a2..9f2539d2ff9fad7dc02a53c070e3b623a1229114 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -102,7 +102,7 @@ struct _PagerPlugin
GtkWidget *pager;
GObject *numbering_switch;
- GObject *scrolling_frame;
+ GObject *scrolling_switch;
WnckScreen *wnck_screen;
@@ -234,8 +234,8 @@ pager_plugin_get_property (GObject *object,
if (G_IS_OBJECT (plugin->numbering_switch))
gtk_widget_set_visible (GTK_WIDGET (plugin->numbering_switch), !plugin->miniature_view);
- if (G_IS_OBJECT (plugin->scrolling_frame))
- gtk_widget_set_visible (GTK_WIDGET (plugin->scrolling_frame), !plugin->miniature_view);
+ if (G_IS_OBJECT (plugin->scrolling_switch))
+ gtk_widget_set_visible (GTK_WIDGET (plugin->scrolling_switch), !plugin->miniature_view);
pager_plugin_screen_layout_changed (plugin);
break;
@@ -709,14 +709,14 @@ pager_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
g_signal_connect (G_OBJECT (object), "clicked",
G_CALLBACK (pager_plugin_configure_workspace_settings), dialog);
- object = gtk_builder_get_object (builder, "workspace-scrolling");
- panel_return_if_fail (GTK_IS_TOGGLE_BUTTON (object));
+ plugin->scrolling_switch = gtk_builder_get_object (builder, "workspace-scrolling");
+ panel_return_if_fail (GTK_IS_TOGGLE_BUTTON (plugin->scrolling_switch));
g_object_bind_property (G_OBJECT (plugin), "workspace-scrolling",
- G_OBJECT (object), "active",
+ G_OBJECT (plugin->scrolling_switch), "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
- object = gtk_builder_get_object (builder, "miniature-view");
- panel_return_if_fail (GTK_IS_TOGGLE_BUTTON (object));
+ object = gtk_builder_get_object (builder, "appearance");
+ panel_return_if_fail (GTK_IS_COMBO_BOX (object));
g_object_bind_property (G_OBJECT (plugin), "miniature-view",
G_OBJECT (object), "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
@@ -734,9 +734,7 @@ pager_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
gtk_widget_set_visible (GTK_WIDGET (plugin->numbering_switch), !plugin->miniature_view);
- plugin->scrolling_frame = gtk_builder_get_object (builder, "scrolling-frame");
- panel_return_if_fail (GTK_IS_FRAME (plugin->scrolling_frame));
- gtk_widget_set_visible (GTK_WIDGET (plugin->scrolling_frame), !plugin->miniature_view);
+ gtk_widget_set_visible (GTK_WIDGET (plugin->scrolling_switch), !plugin->miniature_view);
/* update the rows limit */
pager_plugin_configure_n_workspaces_changed (plugin->wnck_screen, NULL, builder);