diff options
author | Alan Fitton <ajf@eth0.org.uk> | 2011-02-07 21:24:34 +0000 |
---|---|---|
committer | Alan Fitton <ajf@eth0.org.uk> | 2011-02-07 21:24:34 +0000 |
commit | bda3a28d5b6be86b93e8e22fd024f085342905cb (patch) | |
tree | 30903cee35a2bd27dffa502f0a5af0afef43a044 | |
parent | 08ecf5ec0883737916816d70974ab97042ddc4b7 (diff) |
more icon fixes
-rw-r--r-- | src/Makefile.am | 55 | ||||
-rw-r--r-- | src/hicolor_apps_16x16_transmission-remote-gtk.png | bin | 0 -> 838 bytes | |||
-rw-r--r-- | src/hicolor_apps_22x22_transmission-remote-gtk.png | bin | 0 -> 1207 bytes | |||
-rw-r--r-- | src/hicolor_apps_24x24_transmission-remote-gtk.png | bin | 0 -> 1200 bytes | |||
-rw-r--r-- | src/hicolor_apps_32x32_transmission-remote-gtk.png | bin | 0 -> 1881 bytes | |||
-rw-r--r-- | src/hicolor_apps_48x48_transmission-remote-gtk.png | bin | 0 -> 2683 bytes | |||
-rw-r--r-- | src/trg-main-window.c | 11 |
7 files changed, 56 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c31c94d..00853af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,11 @@ public_icons_themes = \ public_icons = \ hicolor_apps_scalable_transmission-remote-gtk.svg \ + hicolor_apps_16x16_transmission-remote-gtk.png \ + hicolor_apps_24x24_transmission-remote-gtk.png \ + hicolor_apps_48x48_transmission-remote-gtk.png \ + hicolor_apps_22x22_transmission-remote-gtk.png \ + hicolor_apps_32x32_transmission-remote-gtk.png \ $(NULL) EXTRA_DIST = transmission-remote-gtk.desktop.in @@ -20,14 +25,48 @@ schema_DATA = transmission-remote-gtk.schemas bin_PROGRAMS = transmission-remote-gtk INCLUDES = --pedantic -Wall -I.. -O2 $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gconf_CFLAGS) $(gio_CFLAGS) $(unique_CFLAGS) $(notify_CFLAGS) -transmission_remote_gtk_SOURCES = main.c requests.c base64.c json.c http.c dispatch.c trg-main-window.c util.c trg-about-window.c torrent.c \ - tpeer.c tfile.c session-get.c trg-client.c trg-preferences-dialog.c hig.c trg-torrent-tree-view.c \ - trg-tree-view.c trg-torrent-model.c trg-peers-model.c trg-peers-tree-view.c trg-model.c trg-files-model.c \ - trg-files-tree-view.c trg-state-selector.c trg-general-panel.c trg-toolbar.c trg-menu-bar.c \ - trg-status-bar.c trg-trackers-tree-view.c trg-trackers-model.c trg-torrent-props-dialog.c \ - trg-json-widgets.c trg-torrent-add-url-dialog.c trg-cell-renderer-speed.c trg-cell-renderer-size.c \ - trg-cell-renderer-ratio.c trg-cell-renderer-eta.c trg-remote-prefs-dialog.c trg-cell-renderer-wanted.c \ - trg-cell-renderer-priority.c +transmission_remote_gtk_SOURCES = main.c \ + requests.c \ + base64.c \ + json.c \ + http.c \ + dispatch.c \ + trg-main-window.c \ + util.c \ + trg-about-window.c \ + torrent.c \ + tpeer.c \ + tfile.c \ + session-get.c \ + trg-client.c \ + trg-preferences-dialog.c \ + hig.c \ + trg-torrent-tree-view.c \ + trg-tree-view.c \ + trg-torrent-model.c \ + trg-peers-model.c \ + trg-peers-tree-view.c \ + trg-model.c \ + trg-files-model.c \ + trg-files-tree-view.c \ + trg-state-selector.c \ + trg-general-panel.c \ + trg-toolbar.c \ + trg-menu-bar.c \ + trg-status-bar.c \ + trg-trackers-tree-view.c \ + trg-trackers-model.c \ + trg-torrent-props-dialog.c \ + trg-json-widgets.c \ + trg-torrent-add-url-dialog.c \ + trg-cell-renderer-speed.c \ + trg-cell-renderer-size.c \ + trg-cell-renderer-ratio.c \ + trg-cell-renderer-eta.c \ + trg-remote-prefs-dialog.c \ + trg-cell-renderer-wanted.c \ + trg-cell-renderer-priority.c \ + $(NULL) transmission_remote_gtk_LDFLAGS = -lcurl $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gconf_LIBS) $(gio_LIBS) $(unique_LIBS) $(notify_LIBS) diff --git a/src/hicolor_apps_16x16_transmission-remote-gtk.png b/src/hicolor_apps_16x16_transmission-remote-gtk.png Binary files differnew file mode 100644 index 0000000..78b1af2 --- /dev/null +++ b/src/hicolor_apps_16x16_transmission-remote-gtk.png diff --git a/src/hicolor_apps_22x22_transmission-remote-gtk.png b/src/hicolor_apps_22x22_transmission-remote-gtk.png Binary files differnew file mode 100644 index 0000000..3283ea2 --- /dev/null +++ b/src/hicolor_apps_22x22_transmission-remote-gtk.png diff --git a/src/hicolor_apps_24x24_transmission-remote-gtk.png b/src/hicolor_apps_24x24_transmission-remote-gtk.png Binary files differnew file mode 100644 index 0000000..6200ec0 --- /dev/null +++ b/src/hicolor_apps_24x24_transmission-remote-gtk.png diff --git a/src/hicolor_apps_32x32_transmission-remote-gtk.png b/src/hicolor_apps_32x32_transmission-remote-gtk.png Binary files differnew file mode 100644 index 0000000..d3d6464 --- /dev/null +++ b/src/hicolor_apps_32x32_transmission-remote-gtk.png diff --git a/src/hicolor_apps_48x48_transmission-remote-gtk.png b/src/hicolor_apps_48x48_transmission-remote-gtk.png Binary files differnew file mode 100644 index 0000000..3444de8 --- /dev/null +++ b/src/hicolor_apps_48x48_transmission-remote-gtk.png diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 539c944..c161085 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -1275,6 +1275,8 @@ static GObject *trg_main_window_constructor(GType type, GtkWidget *w; GtkWidget *outerVbox; GtkWidget *toolbarHbox; + GtkIconTheme *theme; + GdkPixbuf *icon; gint width, height; self = TRG_MAIN_WINDOW(G_OBJECT_CLASS @@ -1283,7 +1285,12 @@ static GObject *trg_main_window_constructor(GType type, construct_params)); priv = TRG_MAIN_WINDOW_GET_PRIVATE(self); - gtk_window_set_icon_name(GTK_WINDOW(self), PACKAGE_NAME); + theme = gtk_icon_theme_get_default(); + icon = gtk_icon_theme_load_icon (theme, PACKAGE_NAME, 48, GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + + if (icon) + gtk_window_set_default_icon(icon); + gtk_window_set_title(GTK_WINDOW(self), PACKAGE_NAME); gtk_container_set_border_width(GTK_CONTAINER(self), 5); gtk_window_set_default_size(GTK_WINDOW(self), 1000, 600); @@ -1385,7 +1392,7 @@ static GObject *trg_main_window_constructor(GType type, priv->notebook = trg_main_window_notebook_new(self); gtk_paned_pack2(GTK_PANED(priv->vpaned), priv->notebook, FALSE, FALSE); - priv->statusIcon = gtk_status_icon_new_from_file(PACKAGE_NAME); + priv->statusIcon = gtk_status_icon_new_from_pixbuf(icon); gtk_status_icon_set_screen(priv->statusIcon, gtk_window_get_screen(GTK_WINDOW(self))); g_signal_connect(priv->statusIcon, "activate", |