ekiga r6763 - in trunk: . lib/engine/gui/gtk-frontend lib/gui pixmaps src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Aug 31 18:38:20 2008
New Revision: 6763
URL: http://svn.gnome.org/viewvc/ekiga?rev=6763&view=rev

Log:
Address book is back with an icon.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   trunk/lib/gui/gmstockicons.c
   trunk/lib/gui/gmstockicons.h
   trunk/pixmaps/Makefile.am
   trunk/src/gui/main.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Sun Aug 31 18:38:20 2008
@@ -644,6 +644,7 @@
 
   sigc::connection conn;
 
+  GdkPixbuf *pixbuf = NULL;
   GtkWidget *menu_bar = NULL;
   GtkWidget *frame = NULL;
   GtkWidget *vbox = NULL;
@@ -659,6 +660,12 @@
   gtk_window_set_title (GTK_WINDOW (self), _("Address Book"));
   gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER);
 
+  pixbuf = gtk_widget_render_icon (GTK_WIDGET (self),
+				   GM_ICON_ADDRESSBOOK,
+				   GTK_ICON_SIZE_MENU, NULL);
+  gtk_window_set_icon (GTK_WINDOW (self), pixbuf);
+  g_object_unref (pixbuf);
+
   /* Start building the window */
   vbox = gtk_vbox_new (FALSE, 2);
 

Modified: trunk/lib/gui/gmstockicons.c
==============================================================================
--- trunk/lib/gui/gmstockicons.c	(original)
+++ trunk/lib/gui/gmstockicons.c	Sun Aug 31 18:38:20 2008
@@ -82,6 +82,8 @@
 		{ GM_STOCK_PHONE_PICK_UP_16, gm_phone_pick_up_stock_data_16},
 		{ GM_STOCK_PHONE_HANG_UP_24, gm_phone_hang_up_stock_data_24},
 		{ GM_STOCK_PHONE_PICK_UP_24, gm_phone_pick_up_stock_data_24},
+
+	        { GM_STOCK_ADDRESSBOOK, gm_addressbook_16_stock_data },
 	};
 
         typedef struct 
@@ -94,6 +96,7 @@
 	static const GmThemeIcon theme_builtins[] =
 	{
 		{ GM_ICON_ADD_CONTACT, 24, gm_add_contact_24_stock_data},
+	        { GM_ICON_ADDRESSBOOK, 16, gm_addressbook_16_stock_data },
 	        { GM_ICON_ADDRESSBOOK, 24, gm_addressbook_24_stock_data },
 	        { GM_ICON_AUDIO_VOLUME_HIGH, 16, gm_audio_volume_high_16_stock_data },
 		{ GM_ICON_BRIGHTNESS, 16, gm_brightness_16_stock_data},

Modified: trunk/lib/gui/gmstockicons.h
==============================================================================
--- trunk/lib/gui/gmstockicons.h	(original)
+++ trunk/lib/gui/gmstockicons.h	Sun Aug 31 18:38:20 2008
@@ -77,6 +77,7 @@
 #define GM_STOCK_PHONE_HANG_UP_24    "gm_phone_up_stock_24"
 #define GM_STOCK_PHONE_PICK_UP_24    "gm_phone_pick_up_stock_24"
 
+#define GM_STOCK_ADDRESSBOOK          "stock_addressbook"
 
 void gnomemeeting_stock_icons_init (void);
 

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Sun Aug 31 18:38:20 2008
@@ -15,6 +15,7 @@
 	16x16/audio-volume-high.png \
 	16x16/camera-video.png \
 	16x16/media-playback-pause.png \
+	16x16/stock_addressbook.png \
 	16x16/stock_brightness.png \
 	16x16/stock_channel-blue.png \
 	16x16/stock_color.png \
@@ -47,6 +48,7 @@
 
 IMAGES= \
 	gm_add_contact_24_stock_data $(srcdir)/24x24/contact-new.png \
+	gm_addressbook_16_stock_data $(srcdir)/16x16/stock_addressbook.png \
 	gm_addressbook_24_stock_data $(srcdir)/24x24/stock_addressbook.png \
 	gm_audio_volume_high_16_stock_data $(srcdir)/16x16/audio-volume-high.png \
 	gm_brightness_16_stock_data $(srcdir)/16x16/stock_brightness.png \

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sun Aug 31 18:38:20 2008
@@ -1742,9 +1742,9 @@
 		     GTK_STOCK_ADD, 'n', 
 		     GTK_SIGNAL_FUNC (pull_trigger_cb), local_cluster_trigger, true),
 
-      GTK_MENU_THEME_ENTRY("address_book", _("_Find Contacts"),
+      GTK_MENU_THEME_ENTRY("address_book", _("Address _Book"),
 			   _("Find contacts"),
- 			   GTK_STOCK_FIND, 'f',
+ 			   GM_ICON_ADDRESSBOOK, 'b',
 			   GTK_SIGNAL_FUNC (show_widget_cb),
 			   (gpointer) addressbook_window, TRUE),