Changeset 9989

Timestamp:

Jan 21, 2010, 8:51:48 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) #2780 "for themability, T needs unique icon names for window, system tray, and popup icons" -- added to trunk for 1.81

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• actions.h (modified) (1 diff)
• notify.c (modified) (4 diffs)
• tr-icon.c (modified) (1 diff)

trunk/gtk/actions.c

@@ -145 +145 @@
 static const BuiltinIconInfo my_fallback_icons[] =
 {
-    { tr_icon_logo, "transmission"      },
+    { tr_icon_logo, WINDOW_ICON         },
+    { tr_icon_logo, TRAY_ICON           },
+    { tr_icon_logo, NOTIFICATION_ICON   },
     { tr_icon_lock, "transmission-lock" },
     { options_icon, "options"           },

trunk/gtk/actions.h

@@ -16 +16 @@
 #include <gtk/gtk.h>
 #include "tr-core.h"
+
+#define WINDOW_ICON        "transmission-main-window-icon"
+#define TRAY_ICON          "transmission-tray-icon"
+#define NOTIFICATION_ICON  "transmission-notification-icon"
+
 
 void       actions_init( GtkUIManager * ui_manager,

trunk/gtk/notify.c

@@ -22 +22 @@
 
 #include <glib/gi18n.h>
+#include "actions.h" /* NOTIFICATION_ICON */
 #include "conf.h"
 #include "notify.h"
@@ -90 +91 @@
 }
 
+static void
+addIcon( NotifyNotification * notify )
+{
+    int size = 32;
+    GtkIconTheme * theme;
+    GdkPixbuf * icon;
+
+    gtk_icon_size_lookup( GTK_ICON_SIZE_DIALOG, &size, &size );
+    theme = gtk_icon_theme_get_default( );
+    icon = gtk_icon_theme_load_icon( theme, NOTIFICATION_ICON, size, 0, NULL );
+
+    if( icon != NULL )
+    {
+        notify_notification_set_icon_from_pixbuf( notify, icon );
+        g_object_unref( icon );
+    }
+}
+
 void
 tr_notify_send( TrTorrent *tor )
@@ -112 +131 @@
         n = notify_notification_new( _( "Torrent Complete" ),
                                      info->name,
-                                     "transmission", NULL );
+                                     NULL, NULL );
+        addIcon( n );
 
         if( can_support_actions( ) )
@@ -137 +157 @@
     {
         NotifyNotification * n = notify_notification_new(
-            _( "Torrent Added" ), name, "transmission", NULL );
+            _( "Torrent Added" ), name, NULL, NULL );
+        addIcon( n );
         notify_notification_set_timeout( n, NOTIFY_EXPIRES_DEFAULT );
         notify_notification_show( n, NULL );

trunk/gtk/tr-icon.c

@@ -112 +112 @@
 tr_icon_new( TrCore * core )
 {
-    GtkStatusIcon * icon = gtk_status_icon_new_from_icon_name(
-        "transmission" );
+    const char * icon_name = TRAY_ICON;
+    GtkStatusIcon * icon = gtk_status_icon_new_from_icon_name( icon_name );
 
     g_signal_connect( icon, "activate", G_CALLBACK( activated ), NULL );