From a79b2948852cf26a1a2d5ab83e62972482016d59 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 26 Apr 2009 08:16:12 +0000
Subject: [PATCH] - Fix options matching between buttons and frames (closes
 #366957)

---
 src/Icons/oxygen/proxy.png | Bin 0 -> 1056 bytes
 src/Icons/proxy.png        | Bin 1500 -> 0 bytes
 src/icons.qrc              |   2 +-
 src/options.ui             |  11 ++++++++++-
 src/search.qrc             |   4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 src/Icons/oxygen/proxy.png
 delete mode 100644 src/Icons/proxy.png

diff --git a/src/Icons/oxygen/proxy.png b/src/Icons/oxygen/proxy.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd82964be2359fa1416148bbc339362ac1b3baa3
GIT binary patch
literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000AZ000AZ0nlutp#T5?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11D#1kK~#9!wN=kg8%GrWX6^NF?8YdCrZ}NssV5FVa_ONthI5cm
z5U3ToqMia#65skK^w2|kMnXb8ph`XV(p!&2zL`1+NlS3RfbF$+*`4XzCpOxwrLu~4
zzxC6MXJ===dGC8~gi;D2klNnaX;vn_94{41D3wac=5mm>jlCByaOd`I*wpX$`#3y$
zhel)n@WIm36aW)fKtnj_XYKZlZl|lY-oMv6=jWQ9NN7Y}`{ns_O-pE+REkXjWa<Wh
zBtjsGa8TFEWsHxHA(hUcb9M#~CnqQHAcTPCnx-KvLeG>^f=&oUtp_iB0^;K_g~$mg
z0+XQDKZw??s(%*!*kbU2l2Gz;1K+stdj#+Z#ODF&+rVu{5B?5L1U+$SKmvgfc<;Rb
zo)J{!1lWQE$oBX5Kah}dg}@V_XMRjiPjl+=xFkcISwI$qw>dpAdqAo{2m*5BERk_(
zK*5m?d%&Lseo@jJo=0ROC!lz9rGjY~n8o$NBY;Tn0=j_Ern+yM7V^2=FaajU8iC_D
zJQ68^bUK6bwK6^*8$&jm9iDKRf=)~XI0SG0c?&(AMkbT_$O9}zG8U;r1Y*$uooaM+
z6w*t_;kwU#ejkGecyS`Zi~B^#WV+oh48uUL*TbOSM}IJghk$K6uw4SaF(CvB`2uRs
zYOpK|OUn<COeCWVLC^z^ZFAo{ebF?zO_MeT=79UIUKmk(z`C$-dU}dfDuoQ0d*bVz
z4!2L9K1Hi_gqN>g#Zn2`)uw53-7n<xEH+)&ac5zHV^48s>lytx3K1vyznxC!3q7gB
zAfctGFzMulZy!Fy8TBtLi-;KL8$Af64#Rptu)D&0;VS@T*JfsB9?j3s-*Y{(ySw}2
z@$qpTz$w`=*$J)NjM4)PcTpno5`@{=*@flh<$F{W-O%i8ZEe;4cXyQ6agYRKWMpJ8
zF)@KkrGk7uZz~_*A?gs+YPH8oiElJLn^X{AS8m>{y5fBO=Ix)txj0w0VOOiwKi1aP
ze)?nrtE;Q?Q&Uqv0K-^ZT)bZ>6h=&$z~CZ*QrdzCM`=h13EQ??6pr5!K(Sc-Yhz>M
z=PNZZH#axCva<4hV3>2gUa!NCqf4m^-`M2j<n{IS^`Y+@jYbi`)dc7SgLb<OKd9Do
zt~Z;_D|4JYgkkU+MraLeZf<_&BP8f!7Hck-`;}sT7ykoF&ENL+_P#>^2L}h;?d@$F
a0sIHGV8(tMA5$#=0000<MNUMnLSTZiRpVFy

literal 0
HcmV?d00001

diff --git a/src/Icons/proxy.png b/src/Icons/proxy.png
deleted file mode 100644
index e8fef42332fb774df858d5702ded7c509480ae76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
zcmV<21ta>2P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)d3FyBntc6d{qDd1!+k{
zK~y-)t(0p_Q)d`}-|zIa<s1&2wv^KX(gL-VatAFJWeO;4Iw3;^*@!{K#Y<*JmZ7_3
zE^&XBWm&R6xHw|sg5oxobf{qteqcpZ)Pcf;QZD5tx3*B))6+uX?8js={%~gV`Tc!Q
zp7+a}PoU8xE9U2Cya2#&*|INCqe)~C!u|8}Gk$mpa&yb6xVR1B7$#n|+b4YhfN8ZG
z!UZWQhL31kHWm?~<|`_8*OZp-s@7<t(wt8B==ivG?nTm)l0*99;%%pki?<(Jw@w*7
zJ#Bjs85zSU6p9+WurM!2D8%W71y|$d%^An^dR>UYkg`Rq)oiP+4Slz%>DOBTzSU=i
z1VLbBWd}3%?=L@}nVF`;aUm8Q9GEmXXfY)wCgwOCjslEf<dBn-z29mbe$D6e`dQWu
z9LHhl=}ECACB>iS=H`bzUz(TqCR0$5`*BiIoX+d@Vl3+hub1O(HhZ4IkX|K|NdW8X
z>u)89fPn1mtOMQMy&kvQ#j`969LJ&fcwMeuA6xLeI5jn4lTN4E?)7pQ%d+5hyWru&
zUM?qRa~X~cB=_#!@4(vH+J3lsv%{2;k)|FWe}WGT4EwxZ4m=(f0s_Qh9LEgLi!lsK
z7K=qB%d+70a$q(OElo^Jq3rC9%Inu#drhVr-{B7)+@6$5Wwmi}+N^{GE!EL+cS<7J
z9*yHTxLmB?;c###Pky16O6k`Z7w0jnb)?zjVI5AVb15*86s@eRKzsWgdt#!FvfJmE
zjYi{z;o*TE0RZsB!<NDDaMilx<b>>y5E(5J;h5Px=x%Ciei#%K>@^tDKG14a2cn}@
zI~j&4wA&r_`}ez8kw_dG6hsC{Bs3|LNkvBE)fS`i=g$GaEqFQ|&oIhKwOXC4R5A*l
z2UuSAuPBv_$Y4m@NKr%t$9XWne;Jd@rA$mrbgEP;At;KZNRkwhB!P{Lj83++w0t%?
zI?@XOfUmvV;^N}0P$-;62*vX}4+@2xV3-hMb#)aM78aMR)=?{t<G#qq2rW$q6H!r-
zYJ?E*JP!yVKnTt7Ja1X^2><}Hva;~}{KDN@ZA^(+ERy_v5P;_q-`{VUYHt4RLQ6}_
zmyaL!H@IBx>3{$tS}qTfU>G2TFhB@_K!9Uzw|BI&v*Qr}tfIQQ`mLd%vg-Bg)kS{)
zvViB|pNiR8o3pm|?E6OJFZBShvQ~5C$nkBZrF-k;a+&g(Vi1W$E4{t_*9Ha#zr{mC
zC8v^;^>6t7ene3eI2=x%Bnc!E;lQ$<Rh>>Z{;U)LASET$PEmn=nx<iC$qyb6$4jL&
zT3%if7z}Ae2tgQ5QGp~y1;W_a6Z@@Ot=)}{KQ+Y1Cxlc~ymK%%RvVj`m{d#<go)!g
zKL7wts{|^Qsx&4hM%mNTJ62zR>C)(^wWqxN?cJG~hRtDN5(PyC(s1tF`73pG=iBz|
zDLX(>!72d2006J9{&2_8(8%1>)Qs)KiR!$y+B0Xq%AT9E&6v#=cUf7*Q2-zT0MWE8
zq_VQA_~OOO#<OR?zblxVvpu?T!*r>=-E`aM<K_W?2Y^)^7f&#Zf=o!zZ&j<KGyup{
zRJ4cMyZ5bcf`WqdmoNX=c=hU)uN@A%3jo09<G8-QKP?jzlh?bty4qj(*XHLJXgWLp
zxZ`v#`s(W&YOY=T{XLh<&9$}NG^eL$yaoUW{v%jT%_pUEb9T;bwoF+p!;>>JvrCng
zhfZObFyKWO1^*)ERjQ~Vk|e^lTFoY*5DzvQn_3$hE}nKcY>V)JIehqNN_TfpS9|;I
z;hj5+b_fIl1h0y!s$;wM?W;Hr0AhH>2%oOjOYs*#he6*TWP+;z0000<MNUMnLSTX*
COw2q0

diff --git a/src/icons.qrc b/src/icons.qrc
index 1017a37bb..ee0101841 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -7,7 +7,6 @@
   <file>Icons/loading.png</file>
   <file>Icons/locale.png</file>
   <file>Icons/money.png</file>
-  <file>Icons/proxy.png</file>
   <file>Icons/refresh.png</file>
   <file>Icons/rss16.png</file>
   <file>Icons/rss32.png</file>
@@ -57,6 +56,7 @@
   <file>Icons/oxygen/folder.png</file>
   <file>Icons/oxygen/gear.png</file>
   <file>Icons/oxygen/log.png</file>
+  <file>Icons/oxygen/proxy.png</file>
   <file>Icons/oxygen/subscribe.png</file>
   <file>Icons/oxygen/subscribe16.png</file>
   <file>Icons/oxygen/time.png</file>
diff --git a/src/options.ui b/src/options.ui
index 1ee77aa5f..c7b33f72c 100644
--- a/src/options.ui
+++ b/src/options.ui
@@ -88,7 +88,7 @@
         <bool>false</bool>
        </property>
        <property name="currentRow">
-        <number>0</number>
+        <number>-1</number>
        </property>
        <item>
         <property name="text">
@@ -150,6 +150,15 @@
          <set>ItemIsSelectable|ItemIsEnabled</set>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Proxy</string>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/Icons/oxygen/proxy.png</normaloff>:/Icons/oxygen/proxy.png</iconset>
+        </property>
+       </item>
        <item>
         <property name="text">
          <string>IP Filter</string>
diff --git a/src/search.qrc b/src/search.qrc
index b7c46c86e..84e551207 100644
--- a/src/search.qrc
+++ b/src/search.qrc
@@ -1,9 +1,9 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
+  <file>search_engine/helpers.py</file>
   <file>search_engine/nova2.py</file>
   <file>search_engine/nova2dl.py</file>
   <file>search_engine/novaprinter.py</file>
-  <file>search_engine/helpers.py</file>
   <file>search_engine/engines/btjunkie.png</file>
   <file>search_engine/engines/btjunkie.py</file>
   <file>search_engine/engines/isohunt.png</file>
@@ -15,4 +15,4 @@
   <file>search_engine/engines/torrentreactor.png</file>
   <file>search_engine/engines/torrentreactor.py</file>
 </qresource>
-</RCC>
+</RCC>
\ No newline at end of file