[Goodies-commits] r3330 - in xfce4-notes-plugin/trunk: icons/16x16 icons/22x22 icons/24x24 icons/32x32 icons/scalable panel-plugin
Mike Massonnet
mmassonnet at xfce.org
Wed Oct 10 23:57:58 CEST 2007
Author: mmassonnet
Date: 2007-10-10 21:57:58 +0000 (Wed, 10 Oct 2007)
New Revision: 3330
Removed:
xfce4-notes-plugin/trunk/icons/16x16/xfce4-notes-plugin-rev.png
xfce4-notes-plugin/trunk/icons/22x22/xfce4-notes-plugin-rev.png
xfce4-notes-plugin/trunk/icons/24x24/xfce4-notes-plugin-rev.png
xfce4-notes-plugin/trunk/icons/32x32/xfce4-notes-plugin-rev.png
xfce4-notes-plugin/trunk/icons/scalable/xfce4-notes-plugin-rev.svg
Modified:
xfce4-notes-plugin/trunk/icons/16x16/Makefile.am
xfce4-notes-plugin/trunk/icons/22x22/Makefile.am
xfce4-notes-plugin/trunk/icons/24x24/Makefile.am
xfce4-notes-plugin/trunk/icons/32x32/Makefile.am
xfce4-notes-plugin/trunk/icons/scalable/Makefile.am
xfce4-notes-plugin/trunk/panel-plugin/notes.c
xfce4-notes-plugin/trunk/panel-plugin/panel-plugin.c
Log:
* icons/: Remove -rev icons
* panel-plugin/*.c: Set in/sensitivity of panel menu icons.
Modified: xfce4-notes-plugin/trunk/icons/16x16/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/icons/16x16/Makefile.am 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/icons/16x16/Makefile.am 2007-10-10 21:57:58 UTC (rev 3330)
@@ -1,7 +1,6 @@
iconsdir = $(datadir)/icons/hicolor/16x16/apps
icons_DATA = \
- xfce4-notes-plugin.png \
- xfce4-notes-plugin-rev.png
+ xfce4-notes-plugin.png
EXTRA_DIST = \
$(icons_DATA)
Deleted: xfce4-notes-plugin/trunk/icons/16x16/xfce4-notes-plugin-rev.png
Modified: xfce4-notes-plugin/trunk/icons/22x22/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/icons/22x22/Makefile.am 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/icons/22x22/Makefile.am 2007-10-10 21:57:58 UTC (rev 3330)
@@ -1,7 +1,6 @@
iconsdir = $(datadir)/icons/hicolor/22x22/apps
icons_DATA = \
- xfce4-notes-plugin.png \
- xfce4-notes-plugin-rev.png
+ xfce4-notes-plugin.png
EXTRA_DIST = \
$(icons_DATA)
Deleted: xfce4-notes-plugin/trunk/icons/22x22/xfce4-notes-plugin-rev.png
Modified: xfce4-notes-plugin/trunk/icons/24x24/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/icons/24x24/Makefile.am 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/icons/24x24/Makefile.am 2007-10-10 21:57:58 UTC (rev 3330)
@@ -1,7 +1,6 @@
iconsdir = $(datadir)/icons/hicolor/24x24/apps
icons_DATA = \
- xfce4-notes-plugin.png \
- xfce4-notes-plugin-rev.png
+ xfce4-notes-plugin.png
EXTRA_DIST = \
$(icons_DATA)
Deleted: xfce4-notes-plugin/trunk/icons/24x24/xfce4-notes-plugin-rev.png
Modified: xfce4-notes-plugin/trunk/icons/32x32/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/icons/32x32/Makefile.am 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/icons/32x32/Makefile.am 2007-10-10 21:57:58 UTC (rev 3330)
@@ -1,7 +1,6 @@
iconsdir = $(datadir)/icons/hicolor/32x32/apps
icons_DATA = \
- xfce4-notes-plugin.png \
- xfce4-notes-plugin-rev.png
+ xfce4-notes-plugin.png
EXTRA_DIST = \
$(icons_DATA)
Deleted: xfce4-notes-plugin/trunk/icons/32x32/xfce4-notes-plugin-rev.png
Modified: xfce4-notes-plugin/trunk/icons/scalable/Makefile.am
===================================================================
--- xfce4-notes-plugin/trunk/icons/scalable/Makefile.am 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/icons/scalable/Makefile.am 2007-10-10 21:57:58 UTC (rev 3330)
@@ -1,7 +1,6 @@
iconsdir = $(datadir)/icons/hicolor/scalable/apps
icons_DATA = \
- xfce4-notes-plugin.svg \
- xfce4-notes-plugin-rev.svg
+ xfce4-notes-plugin.svg
EXTRA_DIST = \
$(icons_DATA)
Deleted: xfce4-notes-plugin/trunk/icons/scalable/xfce4-notes-plugin-rev.svg
Modified: xfce4-notes-plugin/trunk/panel-plugin/notes.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/notes.c 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/panel-plugin/notes.c 2007-10-10 21:57:58 UTC (rev 3330)
@@ -673,6 +673,13 @@
notes_window_show (NotesWindow *notes_window)
{
TRACE ("Show window: %p", notes_window);
+ if (GTK_WIDGET_VISIBLE (notes_window->window))
+ {
+ gtk_widget_show (notes_window->notebook);
+ gtk_window_present (GTK_WINDOW (notes_window->window));
+ return;
+ }
+
if (notes_window->x != -1 && notes_window->y != -1)
gtk_window_move (GTK_WINDOW (notes_window->window),
notes_window->x,
Modified: xfce4-notes-plugin/trunk/panel-plugin/panel-plugin.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/panel-plugin.c 2007-10-10 21:57:29 UTC (rev 3329)
+++ xfce4-notes-plugin/trunk/panel-plugin/panel-plugin.c 2007-10-10 21:57:58 UTC (rev 3330)
@@ -200,28 +200,20 @@
{
TRACE ("notes_window (%d): %p", (i-1), notes_window);
GtkWidget *mi_foo = gtk_image_menu_item_new_with_label (notes_window->name);
-
+ GtkWidget *icon = gtk_image_new_from_icon_name ("xfce4-notes-plugin",
+ GTK_ICON_SIZE_MENU);
if (GTK_WIDGET_VISIBLE (notes_window->window))
- {
- GtkWidget *icon = gtk_image_new_from_icon_name ("xfce4-notes-plugin",
- GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi_foo), icon);
- g_signal_connect_swapped (mi_foo,
- "activate",
- G_CALLBACK (notes_window_hide),
- notes_window);
- }
+ gtk_widget_set_sensitive (icon, TRUE);
else
- {
- GtkWidget *icon = gtk_image_new_from_icon_name ("xfce4-notes-plugin-rev",
- GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi_foo), icon);
- g_signal_connect_swapped (mi_foo,
- "activate",
- G_CALLBACK (notes_window_show),
- notes_window);
- }
+ gtk_widget_set_sensitive (icon, FALSE);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi_foo), icon);
+
+ g_signal_connect_swapped (mi_foo,
+ "activate",
+ G_CALLBACK (notes_window_show),
+ notes_window);
+
gtk_menu_shell_append (GTK_MENU_SHELL (notes_plugin->menu), mi_foo);
}
More information about the Goodies-commits
mailing list