GNOME.org
 

[ekiga] Icons: Moved more icons to theme instead of pixmaps.

commit 19217222dac94f8c3bf8383bc87f4f5c3240c76a
Author: Damien Sandras <dsandras beip be>
Date:   Sat May 19 15:09:21 2012 +0200

    Icons: Moved more icons to theme instead of pixmaps.

 lib/engine/components/opal/h323-endpoint.cpp       |    2 +-
 lib/engine/components/opal/sip-endpoint.cpp        |    2 +-
 lib/engine/gui/gtk-core/gtk-core.cpp               |    4 --
 .../gui/gtk-frontend/call-history-view-gtk.cpp     |   10 +++---
 lib/engine/gui/gtk-frontend/call-window.cpp        |   11 +++---
 lib/engine/gui/gtk-frontend/statusicon.cpp         |    3 --
 lib/gui/gmstockicons.c                             |   19 +++++-----
 lib/gui/gmstockicons.h                             |    9 -----
 .../16x16/{stock_brightness.png => brightness.png} |  Bin 356 -> 356 bytes
 pixmaps/{ => 16x16}/call-missed.png                |  Bin 409 -> 409 bytes
 pixmaps/{ => 16x16}/call-placed.png                |  Bin 655 -> 655 bytes
 pixmaps/{ => 16x16}/call-received.png              |  Bin 676 -> 676 bytes
 pixmaps/{ => 16x16}/call-transfer.png              |  Bin 682 -> 682 bytes
 pixmaps/16x16/{stock_color.png => color.png}       |  Bin 577 -> 577 bytes
 pixmaps/16x16/{stock_contrast.png => contrast.png} |  Bin 625 -> 625 bytes
 .../video-settings.png}                            |  Bin 920 -> 920 bytes
 .../{stock_channel-blue.png => whiteness.png}      |  Bin 358 -> 358 bytes
 pixmaps/Makefile.am                                |   38 +++++++++----------
 pixmaps/local_contact.png                          |  Bin 452 -> 0 bytes
 pixmaps/remote_contact.png                         |  Bin 667 -> 0 bytes
 20 files changed, 39 insertions(+), 59 deletions(-)
---
diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index d8c23b4..5b9dfa9 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -135,7 +135,7 @@ Opal::H323::EndPoint::menu_builder_add_actions (const std::string & /*fullname*/
       builder.add_action ("call", _("Call"),
                           boost::bind (&Opal::H323::EndPoint::on_dial, this, uri));
     else
-      builder.add_action ("transfer", _("Transfer"),
+      builder.add_action ("call-transfer", _("Transfer"),
                           boost::bind (&Opal::H323::EndPoint::on_transfer, this, uri));
     populated = true;
   }
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 7d4fed2..c71da5e 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -260,7 +260,7 @@ Opal::Sip::EndPoint::menu_builder_add_actions (const std::string& fullname,
       builder.add_action ("call", call_action.str (),
                           boost::bind (&Opal::Sip::EndPoint::on_dial, this, (*it)));
     else
-      builder.add_action ("transfer", transfer_action.str (),
+      builder.add_action ("call-transfer", transfer_action.str (),
                           boost::bind (&Opal::Sip::EndPoint::on_transfer, this, (*it)));
 
     ita++;
diff --git a/lib/engine/gui/gtk-core/gtk-core.cpp b/lib/engine/gui/gtk-core/gtk-core.cpp
index 8b241f4..fe686d9 100644
--- a/lib/engine/gui/gtk-core/gtk-core.cpp
+++ b/lib/engine/gui/gtk-core/gtk-core.cpp
@@ -87,10 +87,6 @@ Gtk::Core::Core ()
   gtk_icon_factory_add (factory, "clear", icon_set);
   gtk_icon_set_unref (icon_set);
 
-  icon_set = gtk_icon_factory_lookup_default (GM_STOCK_CALL_TRANSFER);
-  gtk_icon_factory_add (factory, "transfer", icon_set);
-  gtk_icon_set_unref (icon_set);
-
   gtk_icon_factory_add_default (factory);
   g_object_unref (factory);
 }
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index 73e2435..f7b685e 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -98,21 +98,21 @@ on_contact_added (Ekiga::ContactPtr contact,
 
     case History::RECEIVED:
 
-      id = GM_STOCK_CALL_RECEIVED;
+      id = "call-received";
       break;
 
     case History::PLACED:
 
-      id = GM_STOCK_CALL_PLACED;
+      id = "call-placed";
       break;
 
     case History::MISSED:
 
-      id = GM_STOCK_CALL_MISSED;
+      id = "call-missed";
       break;
 
     default:
-      id = GTK_STOCK_MISSING_IMAGE;
+      break;
     }
   }
 
@@ -332,7 +332,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book)
   renderer = gtk_cell_renderer_pixbuf_new ();
   gtk_tree_view_column_pack_start (column, renderer, FALSE);
   gtk_tree_view_column_add_attribute (column, renderer,
-				      "stock-id", COLUMN_PIXBUF);
+				      "icon_name", COLUMN_PIXBUF);
 
   /* show name and text */
   renderer = gm_cell_renderer_bitext_new ();
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 2aeb160..8ab5a05 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -1731,7 +1731,7 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
 
   /* Brightness */
   hbox = gtk_hbox_new (false, 0);
-  image = gtk_image_new_from_icon_name (GM_ICON_BRIGHTNESS, GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("brightness", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
 
   cw->priv->adj_brightness = gtk_adjustment_new (brightness, 0.0,
@@ -1750,7 +1750,7 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
 
   /* Whiteness */
   hbox = gtk_hbox_new (false, 0);
-  image = gtk_image_new_from_icon_name (GM_ICON_WHITENESS, GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("whiteness", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
 
   cw->priv->adj_whiteness = gtk_adjustment_new (whiteness, 0.0,
@@ -1769,7 +1769,7 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
 
   /* Colour */
   hbox = gtk_hbox_new (false, 0);
-  image = gtk_image_new_from_icon_name (GM_ICON_COLOURNESS, GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("color", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
 
   cw->priv->adj_colour = gtk_adjustment_new (colour, 0.0,
@@ -1788,7 +1788,7 @@ gm_cw_video_settings_window_new (EkigaCallWindow *cw)
 
   /* Contrast */
   hbox = gtk_hbox_new (false, 0);
-  image = gtk_image_new_from_icon_name (GM_ICON_CONTRAST, GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("contrast", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (hbox), image, false, false, 0);
 
   cw->priv->adj_contrast = gtk_adjustment_new (contrast, 0.0,
@@ -2398,8 +2398,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
   item = gtk_tool_item_new ();
   cw->priv->video_settings_button = gtk_button_new ();
   gtk_button_set_relief (GTK_BUTTON (cw->priv->video_settings_button), GTK_RELIEF_NONE);
-  image = gtk_image_new_from_stock (GM_STOCK_COLOR_BRIGHTNESS_CONTRAST,
-                                    GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("video-settings", GTK_ICON_SIZE_MENU);
   gtk_container_add (GTK_CONTAINER (cw->priv->video_settings_button), image);
   gtk_container_add (GTK_CONTAINER (item), cw->priv->video_settings_button);
   gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), false);
diff --git a/lib/engine/gui/gtk-frontend/statusicon.cpp b/lib/engine/gui/gtk-frontend/statusicon.cpp
index 50dd2f4..a80bfc8 100644
--- a/lib/engine/gui/gtk-frontend/statusicon.cpp
+++ b/lib/engine/gui/gtk-frontend/statusicon.cpp
@@ -465,12 +465,9 @@ static void
 statusicon_set_inacall (StatusIcon *statusicon,
                         bool inacall)
 {
-  GtkWidget *chat_window = NULL;
-
   g_return_if_fail (statusicon != NULL);
 
   boost::shared_ptr<GtkFrontend> frontend = statusicon->priv->core.get<GtkFrontend> ("gtk-frontend");
-  chat_window = GTK_WIDGET (frontend->get_chat_window ());
 
   /* Update the status icon */
   if (inacall)
diff --git a/lib/gui/gmstockicons.c b/lib/gui/gmstockicons.c
index ca4f81d..4887a81 100644
--- a/lib/gui/gmstockicons.c
+++ b/lib/gui/gmstockicons.c
@@ -56,14 +56,8 @@ gnomemeeting_stock_icons_init (void)
 
 	static const GmStockIcon items[] =
 	{
-	        { GM_STOCK_COLOR_BRIGHTNESS_CONTRAST, gm_color_brightness_contrast_stock_data },
 
 		{ GM_STOCK_MESSAGE, gm_message_stock_data},
-		{ GM_STOCK_CALL_PLACED, gm_call_placed_stock_data},
-		{ GM_STOCK_CALL_MISSED, gm_call_missed_stock_data},
-		{ GM_STOCK_CALL_RECEIVED, gm_call_received_stock_data},
-		{ GM_STOCK_CALL_TRANSFER, gm_call_transfer_stock_data},
-
 		{ GM_STOCK_PHONE_HANG_UP_16, gm_phone_hang_up_stock_data_16},
 		{ 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},
@@ -80,15 +74,20 @@ gnomemeeting_stock_icons_init (void)
 	static const GmThemeIcon theme_builtins[] =
 	{
 	        { GM_ICON_AUDIO_VOLUME_HIGH, 16, gm_audio_volume_high_16_stock_data },
-		{ GM_ICON_BRIGHTNESS, 16, gm_brightness_16_stock_data},
-		{ GM_ICON_COLOURNESS, 16, gm_colourness_16_stock_data},
-		{ GM_ICON_CONTRAST, 16, gm_contrast_16_stock_data},
+		{ "brightness", 16, gm_brightness_16},
+		{ "call-placed", 16, gm_call_placed_16},
+		{ "call-missed", 16, gm_call_missed_16},
+		{ "call-received", 16, gm_call_received_16},
+		{ "call-transfer", 16, gm_call_transfer_16},
+		{ "color", 16, gm_color_16},
+		{ "contrast", 16, gm_contrast_16},
+		{ "whiteness", 16, gm_whiteness_16},
+	        { "video-settings", 16, gm_video_settings_16 },
 	        { GM_ICON_LOGO, 16, gm_logo_16_stock_data },
 	        { GM_ICON_LOGO, 22, gm_logo_22_stock_data },
 	        { GM_ICON_LOGO, 32, gm_logo_32_stock_data },
 	        { GM_ICON_LOGO, 48, gm_logo_48_stock_data },
 	        { GM_ICON_LOGO, 72, gm_logo_72_stock_data },
-		{ GM_ICON_WHITENESS, 16, gm_whiteness_16_stock_data},
 		{ "user-inacall", 16, gm_user_inacall_16 },
 		{ "user-ringing", 16, gm_user_ringing_16 },
 
diff --git a/lib/gui/gmstockicons.h b/lib/gui/gmstockicons.h
index 7007a10..014ed74 100644
--- a/lib/gui/gmstockicons.h
+++ b/lib/gui/gmstockicons.h
@@ -41,20 +41,11 @@ G_BEGIN_DECLS
 
 /* Icon theme builtins */
 #define GM_ICON_AUDIO_VOLUME_HIGH          "audio-volume-high"
-#define GM_ICON_BRIGHTNESS                 "stock_brightness"
-#define GM_ICON_COLOURNESS                 "stock_color"
-#define GM_ICON_CONTRAST                   "stock_contrast"
 #define GM_ICON_LOGO                       PACKAGE_NAME
-#define GM_ICON_WHITENESS                  "stock_channel-blue"
 #define GM_ICON_ADDRESSBOOK                "stock_addressbook"
 
 /* True stock icons */
-#define GM_STOCK_COLOR_BRIGHTNESS_CONTRAST   "gm_color_brightness_contrast_stock"
 #define GM_STOCK_MESSAGE          "gm_message_stock"
-#define GM_STOCK_CALL_PLACED      "gm_call_placed_stock"
-#define GM_STOCK_CALL_MISSED      "gm_call_missed_stock"
-#define GM_STOCK_CALL_RECEIVED    "gm_call_received_stock"
-#define GM_STOCK_CALL_TRANSFER    "gm_call_transfer_stock"
 
 #define GM_STOCK_PHONE_HANG_UP_16    "gm_phone_hang_up_stock_16"
 #define GM_STOCK_PHONE_PICK_UP_16    "gm_phone_pick_up_stock_16"
diff --git a/pixmaps/16x16/stock_brightness.png b/pixmaps/16x16/brightness.png
similarity index 100%
rename from pixmaps/16x16/stock_brightness.png
rename to pixmaps/16x16/brightness.png
diff --git a/pixmaps/call-missed.png b/pixmaps/16x16/call-missed.png
similarity index 100%
rename from pixmaps/call-missed.png
rename to pixmaps/16x16/call-missed.png
diff --git a/pixmaps/call-placed.png b/pixmaps/16x16/call-placed.png
similarity index 100%
rename from pixmaps/call-placed.png
rename to pixmaps/16x16/call-placed.png
diff --git a/pixmaps/call-received.png b/pixmaps/16x16/call-received.png
similarity index 100%
rename from pixmaps/call-received.png
rename to pixmaps/16x16/call-received.png
diff --git a/pixmaps/call-transfer.png b/pixmaps/16x16/call-transfer.png
similarity index 100%
rename from pixmaps/call-transfer.png
rename to pixmaps/16x16/call-transfer.png
diff --git a/pixmaps/16x16/stock_color.png b/pixmaps/16x16/color.png
similarity index 100%
rename from pixmaps/16x16/stock_color.png
rename to pixmaps/16x16/color.png
diff --git a/pixmaps/16x16/stock_contrast.png b/pixmaps/16x16/contrast.png
similarity index 100%
rename from pixmaps/16x16/stock_contrast.png
rename to pixmaps/16x16/contrast.png
diff --git a/pixmaps/color-brightness-contrast.png b/pixmaps/16x16/video-settings.png
similarity index 100%
rename from pixmaps/color-brightness-contrast.png
rename to pixmaps/16x16/video-settings.png
diff --git a/pixmaps/16x16/stock_channel-blue.png b/pixmaps/16x16/whiteness.png
similarity index 100%
rename from pixmaps/16x16/stock_channel-blue.png
rename to pixmaps/16x16/whiteness.png
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index e146a3f..3a5f61d 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -27,21 +27,21 @@ IMAGES_FILES= \
 	32x32/multimedia-headset.svg \
 	256x256/multimedia-headset.png \
 	16x16/audio-volume-high.png \
+	16x16/brightness.png \
+	16x16/call-placed.png \
+	16x16/call-missed.png \
+	16x16/call-received.png \
+	16x16/call-transfer.png \
+	16x16/color.png \
+	16x16/contrast.png \
 	16x16/user-inacall.png \
 	16x16/user-ringing.png \
-	16x16/stock_brightness.png \
-	16x16/stock_channel-blue.png \
-	16x16/stock_color.png \
-	16x16/stock_contrast.png \
+	16x16/video-settings.png \
+	16x16/whiteness.png \
 	24x24/contact-new.png \
-	color-brightness-contrast.png \
 	local_contact.png \
 	remote_contact.png \
 	message.png \
-	call-placed.png \
-	call-missed.png \
-	call-received.png \
-	call-transfer.png \
 	ekiga-logo.png \
 	24x24/phone-hang-up.png \
 	24x24/phone-pick-up.png \
@@ -57,24 +57,22 @@ IMAGES_FILES= \
 
 IMAGES= \
 	gm_audio_volume_high_16_stock_data $(srcdir)/16x16/audio-volume-high.png \
-	gm_brightness_16_stock_data $(srcdir)/16x16/stock_brightness.png \
-	gm_colourness_16_stock_data $(srcdir)/16x16/stock_color.png \
-	gm_contrast_16_stock_data $(srcdir)/16x16/stock_contrast.png \
+	gm_brightness_16 $(srcdir)/16x16/brightness.png \
+	gm_call_placed_16 $(srcdir)/16x16/call-placed.png \
+	gm_call_missed_16 $(srcdir)/16x16/call-missed.png \
+	gm_call_received_16 $(srcdir)/16x16/call-received.png \
+	gm_call_transfer_16 $(srcdir)/16x16/call-transfer.png \
+	gm_color_16 $(srcdir)/16x16/color.png \
+	gm_contrast_16 $(srcdir)/16x16/contrast.png \
+	gm_video_settings_16 $(srcdir)/16x16/video-settings.png \
+	gm_whiteness_16 $(srcdir)/16x16/whiteness.png \
 	gm_logo_16_stock_data $(srcdir)/16x16/apps/@PACKAGE_NAME  png \
 	gm_logo_22_stock_data $(srcdir)/22x22/apps/@PACKAGE_NAME  png \
 	gm_logo_24_stock_data $(srcdir)/24x24/apps/@PACKAGE_NAME  png \
 	gm_logo_32_stock_data $(srcdir)/32x32/apps/@PACKAGE_NAME  png \
 	gm_logo_48_stock_data $(srcdir)/48x48/apps/@PACKAGE_NAME  png \
 	gm_logo_72_stock_data $(srcdir)/72x72/apps/@PACKAGE_NAME  png \
-	gm_whiteness_16_stock_data $(srcdir)/16x16/stock_channel-blue.png \
-	gm_color_brightness_contrast_stock_data $(srcdir)/color-brightness-contrast.png \
-	gm_remote_contact_stock_data $(srcdir)/remote_contact.png \
-	gm_local_contact_stock_data $(srcdir)/local_contact.png \
 	gm_message_stock_data $(srcdir)/message.png \
-	gm_call_placed_stock_data $(srcdir)/call-placed.png \
-	gm_call_received_stock_data $(srcdir)/call-received.png \
-	gm_call_missed_stock_data $(srcdir)/call-missed.png \
-	gm_call_transfer_stock_data $(srcdir)/call-transfer.png \
 	gm_user_inacall_16 $(srcdir)/16x16/user-inacall.png \
 	gm_user_ringing_16 $(srcdir)/16x16/user-ringing.png \
 	gm_phone_hang_up_stock_data_24 $(srcdir)/24x24/phone-hang-up.png \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]