Author: kelnos
Date: 2008-09-09 03:49:31 +0000 (Tue, 09 Sep 2008)
New Revision: 27773
Modified:
xfdesktop/trunk/settings/main.c
xfdesktop/trunk/settings/xfdesktop-settings.glade
xfdesktop/trunk/src/menu.c
Log:
hook up desktop menu show app icons pref
Modified: xfdesktop/trunk/settings/main.c
===================================================================
--- xfdesktop/trunk/settings/main.c 2008-09-09 03:49:14 UTC (rev 27772)
+++ xfdesktop/trunk/settings/main.c 2008-09-09 03:49:31 UTC (rev 27773)
@@ -55,6 +55,7 @@
#include "xfdesktop-settings_glade.h"
#define SHOW_DESKTOP_MENU_PROP "/desktop-menu/show"
+#define DESKTOP_MENU_SHOW_ICONS_PROP "/desktop-menu/show-icons"
#define WINLIST_SHOW_WINDOWS_MENU_PROP "/windowlist-menu/show"
#define WINLIST_SHOW_APP_ICONS_PROP "/windowlist-menu/show-icons"
@@ -1157,6 +1158,12 @@
G_CALLBACK(suboptions_set_sensitive), box);
suboptions_set_sensitive(GTK_TOGGLE_BUTTON(w), box);
+ xfconf_g_property_bind(channel, DESKTOP_MENU_SHOW_ICONS_PROP,
+ G_TYPE_BOOLEAN,
+ G_OBJECT(glade_xml_get_widget(main_gxml,
+
"chk_menu_show_app_icons")),
+ "active");
+
w = glade_xml_get_widget(main_gxml, "chk_show_winlist_menu");
xfconf_g_property_bind(channel, WINLIST_SHOW_WINDOWS_MENU_PROP,
G_TYPE_BOOLEAN, G_OBJECT(w), "active");
Modified: xfdesktop/trunk/settings/xfdesktop-settings.glade
===================================================================
--- xfdesktop/trunk/settings/xfdesktop-settings.glade 2008-09-09 03:49:14 UTC
(rev 27772)
+++ xfdesktop/trunk/settings/xfdesktop-settings.glade 2008-09-09 03:49:31 UTC
(rev 27773)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Sep 8 20:32:10 2008 -->
+<!--Generated with glade3 3.4.5 on Mon Sep 8 20:44:19 2008 -->
<glade-interface>
<requires lib="xfce4"/>
<widget class="XfceTitledDialog" id="prefs_dialog">
@@ -592,6 +592,7 @@
</child>
<child>
<widget class="GtkAlignment"
id="box_menu_subopts">
+ <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="bottom_padding">6</property>
<property name="left_padding">12</property>
@@ -602,7 +603,6 @@
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox11">
- <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>
@@ -660,7 +660,7 @@
</widget>
</child>
<child>
- <widget class="GtkCheckButton"
id="chk_showappicons">
+ <widget class="GtkCheckButton"
id="chk_menu_show_app_icons">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -676,7 +676,6 @@
</child>
<child>
<widget class="GtkHBox" id="hbox12">
- <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>
Modified: xfdesktop/trunk/src/menu.c
===================================================================
--- xfdesktop/trunk/src/menu.c 2008-09-09 03:49:14 UTC (rev 27772)
+++ xfdesktop/trunk/src/menu.c 2008-09-09 03:49:31 UTC (rev 27773)
@@ -135,8 +135,11 @@
{
if(!strcmp(property, "/desktop-menu/show")) {
if(!G_VALUE_TYPE(value) || g_value_get_boolean(value)) {
- if(!desktop_menu)
+ if(!desktop_menu) {
_start_menu_module();
+ if(desktop_menu && !show_desktop_menu_icons)
+ xfce_desktop_menu_set_show_icons(desktop_menu, FALSE);
+ }
} else {
if(desktop_menu)
_stop_menu_module();
@@ -145,8 +148,10 @@
show_desktop_menu_icons = G_VALUE_TYPE(value)
? g_value_get_boolean(value)
: TRUE;
- if(desktop_menu)
- xfce_desktop_menu_set_show_icons(desktop_menu, FALSE);
+ if(desktop_menu) {
+ xfce_desktop_menu_set_show_icons(desktop_menu,
+ show_desktop_menu_icons);
+ }
}
}
#endif
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
