From ce031eee3be4923dd7261082f66cc753c65c8b1e Mon Sep 17 00:00:00 2001 From: Eric Gregory Date: Wed, 1 Feb 2012 18:51:07 -0800 Subject: [PATCH] Icons folder, label icons in sidebar, new archive button, sidebar assertion fix, inbox selection fix. Fixes #4700 Closes #4659 --- icons/archive-icon.png | Bin 0 -> 1931 bytes icons/multiple-tags.png | Bin 0 -> 3425 bytes icons/one-tag.png | Bin 0 -> 3152 bytes src/client/ui/folder-list.vala | 10 ++++++---- src/client/ui/icon-factory.vala | 11 ++++++++++- src/client/ui/sidebar/sidebar-tree.vala | 13 +++++++++---- ui/toolbar.glade | 2 +- 7 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 icons/archive-icon.png create mode 100644 icons/multiple-tags.png create mode 100644 icons/one-tag.png diff --git a/icons/archive-icon.png b/icons/archive-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3fb700329f52648aed93e173070f730180a990b7 GIT binary patch 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~~jkW+Vq$V4?QMNR>)4#kBxMFS5Cy1KGRpIFer+}GF8BO0i~)5Udz{fXkDzUIXp zU8jCOtX`abZO`{-Xa8-zZufl6=ee8DvmfB#ndV^}XxhND(n(J6LG$q=#~wb>b7d=7!LT(K42iz{-6Jq)65vgh8D&HB@->Y zIT}P59IE=9mN7WEF*eMdp%%=rfQ2F9baK*Th5%iL1oir7ml+!7{+LO86pfAMAE#ESTfwuWiapzPxD~du$|$+IRWlX3>-WR27w)| znhY$}3<)Qcl`9xpW-^GleG0evsJ%|$xfTOM#mr4MJ5?-Q8>2aN3)#cN_2e|pd5UX` zm?bhL&T`N@R5?@9sL_P~!RIp!3=1ZT3O;E5{I}v9-@0?>%=)(R#p}M>&-Py_De3XQ zr{`A}I503gEUCNrPe*^VRD(5JL+-yts_$4b;Q;wm;6nz~Hi=QEP*v^p}GYItSQf4zk`k$o(h5ti?&?$RQ^IC$5wR znW6;EHBC+$ZD%*gY9;7jaga4R5SY<6xqwgaQ0NXm+XDVyi5&9|YV2v`WN|#fA)Kgq ztAjDAD?+)CLwsiI5524k8#^I(fR~~ zQPZEcJ?@568aD;nUg6p5ymN)QREygp?h7d;hO_#`7Ra3h?;vuCx`Q)vX>`m;JQ*;!xPqaRn z`{eKw<0sNj6hB3C%}sJBT=FCMkw(y|EHBBY0#8kzvZc;2atvKOE9mZug&~5b{ZUS9 z7j6q$AK1P^*rarp<=JL2Pw%B`7frn^l_8$-J#+nwl3jv#r^@+FzYu=u^h@^_(_b)u zDd*vB6Ky`;k**;*TY_C8U9wza{S2RFl9#(BkB1nT8@`_Ld?x?Q{Ll!kZCW*=6HjqX z^_r?SRa#3wWaX-5tM0Ah4*eW@I;4MPTyX6=w@~BY$16FnOj{kgYHq;mVCmrWmDVfT zSEaAW53yfT7x}l7E%LC>VSnc(feSXqKi+dpfje1pbA^s#Ht*`T(nixGY8%hqtSQsl zJ>#$J?rz&vD;HWi8+#dtZw~rACC#4w@r=SBb4vU;pKC0i{<*H}p2&O6N1D>hOni14 zrp9Einl^n}#A=V#fveqL?=@TZcKO_8dtG-&{%+)RJnp3)qwb#Ge~xwT^WdAocb9W5 z7xT5X`npbURrXTpg}YtK_vbBtH)GzuxQ2N?`OEKB?tT7CrdI!N$lu&w%fGtwM6hk< zQDM8yb56qMsA*xojjaCh+aCj+V-GtxFHM}9IQ?PE#GMyy7GHJib>r{JJQnj<<#Fz@ z++&N?*whr&ynSE!zMB=~yK|Z5GHV}epW|oGoLzMG+Dy~gwuaY@p3i|aQRNZ$$qQnT}wZ_ z;p4WG+g5Iu-0<`U+wFDRa<|ncrYDJ~Z$G;3@Vm)-C)e((?fq-Z&f9*IZ?$ZcY+dn| zA`z=Ft9!G~&3R{Ed-Th+m-^`u=LOE+Fn+vE__XGc%(=m{FT1CUr|&Fo{@l^s>D_c% zZ@Qh{Z0TcnPwai-Rr0kk_F>hfuXAT_o_*-;ireeonZ3(=*M4XI8I$>%^CFFlFC0GM z{2=h@MSJe~Qw_53uc`BQ_HRtz`dnE*S$|^q+Upy(FD+m7J@LJ`-8Z|U`H$@$+nC=o zx)&LL#{9tc6WdSwAI_f_-+JGbFfd-#Ydz*y$+h*x$6a>FL3>iWw)~OjxV<{rQY@6VGMxwFcC^xORa(@mXT`;W{4m z*7nx$Hv7JUjtHrXhSN>UFWzx3zVGtOWtz*q+3AM1Em6GT&vg%l?>N zTI89l5pyFvbG&6N^|aQR<>lEq&E}ym{zJB zHD0RobZ3kD$_aaXczy29wwfn4t4tx+$kuAFVe_Pk6AGPHDf&*{mi{XJSz6iYHL0ze z{vFNh-mWh&l+efI5{&8Kcp zFrV{&{{Oc^hlCzZ+P1XKJ6u;b;@RFcS(ck@3M+4OJr-rvZVO{uW3!`cn^x{s|J859 zr?0Eqt5)Tk-57W9RMWw&jM=ZbL%E)|*1o=T{cWs&gns1xt%<+d=1SX%c6O~3xh+0j zwEl+1orFOT=;tu4Iw!?wKr z`pxyW{`9jNw|6&hbKbdlzs-(4smo8EJ8NwpvLxh7$gdEycbD#NO}zdi@8Ub@>OJ2~ z-dw#Mz32O1yOaBFhcbrxUQN52`rGsO=I{3FI#<2?G3|G5>{`Fv!nennFERgRSLWMx zedm>{vX^W_g8Hv%zjo(4F2C>J-1p_Wyk@+iy>pH|QZ8_*eDd-;=l$<;yjHi$daBnv zWWOw5CYvs+pXD^`(=4~y!LxoxCq?h_KVx_C+N*n2f81}&^UpD{iLCVc9C9-A*2|{L zlhZ$)@0mMwZf%|3&pQdX7j3J4o_y|p7JvTxT>>Q!FS-8jer~a_1KrRSNSyZdEtD@QW)!(h%=ES4z)+>iz|hdl z!0_`w14F}028L1t28LG&3=CE?7#PI!C&eFiV_;zF@pN$vskpTyIM!owqDbAg_qXqy zxno{$kg`pF_UxZsZ!a&hcU<&B?M~P-@zfi0T@*?-c6Yo`+r6Rt#Uj_94hd6Xu1*D& z_RNbCNA1{Kuilt{&76C`=H?@F_QkIF*?g&$-)7F|1D5=A4qF;|X>Mb(+{RI6Iq_r) z!-T_ybKV_0yL;kQ*Vwt!e`c6S-MY{i)V0*Gh+)PZIeFgWFQsfn@>tC!jT)av3e+_4xVL945=kM(d6V0wg8;&j5eA>47 zMFzLYE!h)#Clrs%tm0@CkU3J;%l4b^it|CHG;YU2!E|}wHO7V2HD6Abd!64lZ!zC< z%~#)kyttyjOLK3W{L}DWWp;*Az6B?*J1l-U!ROeAN0sJRcK$f--XC7_d8XKon03ET ztDWgQwk*5Utf{$OI$-B)hm%GeEKD<|sDw-r);YsydX4~$UO{u9IY^**$OFjfoT3{@6CXF#$_2A@rc@k&3Z)K=ee7~lj ze(7b2mRz^$r_Yw|Q?IhAu5LP+;qYNE!%KIr;K@QIY)x-$0`lT|ZdNW>{P)Xqb7$tW zJPaL+G*ljKbdfu5=_4jr6xOJ+1a=A?ti{` z;Dn9s#TPuQufE#L@QvYu?%Y5B4}RX7`)#uB`7c$qj0~m?HVj=~OY7MguI^N=WD$;? R%)r3F;OXk;vd$@?2>=v8Wg!3n literal 0 HcmV?d00001 diff --git a/icons/one-tag.png b/icons/one-tag.png new file mode 100644 index 0000000000000000000000000000000000000000..fb456c7db058d41dff5b7b44f620272d461f5c8d GIT binary patch literal 3152 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 literal 0 HcmV?d00001 diff --git a/src/client/ui/folder-list.vala b/src/client/ui/folder-list.vala index 447bda6d..1f5ecd5b 100644 --- a/src/client/ui/folder-list.vala +++ b/src/client/ui/folder-list.vala @@ -78,7 +78,7 @@ public class FolderList : Sidebar.Tree { } public Icon? get_sidebar_icon() { - return new ThemedIcon("folder"); + return IconFactory.instance.label_icon; } public string to_string() { @@ -90,14 +90,14 @@ public class FolderList : Sidebar.Tree { private Sidebar.Grouping user_folder_group; private Sidebar.Branch user_folder_branch; - private Gee.HashMap entries = new Gee.HashMap entries = new Gee.HashMap(); public FolderList() { base(new Gtk.TargetEntry[0], Gdk.DragAction.ASK, drop_handler); entry_selected.connect(on_entry_selected); - user_folder_group = new Sidebar.Grouping("", new ThemedIcon("folder")); + user_folder_group = new Sidebar.Grouping("", IconFactory.instance.label_folder_icon); user_folder_branch = new Sidebar.Branch(user_folder_group, Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, user_folder_comparator); graft(user_folder_branch, int.MAX); @@ -139,7 +139,9 @@ public class FolderList : Sidebar.Tree { } public void add_special_folder(Geary.SpecialFolder special, Geary.Folder folder) { - graft(new SpecialFolderBranch(special, folder), (int) special.folder_type); + SpecialFolderBranch branch = new SpecialFolderBranch(special, folder); + graft(branch, (int) special.folder_type); + entries.set(folder.get_path(), branch.get_root()); } public void select_path(Geary.FolderPath path) { diff --git a/src/client/ui/icon-factory.vala b/src/client/ui/icon-factory.vala index f343c10a..bd178e7d 100644 --- a/src/client/ui/icon-factory.vala +++ b/src/client/ui/icon-factory.vala @@ -21,6 +21,11 @@ public class IconFactory { public const int UNREAD_ICON_SIZE = 12; public Gdk.Pixbuf? unread { get; private set; } + public ThemedIcon label_icon { get; private set; default = new ThemedIcon("one-tag"); } + public ThemedIcon label_folder_icon { get; private set; default = new ThemedIcon("multiple-tags"); } + + private Gtk.IconTheme icon_theme { get; private set; } + private static Gdk.Pixbuf? load(string icon_name, int size, Gtk.IconLookupFlags flags = 0) { try { return Gtk.IconTheme.get_default().load_icon(icon_name, size, flags); @@ -31,10 +36,14 @@ public class IconFactory { return null; } - // Creats the icon factory. + // Creates the icon factory. private IconFactory() { // Load icons here. unread = load("mail-unread", UNREAD_ICON_SIZE); + + icon_theme= Gtk.IconTheme.get_default(); + icon_theme.append_search_path(GearyApplication.instance.get_resource_directory(). + get_child("icons").get_path()); } } diff --git a/src/client/ui/sidebar/sidebar-tree.vala b/src/client/ui/sidebar/sidebar-tree.vala index 8248bf1c..3cf848f2 100644 --- a/src/client/ui/sidebar/sidebar-tree.vala +++ b/src/client/ui/sidebar/sidebar-tree.vala @@ -264,8 +264,8 @@ public class Sidebar.Tree : Gtk.TreeView { selected_wrapper = wrapper; - if (editing_disabled == 0 && wrapper != null) - text_renderer.editable = wrapper.entry is Sidebar.RenameableEntry; + if (editing_disabled == 0 && wrapper != null && wrapper.entry is Sidebar.RenameableEntry) + text_renderer.editable = ((Sidebar.RenameableEntry) wrapper.entry).is_user_renameable(); if (wrapper != null && !mask_entry_selected_signal) { Sidebar.SelectableEntry? selectable = wrapper.entry as Sidebar.SelectableEntry; @@ -286,7 +286,9 @@ public class Sidebar.Tree : Gtk.TreeView { Gtk.TreePath? path = get_selected_path(); if (path != null && editing_disabled > 0 && --editing_disabled == 0) { EntryWrapper? wrapper = get_wrapper_at_path(path); - text_renderer.editable = (wrapper != null && (wrapper.entry is Sidebar.RenameableEntry)); + if (wrapper != null && (wrapper.entry is Sidebar.RenameableEntry)) + text_renderer.editable = ((Sidebar.RenameableEntry) wrapper.entry). + is_user_renameable(); } } @@ -841,7 +843,7 @@ public class Sidebar.Tree : Gtk.TreeView { } } else if (event.button == 1 && event.type == Gdk.EventType.BUTTON_PRESS) { // Is this a click on an already-highlighted tree item? - if ((old_path_ref != null) && (old_path_ref.get_path() != null) + if (path != null && (old_path_ref != null) && (old_path_ref.get_path() != null) && (old_path_ref.get_path().compare(path) == 0)) { // yes, don't allow single-click editing, but // pass the event on for dragging. @@ -1038,6 +1040,9 @@ public class Sidebar.Tree : Gtk.TreeView { if (renameable == null) return false; + if (wrapper.entry is Sidebar.Grouping) + return false; + get_selection().select_path(path); return true; diff --git a/ui/toolbar.glade b/ui/toolbar.glade index 9dd7f428..ff571cec 100644 --- a/ui/toolbar.glade +++ b/ui/toolbar.glade @@ -78,7 +78,7 @@ False Delete True - archive + archive-icon False