From 4b58aa10ea50b2656b598f69e2f897082624de08 Mon Sep 17 00:00:00 2001 From: Martijn Voncken Date: Sat, 6 Dec 2008 20:42:43 +0000 Subject: [PATCH] clean up/finish oxygen --- deluge/ui/webui/scripts/copy_icons.py | 20 ++++++------------ .../static/images/16/{LICENCE => LICENSE} | 2 +- .../webui/static/images/16/drive-harddisk.png | Bin 0 -> 632 bytes deluge/ui/webui/static/images/16/gtk-yes.png | Bin 0 -> 562 bytes .../ui/webui/static/images/16/list-remove.png | Bin 666 -> 820 bytes .../16/{proess-stop.png => process-stop.png} | Bin deluge/ui/webui/static/images/16/readme.txt | 5 ++--- .../ui/webui/static/images/16/select-all.png | Bin 0 -> 541 bytes 8 files changed, 10 insertions(+), 17 deletions(-) rename deluge/ui/webui/static/images/16/{LICENCE => LICENSE} (96%) create mode 100644 deluge/ui/webui/static/images/16/drive-harddisk.png create mode 100644 deluge/ui/webui/static/images/16/gtk-yes.png rename deluge/ui/webui/static/images/16/{proess-stop.png => process-stop.png} (100%) create mode 100644 deluge/ui/webui/static/images/16/select-all.png diff --git a/deluge/ui/webui/scripts/copy_icons.py b/deluge/ui/webui/scripts/copy_icons.py index 3d1163e4f..b88d58dd2 100644 --- a/deluge/ui/webui/scripts/copy_icons.py +++ b/deluge/ui/webui/scripts/copy_icons.py @@ -19,15 +19,6 @@ # 51 Franklin Street, Fifth Floor # Boston, MA 02110-1301, USA. # -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. """ copy icons from kde icon set. @@ -38,8 +29,8 @@ import os from os import path from shutil import copyfile -ICON_SET = "/home/martijn/prj/oxygen/oxygen/16" -TARGET_DIR = "/home/martijn/src/deluge-stable/deluge/ui/webui/static/images/16x16" +ICON_SET = "/home/martijn/prj/oxygen/oxygen/16x16" +TARGET_DIR = "/home/martijn/src/deluge-stable/deluge/ui/webui/static/images/16" mapping = { @@ -53,11 +44,11 @@ mapping = { "go-top":"actions/2uparrow", "label":"actions/rss_tag", "list-add":"actions/add", - "list-remove":"actions/editdelete", + "list-remove":"actions/fileclose", "move":"actions/filesaveas", "pause":"actions/media_playback_pause", "preferences-system":"apps/preferences_system", - "proess-stop":"actions/process_stop", + "process-stop":"actions/process_stop", "queue-down":"actions/1downarrow", "queue-up":"actions/1uparrow", "start":"actions/media_playback_start", @@ -65,6 +56,9 @@ mapping = { "system-log-out":"actions/system_log_out", "user-trash":"actions/edittrash", "view-refresh":"actions/view_refresh", + "gtk-yes":"actions/flag_green", + "drive-harddisk":"devices/drive_harddisk", + "select-all":"actions/edit_select_all" } for target, source in mapping.iteritems(): diff --git a/deluge/ui/webui/static/images/16/LICENCE b/deluge/ui/webui/static/images/16/LICENSE similarity index 96% rename from deluge/ui/webui/static/images/16/LICENCE rename to deluge/ui/webui/static/images/16/LICENSE index 0ff982655..c6cd56804 100644 --- a/deluge/ui/webui/static/images/16/LICENCE +++ b/deluge/ui/webui/static/images/16/LICENSE @@ -8,7 +8,7 @@ You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License. ICONS NOT UNDER THIS LICENCE: -*non yet +*none yet *add them here if needed. diff --git a/deluge/ui/webui/static/images/16/drive-harddisk.png b/deluge/ui/webui/static/images/16/drive-harddisk.png new file mode 100644 index 0000000000000000000000000000000000000000..bae21a835d1ba51055a3e1a4fd8988355c40a2f0 GIT binary patch literal 632 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUlpinR(g8$%zH2dih1^v)|cB zF)%Pn1^9%x{{R1<0Tr;bvkR6BYBkC`EV6KRc6M`f^YinIh>nPgii(SiOGrpaOiWBl zN=i*l&CAOxE-o%BE32%mtgNbRX=!O|YwPar?(OaETjbl{-#>BU#A(x}&6qJ`)~s1` z=FFKpckaA-^A;{#xOnm6rAwDCU%q_h%9X2EuU@le&AN5#)~{c`VZ(+^n>KCUym`x( zEnBy4-MMq;u3fu!@7}#<&z`+|_wL)bZ~y-N2M!!Kc<|t%Lx+wWIdb&q(PPJs9Y22j z#EBCpPo6w=>eT7er_Y=@bN1}n3l}b2ym;~Q<;z#DT)BGn>dl)sZ{50e`}XZSckbN1 zd-vYGdk-Ewc=+()qv7aqB-2 zG%;NnwMg@Ua9T<7ui7RJaXGiDh>!Udb9nvy)2gcLzCYT>-hB4>-78No_u5}>Y}_*Y ztM{$zi$5NB_`d$@wNI7r?3j6e={-HDJR_*Vv3A844WA{pB?%v%hGwcMg}+Kzusip& z@u^ikHVuwjHk;|ryT6FN*|+QQ9v$zFDG3F!?d`kSfAKa=HCrb>TWDVDJkd2tAy-#r gm9RId>52VkJ$uso44pa1{> literal 0 HcmV?d00001 diff --git a/deluge/ui/webui/static/images/16/gtk-yes.png b/deluge/ui/webui/static/images/16/gtk-yes.png new file mode 100644 index 0000000000000000000000000000000000000000..addab095f260d82580c52585df99a191d313e27d GIT binary patch literal 562 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0UgcY`pa)tkqU7#J8NOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3 zkz!zAT<_`P7-G@8bkhE85l4~Z`}4n@ee>sr_aavZoin9Pa~6m>dMHM8^)4v=!~TbT zjmYhiZACXCv{`grbo6>BXdQicbU{afOSf(Dy`#5p-j$wxTUk>m=I^28dmm<;m%jH~ zsii@HX-=^|LqX~P+X6E@v;Qi$1T0vl(Zay6qw1~Kt{U}!7cyo(x8EF}fA8L1yA`Yv zd-qid+?CNc(UX=DYv0-X)O~rXzTv9pbKa=>^@^=sbYzo*z~!YmAHV+csy-yznd;(f z-=@R3dZ~%w_MT^9Ygo5*Er@j3#L#$;bCz91e5OA`0^bQEc_p?v6EAcve9WPiCUNwF zR+C2Nh5OQZJgm7}^7qUSdH>A$%wBb2W2vx%lAOy`*Q9kcZP-0CDZRR6*=)Xf9Otb2 z?eFgTzoOb-_BW&Psp`FcmKYBtp90G)vo$!yJv5Yf4Y3#LL-;WH+^2udNE^S*CK)CrdFPhTK3o- zsQzEypmX{kr@?k3!M}WpGj=i9O|n;6#BzX%!FaV`gJuI$1N(&Y=d`-)janbhH7>i5 R&cMLH;OXk;vd$@?2>{P5^jZJ_ literal 0 HcmV?d00001 diff --git a/deluge/ui/webui/static/images/16/list-remove.png b/deluge/ui/webui/static/images/16/list-remove.png index ef8e685e2edc2bd322bc20b3930b3b8a4a956692..06c1cf41f6121e8ce77b7abcb678fd1094c449bf 100644 GIT binary patch delta 722 zcmbQmx`k~*Uj0T-7sn8b-ldcG`cF<2IePx{9{KaP`!#ZNxo_|btjt}aCc)0zIOD{T zLoHp(3z!AP1yqx=HZBeQ&nT8=pyDPY!BeRGh{NeZf|I=G2DVw#_UUe&zkaf)tN7l> zXZP-(^JI>*iSOb6JwJXg+PQP)OW$R66TS9^%|7ebQD!sMCy$||ewz|^@q00G;r90@ z6Is`a-`=JBY}U%tZ{KcRK6{perx1st##FD4!oKaNPj}{+UH)5@nD~<8L6E!q?8`5! zim$z%+TF?|o_en=VOH8zTaP8t==jAnZbc^!RF1ElQ!RaCOyaR z=b@ircXnAed|$o#hX3+~tF*%E!@~;JE@yup6%~-ae(GAW*CE&E>V>fe9ILvMH(j-Q zLhJqa?Wdm}I`P54E;sMd;bUxUzkWUVTJ`Yz?}e)}EndIQe#`#tpO!<>TxJYeZ=BGq~_r|pP}M9(ql&<2$Ne;YaXsL+KkN;&FT zm z{TmLY%{cTyclu$M0w%eB_Bq8ZhZS4Yogd7pKm4{V`OiV;6~DDa)ST75H-|O^C|>58 zTrSd@SX(PQr`X3$J@EaC!=CB3^K5#X>YqhKM>qSecMv&h>nr@cjx$KX;GQq*FPo{i z(w_!NezTHx32af|(3pPu$0p(SGbs@|&uUnooVsy$<5K0oKAY|>ff@Roit0RU$~|t% zU#x65dEev-`mOoo^G{iU+zX^gqk;xp1{U@!T+%fq{X+)78&qol`;+0Ff$ARsaA1 delta 567 zcmdnOHj8yaUcI=di(`mI@6yS(8N!7U$L5=#6`b84H_1EbbKy^ggO`G=Wke4)ZRIfS z6fm{m_G?OT?~HzR#gRiqR_4-Pj-@eT;<7vz9SRxkN;kqLuTFZqGS}zi)2jOA-08Pm zfA#$TUR!6Q&tIR^^H62e+!J^CBNQjyyR+|W?bOFbf4f)9O#fZ~;Xz$-tA~}?1|OB5 z>c`{eO3HG(bw~b`47_G^x^?sAA{&XGdHalFy4O0=GuRorpef+vu{=u@VjZQx9v&n;RQEc zjx942;jxhY@$J#xb&RT)-RrN3%@ay(cVATGbEcr}Siyy;#${{?zh!=cdQET6X`OFYHswkP#*R>zCD+ z`MClOjPr%h6m!k}_w*kNw@aj<;)%zHXKNT&! zd%uAF&x(pl=Nlni`_4W)%XMD*-GYV-{G!J56#K-Fy6?TwV`y+JfNe>Z(zfLu>5-Om zFFkK~{p^iiz#RYOC9bm)uDax`=ka*9hTXtGk>B`YZ}kD**Sk4aJ}R|~zC@VVykkb!}L!PC{xWt~$(696e42CM)8 diff --git a/deluge/ui/webui/static/images/16/proess-stop.png b/deluge/ui/webui/static/images/16/process-stop.png similarity index 100% rename from deluge/ui/webui/static/images/16/proess-stop.png rename to deluge/ui/webui/static/images/16/process-stop.png diff --git a/deluge/ui/webui/static/images/16/readme.txt b/deluge/ui/webui/static/images/16/readme.txt index f89f74105..0de2e9005 100644 --- a/deluge/ui/webui/static/images/16/readme.txt +++ b/deluge/ui/webui/static/images/16/readme.txt @@ -1,6 +1,5 @@ -All images from the kde-oxygen set. +images from the kde-oxygen set. See webui/scripts/copy_icons.py for mapping. - -See LICENCE for a list of icons not taken from oxygen. +See LICENSE for a list of icons not taken from oxygen. diff --git a/deluge/ui/webui/static/images/16/select-all.png b/deluge/ui/webui/static/images/16/select-all.png new file mode 100644 index 0000000000000000000000000000000000000000..24ce63b0eaafce1b20e9fa18449ef5461a806b3d GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0UgcY`pa)tkqU7#J8NOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3 zkz!zAoaO1_7*cVoHF&odv!lq~&C2A zNB9E--X3ufaG9tQF(X35?!pR2-qXiSZ^pd$D=Tl4J;>a?_spH*cgd1%9S0=1nH^ZF z5+n^>w~0%M}iX5+Bya2gg|c&GlM(N#tF7i|VJ_pWYgq3n(3Y@uA`N zq8}A(F;5cS|JbBnqFs67%u&b7rB7oFBj!jx-gs=rCCAoX#R9UDAv`q)-(757@#w66 zXl&dJhSjuQm_+#6of5XxyTqyjKXGh@eNdcw{yyGe}?G7fFtJ_SI zY>`mAu#MSr->%9BQ_g)jFSw2W+!B@2#<_m%QESB{+CJ(^|Cqg8#jq*mLPpJj-=~#h z{?{DxTo|x2Z1wU}d=4cF-9O_F&0_udQY9xR@9z4v&67J$SbvZUK4Nm#C^U8Ht;w6% zPj7NqeyTO;W1jAG?+MRDZ7kSY0uP(qp3?EQZ1&_d*W24R-hTTid~@gPpEaGIe$B1v ttYfb&k(~UGi`yo4cEqw6Zl)isD)*Q3xG$NL%D}+D;OXk;vd$@?2>?rg<-Gs^ literal 0 HcmV?d00001