From 4b58aa10ea50b2656b598f69e2f897082624de08 Mon Sep 17 00:00:00 2001
From: Martijn Voncken <mvoncken@gmail.com>
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
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00003b3#c}2nYz<
z;ZNWI000SaNLh0L00VXa00VXbebs`@0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}
zWiD@WXPfRk8UO$R8c<ABMgRZ*000000000000000000072L};%5h{TnK%zK9LqkSJ
zMovynSX)?HT3TLSUSMEgVPRonVq#@wWo~Y6b8~Zcc6NDrd3kzygoK2KhK7rai;azq
zj-pMEkB^a&k(QR0n3$NFnwp%PoSmJWo}Qkep`oLrqot*#r>Cc>si~{0tE{Z7uCA`H
zudlGMu(GnUv$M0bw6wLgwYj;uy1Kf%ySu!+yuH1>zP`S{zrVo1z`?=6!otGD#KgtL
z#m2_Q$H&LW$jHgb$;!&g%gf8m%*@Tr&Ct-$(b3V<)6>+{)YaA1+1c6J+S=RO+uYpT
z-QC^Z-rnHg;Njun<KyGx<mBe&=I7_<?(XjK@$vKX^Yrxe{QUfs5whg~000JbQchC<
zT5gb_uwRMiUH||9zDYzuR2UgW!9h-gP!NFOf94GWg*GhOxU12HckuoTFW?b0HK|&n
zDc}=kbYuE`f+!arMtWHBZ+M&yPETffdw%!gz6XQN$KBNB(~UpVfq}G}^-J2<qw&W;
z_pkNV@_Ft)0}T2u<-sGEQh-5ysI(|dq&;+C@a0u$CL&krV4%Bg^E1k-j68rrw6iuX
zp5LMegH4L#yevzIlwfdOhljfd`VE4WHm(<&5}swA6|7=Z)v9WA2ZAOp7XJm!$xG?`
SVy`p+0000<MNUMnLSTY#S~{Qr

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
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10k26!K~y-6rINpE6hRcnzi;-<?EKhEqD4R~%yojCpcX+$Ay|ry
zpmqEQ{0FQQ+jO>a*jOtBEkrCXjgTtE;l-eca72qebKb?<+1(qP+aoCwT>Zjh-td^u
z8{YdOgn$qNoO3S#aCQIN5SU48{Ud}>pr$B<006jp?Mk|QC;rfAndd*VUvJ*t-9D%V
zSiQb_5ZxRvG%gz)7Kgcw<wvJwFEOg;oa`k|jTWt<#IisT)1_?j_4-PC!WD^SL_<G@
zECH*fG%>e~=2ol)w2GivK(YXV-U*sMSYK&R0ALQtG9MxaoRQFqq2mZ9W*EiLDuO6!
z(BB(w3<YhpZ@iyW@8(0yy(beh8dkv>38y8jW{85YyP0BVdvvCo4xR|kJC8rzy8ozq
zPaXRKGn0)OiIq?sp&XU?+!=&(moDt_MX}Q#_dCm0zkIf~_4Viw=K!DQ<P!C*Ov~N<
z@8d7>yn4ESmb;s`U*)H+p)y3X*-Y!2=$Mg;q7bJwI!WS$ygtBt|9^li%l-*4w=xm^
z4k4Jj06vmGB%%bs0su3s5r8Rx0)PjQ&(11}KQe{koildOX8-^I07*qoM6N<$g3m1U
AS^xk5

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
zcmV;@0xkWT1+)f`Zhx^!L_t(Ijir;lPm^I3#n1D+AJ5y5C~a*E*bfk?ZKNg`2MvLk
z$i%{giX)%{5f>08VrsFaRsR7NW-ug192g97BjN}`&|pFzNw5Z*mcA{upRbb@MHju}
z&Aq>z<eWn^O~e0;`1_){xtZxrrhbu1y;hsePKb6ql}v5`bbq!Y3v=%l7ZZo?$zcVp
z7u&im=9;O??d`Rvo0=d=5(ptEl}d<lj<?IpiEK90{d!?x=?LIbM@O5}>3Vb4>y?Xz
z0vb;>f>H`XDF`8mZEZo8Wo+?SA-?<d>Z`dI^8i2rptG~nVzb)j8=Ox0!ueL*x;cRN
ztE<>gr=hAUR)1GkaIL2Y=UQ4&XRnp57VA{koi0`dP{w-PZkHu{kcHpxhs)){$nY>e
zZEoVj#s&uZ`r!3?;rIKYs%bdu>uc=?_WmkBZ!q*qk_f$ChsU81wzs$8a5!*(bQHG-
z2jTPiz&S@W8imPhhQuTojK&*PfFw{)JRV0{RiWs02!8}0RUto~L*Wo=EG8UeGuYeR
zg(wK-s*Q?{B`Kk`g+d;sQW3e_0Wz6P)g28QilriQxhw=KK$1jILQPc#OlAp%F(`~7
zpUWW_2*T&{A;x3ioTI_rfM6hqOgaOZ$zY6uDeU7<fWl^&!tgDZ!$fcb9*+l{bA-bo
zgeODboPWdZc4Pd(L#X>I6edF_OS4sgP$AO_lXnz_VSRlaoO4V@CsFUH!%1g7o;;0$
zf96<QTZ2xoKorG2O%vyS2~r?1-c1GiJeAsK<x&~;IvYe$gdhkgm&^FF6Nk)XSS;pz
z1?0-u-La)3QI0%|v{7g;2_Yv81|y6{BlJ2wvP;<vQu`_7^Z6YRZSda6gZV#p0RSSA
zh=mB19uRV!5^@G0Nez_*sc17g-LdJRp`rX=%k(ev9S%eah2%-Fod5s;07*qoM6N<$
Ef{`jtRsaA1

delta 567
zcmV-70?7Te2ATzsZhsd^L_t(Ijir-4XcKW5#-BIM5u1-*l1ozaarq#@(o#Dd6~ThF
z2sMciH8=}Sf?!99Tk6z72oxP0(!B_!ToxA{3^<4&Xon)$R+Fn@?Wt`{$>n-~rweD=
zMf!~Y_kDgmFAslWjNv4*oygq}SRs<$+`jdFmE&^#i>n-$`+xA@eshILIu@`@B>5-D
zUY!{o3r34s`595xGRuXt({el*jGn$SU0=39dH@YrN=}}49W=KQOOD#Z`AfAbQNBWS
z&3XAkO&po9x3?O|%;udMuw?q|7C>pO{<4-FKW7KCArMa4H!im1UBjT+M8>8z6bv{W
z`1azxt^p;}M}O89o)Tq;N1}2}%y5RrVDq|hzzjG$1{{e9w%)$(D(^lP?lAWJSO5Sl
z5@jQqVL1|va)%m$91iHLgRjb`?#`EAg*l7)pA$@V0BBkl`uaNbpKTC;0iP4ha|)gQ
z<^BW<L|HK*$m9DR4r&W+zZ(Q#P;CKzH`Y9Z-NxsgLVwAUqSwMaQBF)n<f)d<32F;2
z!HXw6&lY(va|L`5)E1`x9CBhhE-&!>)gu5F4?Uh4@^Ycw-*5-~sCaop*i?$X&F0Mt
z&l~QbfY1*WGoB%i7sW@t*o-kS#!v>NY9h9$NM~6&ozmxk>*nk(P@GSvbVZtA)kJKs
z3`pjz2QV-p4>Qq?d%z9ry9uf1bK6!kW9(>+|Em-K#=m<K>ljSdNZ|kg002ovPDHLk
FV1g+f2CM)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
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h&ofK~#9!g;Tpq13?tMvm3kM7l>dZ7N$rVO$-vPedP;;s2>oB
zU~iMkLTf?94^R;8#6S>4ktA4{SSUWwr~wVj#x>bo?@o4ih8@8JhrP_)bM9jqhKRrz
z3j;s|dSLKBkXR#aBjg?o)$4CX1k?yXbW8<-;Kl_0ol2$B6z+$FCGy+y?K3wJBEjhJ
zfZL+@cm`bLVDI>{Cv+=$$jrq-({<%sF<6`#<FUq=(m{o~a}XUFR1AE<?$L#);>|Br
zU0#>~UDH$p<}NNXJI-S*P+ge(J%TUTIXqVqSJFv{QQMMGHK0pgd1*euV|OP!mKlT?
zCeXG6Ilj7i;FQkr&k?o{&ZH!Dft^kVTCElshVd;M_?xFBF@j{!Xner?%OhO>e8Neg
zP^ng{r^*gMbRdiQUc#CM@#!RNY;N7JX0wxs$UE>JQ^YjQGF4@z+LN*e%d$YH%7tR_
zZY`HfkmeOUI0l4K!!+BJi0yWplV(NRwz1po;#aeY>-l_%^7@^8iGBxtbQzQW3JW}4
fn^>k?3j+8BB;ThDN2Hu(00000NkvXXu0mjfOMvCQ

literal 0
HcmV?d00001