From f33e3b06f4e2348419d1caad524e1f06e2a89d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 22 Jan 2007 21:43:36 +0000 Subject: [PATCH] Add new icons svn path=/trunk/; revision=347 --- ChangeLog | 5 +++++ Makefile.am | 2 +- sysprof-icon-16.png | Bin 0 -> 847 bytes sysprof-icon-24.png | Bin 0 -> 1467 bytes sysprof-icon-48.png | Bin 0 -> 3915 bytes sysprof-icon.png | Bin 3761 -> 0 bytes sysprof.c | 41 ++++++++++++++++++++++++++++++++++------- 7 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 sysprof-icon-16.png create mode 100644 sysprof-icon-24.png create mode 100644 sysprof-icon-48.png delete mode 100644 sysprof-icon.png diff --git a/ChangeLog b/ChangeLog index 0fd19176..fb9702fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 22 16:37:12 2007 Søren Sandmann + + * sysprof-icon-16/24/48.png: + * sysprof.c: Add new icons from Diana. + 2007-01-05 Behdad Esfahbod * module/Makefile: Correct $PWD usage, so make install works from diff --git a/Makefile.am b/Makefile.am index eeb2a04e..62844e8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ dist_udev_DATA = 60-sysprof.rules pixmapsdir = $(datadir)/pixmaps dist_pkgdata_DATA = sysprof.glade -dist_pixmaps_DATA = sysprof-icon.png +dist_pixmaps_DATA = sysprof-icon-16.png sysprof-icon-24.png sysprof-icon-48.png # # Command line version diff --git a/sysprof-icon-16.png b/sysprof-icon-16.png new file mode 100644 index 0000000000000000000000000000000000000000..bc1cfe482ae8dbc926bc6030acf51a828592a333 GIT binary patch literal 847 zcmV-V1F-ywP)z`BX9yy~XAC?yHHDJb!$ z^1_Cdq)1vup{NU;f+JDT)#hLWJm>TsVM8nY;QROv@B2LGdEfVYgu2Zug~*j*g(y>GY0` zjol(jq%sUi5S6@?l$6w(&F07CYHDk1d!eGK=Ea41<=Gm$^ndU?6_oOpmzO2^n@LF;xpU>BSK!L;Is6CQFmwx`XgX_23 z(QsOgFK-_pQ?`nh^FV8p0jA2kC@rr9MJZb4a=9i&pj0YVR;#sUcGit-^A(5*Ku5wC z8yhh?>_Vny3-ePhlozOAw44LKo3N==DszfJViN@Z*v~)+mSPjE$AL5jaG|~ly}ey% zY^cFeeI~SOAVZ%II*m#f1VNkX0T~?|4(~8>B*1L`f*=4q*()ond*wavdJR1R-s=L? zLKN}c-56;kmr@Xq$D>}a_mfVi#nMzaro8|Y0~T z+$=A*y;*a&XHUfzq0MbZLOcmt$pfJeaP>dJ_V(|W8yg$lsptE*nG6QQDU-?6&avS$ zsx*a+R%d`?Sp=9+kmKUd2)L8y`SnBHNNlUo>-7#Y9UJM7hI|Jik;o)*;esS~zn%XG ZFaSAbNpiY~tiAvM002ovPDHLkV1llUiT?lq literal 0 HcmV?d00001 diff --git a/sysprof-icon-24.png b/sysprof-icon-24.png new file mode 100644 index 0000000000000000000000000000000000000000..55b2078aae7c8fd0801b04c53c85b6d245dcc67e GIT binary patch literal 1467 zcmV;s1w{IZP)(N{oN%R>bw72U+JxxgT52pWNe82Q63k%`1Cb6ZS|#+f*`_*gRb z$edXgrzS+RO(R({aHMLOz|2@0D4{d%ydA=kYt| z{Lbag&dy@~;_-NRnJXb7Av-xaIcH{OCgSya`)FxA-abxu0+xB{_4=yP($ZsOU=5$o zXYF=-=k43KPliGvbG-fhuJ5HyQN78=y@Zq)H-QCSrtF@C1e=Zh_3!9pnw$MK7ix4d*0ue!y+S}WESFKk2 zb8~ac>HfXn??2nt*7g-WtH{VkE=B*zR~$u&Br=l87uK>!$_Q(T(P-SFQmLFan+*d4 z1F>*8d_*Rb2`GADEEW?y*EtgxB9Tahw6wHuhlYmA>2;Szqha#%^FJZkmXeYp9UgWd z8ja%V(;!GOsEQb>sH0k~cK7J$sQAW>8+++oCrLDJ7180X)z#JS(*c}2cdoghfpLXpTuV<0uXekNri1*`C>^{(5>;%p+kG96mkFl zJ$(7aDTHGR7){$DS82&D!0%=d3v@xq^B@!o;)&afoSdA;eSLkqsKWkUst^1m=TlQt zce`9p;jyDfkhf_c-l#f`^b`e>B>>9;-(3P?st8_5y9G_S8IKOv2MAKSN&e2dLQ7h>DF0bYK4%M%fSwR|5NX0tf06k)2nLkiG$B zTPmQ}X)rM{QJ$HZSBM1`N?CgW-{JWEB)5n>>%P&*C*2 zGv>tM7{Zw|$FX(udPu2b^eSo`kpc`)jqI!pOixdfS*Yh>T4+EL2m}y`&LAOCi8TiD zmbUY0>ud}#nbwhH!sqkBeA5Dk0rdnR7E*2UR8T6FTm+nA!D10iPEL9t7V!`X2jC9^ zO!Qghuw;N55C%gAPMm0jRH}l_4qRvke!a@I{|vljnCK!*<<8DWu&_+~$H&K6b+Sg_ zwwv*AbTbT;E)n@7ChWid=BK$xBAn-BT%iQsdYxl{Fmf^l7_>cxR;wE(GW1}sWBwn3 zrKhK7AZt|~hAfw0edK}VAuvK!{lp7Q5Igw;l+>wbYqn8<>%Gb{7w)v*LNFMjXxV=l zh8dnWurPuEG2{7$hK5GDl#hGngODZtfT`&O>Q;h*+$mZ|o5*`NwPcW@aZP%$x73I2 z+Z#bW;Bhz{t)$1d)WG@CY&PFqx4sY_dkgFx2k~IchhJJ}(RGi=-a)w_0EVYyhz4!g z^R^Qo9{6aE1c?AI(+K^GbcB|o>i}iCp1A+#?3H=1Ijp}y8nvN#MG-VBHX!7cLn~*H zs}I3$v!c54EU_xfvG8?^#d3kpkIuuhK9j2);;mOO8x|Kp;053_ED zXdZNrjg7TFhs8+}S@>7+QZt$0Qc`_q(03i}Po#H(JUU69b4sV4V?G=2x8+{}1^^qW VQcTivM;`zH002ovPDHLkV1lLtvbg{N literal 0 HcmV?d00001 diff --git a/sysprof-icon-48.png b/sysprof-icon-48.png new file mode 100644 index 0000000000000000000000000000000000000000..bbb82104bf3679f7b2e6cd6798d0d16b83386936 GIT binary patch literal 3915 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 b{|Ybw$4hqkhry}K00000NkvXXu0mjfV;3yL diff --git a/sysprof.c b/sysprof.c index c833da8a..51e6e401 100644 --- a/sysprof.c +++ b/sysprof.c @@ -50,9 +50,9 @@ struct Application Collector * collector; State state; + GdkPixbuf * icon; GtkWidget * main_window; - GdkPixbuf * icon; GtkTreeView * object_view; GtkTreeView * callers_view; @@ -1336,7 +1336,37 @@ set_shadows (void) } #define GLADE_FILE DATADIR "/sysprof.glade" -#define ICON_FILE PIXMAPDIR "/sysprof-icon.png" + +static void +set_icons (Application *app) +{ + const char *icon_files [] = { + PIXMAPDIR "/sysprof-icon-16.png", + PIXMAPDIR "/sysprof-icon-24.png", + PIXMAPDIR "/sysprof-icon-48.png", + NULL + }; + GList *pixbufs = NULL; + int i; + + for (i = 0; icon_files[i] != NULL; ++i) + { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (icon_files[i], NULL); + + if (pixbuf) + { + pixbufs = g_list_prepend (pixbufs, pixbuf); + + if (i == 2) /* 48 x 48 */ + app->icon = g_object_ref (pixbuf); + } + } + + gtk_window_set_icon_list (GTK_WINDOW (app->main_window), pixbufs); + + g_list_foreach (pixbufs, (GFunc)g_object_unref, NULL); + g_list_free (pixbufs); +} static gboolean build_gui (Application *app) @@ -1347,8 +1377,7 @@ build_gui (Application *app) set_shadows (); - if (!g_file_test (GLADE_FILE, G_FILE_TEST_EXISTS) || - !g_file_test (ICON_FILE, G_FILE_TEST_EXISTS)) + if (!g_file_test (GLADE_FILE, G_FILE_TEST_EXISTS)) { sorry (NULL, "Sysprof was not compiled or installed correctly.\n" @@ -1363,9 +1392,7 @@ build_gui (Application *app) /* Main Window */ app->main_window = glade_xml_get_widget (xml, "main_window"); - app->icon = gdk_pixbuf_new_from_file (ICON_FILE, NULL); - - gtk_window_set_icon (GTK_WINDOW (app->main_window), app->icon); + set_icons (app); g_signal_connect (G_OBJECT (app->main_window), "delete_event", G_CALLBACK (on_delete), NULL);