diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/main.c | 26 | ||||
| -rw-r--r-- | settings/xfdesktop-settings.glade | 23 |
2 files changed, 38 insertions, 11 deletions
diff --git a/settings/main.c b/settings/main.c index 9bc5d6e5..d75b46a5 100644 --- a/settings/main.c +++ b/settings/main.c @@ -59,8 +59,12 @@ #define SHOW_DESKTOP_MENU_PROP "/desktop-menu/show" #define DESKTOP_MENU_SHOW_ICONS_PROP "/desktop-menu/show-icons" +#define DESKTOP_MENU_BUTTON_PROP "/desktop-menu/activate-button" +#define DESKTOP_MENU_MODIFIER_PROP "/desktop-menu/activate-modifier" + #define WINLIST_SHOW_WINDOWS_MENU_PROP "/windowlist-menu/show" -#define WINLIST_SHOW_APP_ICONS_PROP "/windowlist-menu/show-icons" +#define WINLIST_BUTTON_PROP "/windowlist-menu/activate-button" +#define WINLIST_MODIFIER_PROP "/windowlist-menu/activate-modifier" #define WINLIST_SHOW_STICKY_WIN_ONCE_PROP "/windowlist-menu/show-sticky-once" #define WINLIST_SHOW_WS_NAMES_PROP "/windowlist-menu/show-workspace-names" #define WINLIST_SHOW_WS_SUBMENUS_PROP "/windowlist-menu/show-submenus" @@ -1420,11 +1424,31 @@ xfdesktop_settings_dialog_new(GladeXML *main_gxml, G_CALLBACK(suboptions_set_sensitive), box); suboptions_set_sensitive(GTK_TOGGLE_BUTTON(w), box); + w = glade_xml_get_widget(main_gxml, "combo_menu_btn"); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 2); + xfconf_g_property_bind(channel, DESKTOP_MENU_BUTTON_PROP, G_TYPE_INT, + G_OBJECT(w), "active"); + + w = glade_xml_get_widget(main_gxml, "combo_menu_modifier"); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0); + xfconf_g_property_bind(channel, DESKTOP_MENU_MODIFIER_PROP, G_TYPE_INT, + G_OBJECT(w), "active"); + xfconf_g_property_bind(channel, WINLIST_SHOW_APP_ICONS_PROP, G_TYPE_BOOLEAN, G_OBJECT(glade_xml_get_widget(main_gxml, "chk_winlist_show_app_icons")), "active"); + w = glade_xml_get_widget(main_gxml, "combo_windowlist_btn"); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 1); + xfconf_g_property_bind(channel, WINLIST_BUTTON_PROP, G_TYPE_INT, + G_OBJECT(w), "active"); + + w = glade_xml_get_widget(main_gxml, "combo_windowlist_modifier"); + gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0); + xfconf_g_property_bind(channel, WINLIST_MODIFIER_PROP, G_TYPE_INT, + G_OBJECT(w), "active"); + xfconf_g_property_bind(channel, WINLIST_SHOW_STICKY_WIN_ONCE_PROP, G_TYPE_BOOLEAN, G_OBJECT(glade_xml_get_widget(main_gxml, diff --git a/settings/xfdesktop-settings.glade b/settings/xfdesktop-settings.glade index 021f73f4..024f4fbb 100644 --- a/settings/xfdesktop-settings.glade +++ b/settings/xfdesktop-settings.glade @@ -594,14 +594,14 @@ Transparent</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">_Button:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">combobox1</property> + <property name="mnemonic_widget">combo_menu_btn</property> </widget> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combobox1"> + <widget class="GtkComboBox" id="combo_menu_btn"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="items" translatable="yes">Left @@ -619,7 +619,7 @@ Right</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Mo_difier:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">combobox2</property> + <property name="mnemonic_widget">combo_menu_modifier</property> </widget> <packing> <property name="expand">False</property> @@ -627,13 +627,14 @@ Right</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combobox2"> + <widget class="GtkComboBox" id="combo_menu_modifier"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="items" translatable="yes">None Shift Alt -Control</property> +Control +Super</property> </widget> <packing> <property name="expand">False</property> @@ -749,6 +750,7 @@ Control</property> <property name="spacing">6</property> <child> <widget class="GtkHBox" id="hbox14"> + <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">12</property> <child> @@ -757,14 +759,14 @@ Control</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">B_utton:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">combobox8</property> + <property name="mnemonic_widget">combo_windowlist_btn</property> </widget> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combobox8"> + <widget class="GtkComboBox" id="combo_windowlist_btn"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="items" translatable="yes">Left @@ -782,7 +784,7 @@ Right</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Modi_fier:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">combobox9</property> + <property name="mnemonic_widget">combo_windowlist_modifier</property> </widget> <packing> <property name="expand">False</property> @@ -790,13 +792,14 @@ Right</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combobox9"> + <widget class="GtkComboBox" id="combo_windowlist_modifier"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="items" translatable="yes">None Shift Alt -Control</property> +Control +Super</property> </widget> <packing> <property name="expand">False</property> |