From 843c839730c9601ea00aa8014d5e60eb3bd360d9 Mon Sep 17 00:00:00 2001 From: Nate Lillich Date: Tue, 1 May 2012 11:23:52 -0700 Subject: [PATCH] Fix for #4700. Icons used by Geary that are missing from the GNOME theme are now supplied. --- icons/CMakeLists.txt | 22 +- icons/application-menu.svg | 117 ++++++ icons/archive-icon.png | Bin 1931 -> 0 bytes icons/archive-insert.svg | 544 ++++++++++++++++++++++++++ icons/archive.svg | 631 +++++++++++++++++++++++++++++++ icons/mail-inbox.png | Bin 0 -> 930 bytes icons/mail-sent.png | Bin 0 -> 1039 bytes src/client/geary-controller.vala | 14 +- ui/toolbar.glade | 2 +- 9 files changed, 1315 insertions(+), 15 deletions(-) create mode 100644 icons/application-menu.svg delete mode 100644 icons/archive-icon.png create mode 100644 icons/archive-insert.svg create mode 100644 icons/archive.svg create mode 100644 icons/mail-inbox.png create mode 100644 icons/mail-sent.png diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 7ba6e5cb..c924093a 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -1,10 +1,18 @@ set(ICONS_DEST share/geary/icons) -install(FILES archive-icon.png DESTINATION ${ICONS_DEST}) -install(FILES geary.png DESTINATION ${ICONS_DEST}) -install(FILES geary.png DESTINATION share/icons/hicolor/scalable/apps) -install(FILES multiple-tags.png DESTINATION ${ICONS_DEST}) -install(FILES non-starred-grey.png DESTINATION ${ICONS_DEST}) -install(FILES one-tag.png DESTINATION ${ICONS_DEST}) -install(FILES starred.png DESTINATION ${ICONS_DEST}) +set(ICON_FILES + application-menu.svg + archive.svg + archive-insert.svg + geary.png + mail-inbox.png + mail-sent.png + multiple-tags.png + non-starred-grey.png + one-tag.png + starred.png +) + +install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST}) +install(FILES geary.png DESTINATION share/icons/hicolor/scalable/apps) diff --git a/icons/application-menu.svg b/icons/application-menu.svg new file mode 100644 index 00000000..072b3a45 --- /dev/null +++ b/icons/application-menu.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/archive-icon.png b/icons/archive-icon.png deleted file mode 100644 index 3fb700329f52648aed93e173070f730180a990b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1931 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANOqL7py-Ar-gYPOmHwzAk%w z|D{(EcPHg0o}Q!{ZRReqKvJzS^8^cX=4bXaj?_8Jd}n!jcHh3xY<(K*E zp1s_=ef8D%pMU@Bo9gpJUVhns<}}tWgLzu+y2t0`@6DOO7_gYDWd*|$z5VTHPO$see?8f4y^j0B->Iqg zpRSqO?J2n`%XVI}AxVPkNX4f3a_fUl0dpjqRyeG(jV z=R1^FWb(%5L!B4%jjNoq?+WWiS_+q5VA_0?t8eqE%}3qZ_e{T*$P{)yT!_M&&N?qgq@?AKg4&6=W_g^5fq&j-B5p=7}sXE?SiNabB7eoKpfaV*$(&;Iq^XFu0`zZ7ScUtV4CWM#ghxt-kYsVDfd82an&ob0Y{<^Fl{ z-+>QTlNRLzne~48+-ql3G)Qo>qhZh z-E4}}ADt-ZI(x>dw^l=DiH(c5%ihABLQhT=uxcE5XnVqcNiW0wo!cjBeUMn^w`9ti z>AYT%=M5i=S*iTgJ@fhCL6y}!OKSvs+ajK={^Y%Jns?wlS69*U1$_JK67|(K&Ah=M z!l23NTN9jlnz=toOPSe2QmuHe>r#;M~Hu~U)UhT#?NZ;GswIs zSa>r-e;Hei-*WxyA9v0*V)(kosdKFvH}k_4QZnw^4Vy3MPweH3naJ27)Kp<}Xo|wF zPr|%A6`Cuvn=O7OnX6q+o_O~-x3W~j-FHhF;+^$u)yj8yG3tq*-*@Cp;fAO=KCND% z40j)%dK%~~xoxZ2$=n$oZXK4oH|292-XByC5ap^{bzlllLG^*-x*wjH-QCPQd8Nu^ ztKbud!lO-op~$$Cv)#9Et8moI;avVHMd+O#DhFnaPDhR;#+T-PeO@UB>9*K*If z+EGpOfHc>EGOh>f3xgWi4GpKIY^_VJl6V-vaP$?=)cY*_`x*9J?cR4$(Pa1RCwePh zx2)mbq-D_7xPo7O+5(oXydn#hONSS${;#ubP=9cyv?k5kXz^m62hDHn1@d{7;{AeI zEw1dE_3%;lhj&LmN4$zx`n`@>AxBJ9^h0 z+Sk9+&sgfj%ek#H;NlKlaB#DTox4E(zTbR#Tz5_=^!f({W^!5`u3~r^D9htsu;#hs z6z)*vhO?RHbN5tB2RS$EaNhTufAH1SvolWcUtlp=sJTJN^qiZFO~6IQJNMsZ&EPBYy!60f zXUw$QdQ)rPwn?a^vngzCc0KrY#b=id?=zUnZV9^>FZ_G3X@zQwSh34=ZWr#>dmF0O z8j2nM7|!=_mBKG!tpmIKi@zTgH7sNe#>>q z1-h4+w_o-@eaU(9L7q+D-))+FL%&|Xv*y!_|?Xx5gY&zC^Wd$?eY;M2V>~ik1^QGiMau)`)(%Vv%o} z=$c|&A6dtwSX!u(PM`n`ioH!DZPWF5QH{DQ&6 zwdA=#RdB>i$$$yv^A-H?Li_!S&MSC)bvKYiIWR zZ1vJvRNwI@oA9>0sAkQg#xNhg)lu(`UGR|VJiI(%zfXc*-HcjUM#azT(m!7f-v2*3 zl|S~IH-ni~g;mTcpL(7HHIKtiKl`=faeI00KMNOct~~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/archive.svg b/icons/archive.svg new file mode 100644 index 00000000..b0d16af2 --- /dev/null +++ b/icons/archive.svg @@ -0,0 +1,631 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/mail-inbox.png b/icons/mail-inbox.png new file mode 100644 index 0000000000000000000000000000000000000000..65c6973e236ce62b8dd662668ae11c2728abef22 GIT binary patch literal 930 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8Nyc^&X;>rL64Gj%aQpVa~ zprK)=VP>YMr)Owrt)pYw(b1s?0%l!Z&H83$otJ-r<@wN${H;9;m&{wdY{8P{3zx1~v~1<#6|0x7TD4;Jy5$=- zui3P9-KIB{o40PKT)>CJWpE-Bp z?77ot&!0Mf{_Mre=PqBpaQXfAD_1XF`LN^4hn-ixY`J>v($x>UuHCqN?dy&kH?Q8f zb?w&e>$mRQxP9m5?K`*b+`W1C-mSa$Zr{6q`~Lkq_aEGS@bKQlNB18+dhqD+{YQ@< zJO-hMkDokz^7PTur;ndLd;IL#ljqN$K7aA-#fzseUOap8^4ZIm&tJZJ@#@u!*RNl` zdGqSc+c$6DzIyxi_1m{^-o1PK?%lih@87C4r%xY0fBy94%jd6O zzkK`l^~aCzKYsl9`SZuGUq65S`t|?+f6-kQpqSSv3GxeOU}Rz8;t>)S7L$^dQ&dz{ z3u$bhG->|)lkdNL`TiZG@AscSfByc}ZB4CZU|{s|ba4!+xV7}`b91Lcnd2YZbb};Q zvp<{;&HJVmePTz~o09b@>vK|7HLdmVXaD6 z)aJ4|`K&67$FH4i7f3aoY;@j_!f1Dj7v|xGc>1)3Z-mcaV`J(UZ+tVMp;DcX#P2cLxlOO+` z`?mM$)1$3FZ%S&rs4MUtdf$;Z_gi=H>%dt!o>5oE~CKa^^ qs3w*fG4`}<;qiLe$#ZLcEkkibN}NKt_(lc>1_n=8KbLh*2~7Z{gdP3> literal 0 HcmV?d00001 diff --git a/icons/mail-sent.png b/icons/mail-sent.png new file mode 100644 index 0000000000000000000000000000000000000000..5a26a6384fd8e5cebeb4df1a7d0c9d5ca9f80cc7 GIT binary patch literal 1039 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8N(g^Sgab-XS)22g`53=9mr_w3rZY3-i9yN(?{di=!E6DN+(oHcF1!nwQm?A)_w=ia@$_U+$& z;K1IKCy$>zd1A)Qsq+`iS+H>K%vn>`u3Nop*N)wLcJ0}-YtPPqwKs~zjEb@or{oW7`MvW%`cWGj`sYx%1AP^@r!}y*q#Jy@mVlE!=;9(Z+pC z4&7h6_2|-r50)Kzu>A1-<%b`xIP!4i;fE`a++TU*;i{vLRvmk^`q-m2#~!UY{&?;7 z{p(IV*?9c^##2u=o_f0Z^wTY;A8$GHbjz7%Th2b)dgj@-v(L7ld%oks^PLx-@4E1O z*Tv_%LFmPvi!b(Ee7Wb+i@ld$?7Q@Q-{lwk5A552<>i4ZFArROdGP$5gBKnjy!z_U z)mMkEy*hI3^^xnZj$VI#^v3I>H(wvS@%q@!*T-+XIezo?iCb?@-hO-P)X7tK-k!em z_RO8PXYRf|d-lxPyKm3keRuxey9@WCa_wQf7fB*jd=kM>ofB*dX{pZi0 zzkmPy{rmUtKM?r;|Nrq8?L!O<3@Rl-e!&b}eEfofLc)^LdS5^WeftgrKYsl9`3nrv zg7-gWU|=lrba4!+xK%qTG?*!np_NfodiT*dQP-mf_LP;Imu;8m;4CXIXV>c99dmQP zx`HZyo$>RRXJ)>CI^o|z4?a(Ou7cBRbBp&@*#p)4GQAwak)!oSkd(vce9eFW{46H@baq zrtFlP_I275?--ZLG)fCkHeOsOSh$+SaYI1%R_4?k{q<}6L-Oo&dG-lDTrYLp`@_d; z-_E_e_fOpMfs4qq6&N1J`re)nB0Y~iYA-?8WE*QKHd&!pKrTN4$r zFwr)2E3fYLcJuP&yTzPJy^p7cPM#MUptr+jcgzzW)rWpr?8mZl-oAMJX?g4CLz;1$ zZY6Rh1eW9^MP<49xhB^6<=H-46eGdp-SJ3CW^$c_Or2BAFTTcwdkh$Nu-^@S<@&wN zt|Y#4&q9$I8scULcy_!x=C)H|q9$8az={7g&)KtrrrnBtb=V4&u{~Y=T-G@yGywqD C=X|LE literal 0 HcmV?d00001 diff --git a/src/client/geary-controller.vala b/src/client/geary-controller.vala index 5729ff50..c26ba540 100644 --- a/src/client/geary-controller.vala +++ b/src/client/geary-controller.vala @@ -140,7 +140,7 @@ public class GearyController { quit.label = _("_Quit"); entries += quit; - Gtk.ActionEntry mark_menu = { ACTION_MARK_AS_MENU, "mail-mark-notjunk", TRANSLATABLE, null, + Gtk.ActionEntry mark_menu = { ACTION_MARK_AS_MENU, null, TRANSLATABLE, null, null, on_show_mark_menu }; mark_menu.label = _("_Mark as..."); entries += mark_menu; @@ -165,19 +165,19 @@ public class GearyController { mark_unstarred.label = _("U_nstar"); entries += mark_unstarred; - Gtk.ActionEntry new_message = { ACTION_NEW_MESSAGE, Gtk.Stock.NEW, TRANSLATABLE, "N", null, + Gtk.ActionEntry new_message = { ACTION_NEW_MESSAGE, null, TRANSLATABLE, "N", null, on_new_message }; new_message.label = _("_New Message"); entries += new_message; add_accelerator("N", ACTION_NEW_MESSAGE); - Gtk.ActionEntry reply_to_message = { ACTION_REPLY_TO_MESSAGE, Gtk.Stock.GO_BACK, - TRANSLATABLE, "R", null, on_reply_to_message }; + Gtk.ActionEntry reply_to_message = { ACTION_REPLY_TO_MESSAGE, null, TRANSLATABLE, "R", + null, on_reply_to_message }; entries += reply_to_message; add_accelerator("R", ACTION_REPLY_TO_MESSAGE); - Gtk.ActionEntry reply_all_message = { ACTION_REPLY_ALL_MESSAGE, Gtk.Stock.MEDIA_REWIND, - TRANSLATABLE, "R", null, on_reply_all_message }; + Gtk.ActionEntry reply_all_message = { ACTION_REPLY_ALL_MESSAGE, null, TRANSLATABLE, + "R", null, on_reply_all_message }; entries += reply_all_message; add_accelerator("R", ACTION_REPLY_ALL_MESSAGE); @@ -186,7 +186,7 @@ public class GearyController { entries += forward_message; add_accelerator("F", ACTION_FORWARD_MESSAGE); - Gtk.ActionEntry delete_message = { ACTION_DELETE_MESSAGE, Gtk.Stock.CLOSE, TRANSLATABLE, "A", + Gtk.ActionEntry delete_message = { ACTION_DELETE_MESSAGE, null, TRANSLATABLE, "A", null, on_delete_message }; entries += delete_message; add_accelerator("Delete", ACTION_DELETE_MESSAGE); diff --git a/ui/toolbar.glade b/ui/toolbar.glade index 6be29b8b..bb64ee8c 100644 --- a/ui/toolbar.glade +++ b/ui/toolbar.glade @@ -133,7 +133,7 @@ False menu True - gtk-properties + application-menu False