From 91b2eff7b4d3eb56fc6756f40280a39addd9b072 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sun, 2 Mar 2014 22:23:49 -0500
Subject: [PATCH] Added proxy icon, removed help text for global char and
 profile options

---
 .../pyfaGlobalPreferences.py                     |   5 -----
 .../pyfaProxyPreferences.py                      |   2 +-
 icons/prefs_proxy.png                            | Bin 0 -> 2387 bytes
 3 files changed, 1 insertion(+), 6 deletions(-)
 create mode 100644 icons/prefs_proxy.png

diff --git a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
index 22384b932..a08b5e46f 100644
--- a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
@@ -14,11 +14,6 @@ class PFGlobalPref ( PreferenceView):
     title = "General"
 
     def populatePanel( self, panel ):
-        charHelpText = '''Each fit has a character assigned to it, with different fits having different
-character. Choose this option if you do not want to switch characters in between fits.'''
-        dmgHelpText = '''Each fit has a damage profile character assigned to it, with different fits having different
-profiles. Choose this option if you do not want to switch profiles in between fits.'''
-
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.dirtySettings = False
 
diff --git a/gui/builtinPreferenceViews/pyfaProxyPreferences.py b/gui/builtinPreferenceViews/pyfaProxyPreferences.py
index 711eefa7a..4e783733e 100644
--- a/gui/builtinPreferenceViews/pyfaProxyPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaProxyPreferences.py
@@ -167,6 +167,6 @@ class PFProxyPref ( PreferenceView):
             self.editProxySettingsPort.Disable()
 
     def getImage(self):
-        return bitmapLoader.getBitmap("prefs_settings", "icons")
+        return bitmapLoader.getBitmap("prefs_proxy", "icons")
 
 PFProxyPref.register()
\ No newline at end of file
diff --git a/icons/prefs_proxy.png b/icons/prefs_proxy.png
new file mode 100644
index 0000000000000000000000000000000000000000..e54b67685ebea287da28f1a00afc9aa2781d75d8
GIT binary patch
literal 2387
zcmaJ@c{r5&9v@prwrt6AX&R+yR@<1#Om`T@HZtfS!Yr?uF=pN|^I}ZN(vGaBtA)A=
zZ7!WivL?|H>R671PKiV6NU0Oa)g7I5?jN`NKF|C9mgn>Nd_Ujs@B4e6_o$yQO<TiM
z0|tX>dwNj)6(fB4RbQp}O6Br*iopbO3x)!~C@6s`0bmpk$O7P=LM9jR2bi41*bcxM
z22(-s1B0Ppx(|^J3en7E3|b}>E7&lY^LCk-$rb<*oCR?CA`)Vzz8L}Mb4Z9F2RfE6
zb_IBR54i*gkoyL*<pMT=gV;`nJIja)0U-b};WA;2NJ^BE5TA94iuv+31_A#JfdnMP
zpQeK8esEV%0>B;6SQH!Uh=V)YqjC0Ff;|BVx5eVH7@REzi$~$GL<c+(i-Ui85Q=CL
zP889f>i#8`VnssmAV^HaU=k7%&<S>EP{PIF2m}HKYm2e9MJW&{X`%>X%1|Py<%$9o
zkg_FwF~kQ&@MT3N3ygzE2!+!>QxJ;3%8I04%A_b5M#dClaA@puN-ID*{r^LS!mns4
z<PZGi_kRjY0~5sn#vhP^aT2!T;G!&-Ly3v55`YPTl0XoQS*fBQ4}?G|4-~^)102ve
zco1L20TZO3@pL-TQzV6$A~xVjB_R|FXg;4qbi%t}sd$PD1@Az?;oNX8c6cnojp9ym
zawOQ}?VMJ)RFEAf1VqpZm-83b^_$$~RuGC6k*R=$9}jTcC7=-gIb|aM+g=FY)ceBa
zeA^4<n_P^-3}*RY|LdSvwiMm7JpJ0XipAH)2Skc)mnhmAFjrCB2(`POR7#+1s6R*$
zW4P0BDJqJ4Hc7KO!<fQLecfu$Nc=wBG=QP2%Xd5P&ca0pdN3^X)BG%4*!D{FBfQHL
zTzX!wvSYd`B5#%Os-ea~!~nW_cv_G!NjkIbG0I!mnTB|?akF&te&gKUxx$&kJ%{b+
z1~>d=BdpP9CRLnASu|?T+jC6g@Codhv0HD#&X=vybgWFS_@RBo9<SkDP!KazTiRd#
zsj(yTxaPXkUG%n6tB?2F9~;gz)Q#_d)OBRjA%0D@P1%fOuwhWwzBP{-2ip89xE32L
ze_QADRD3g_=C^LMj2a#7Zj^pZ+UhJjJq^Ld%OdyPNt=zvkL~ZwpCy}p0#(E&R=qRE
zwlGwxE_K_QY}$dMGmd&!AEhj4PQQ*S+0Zi9kn||@Y?9pa-1BbX-qG1SwX%-JeWAPj
z-{&Xx>FRWPcu8(;7=m9R5{WzQ7ls&#4MyY$11%Su*Uqw3OU#?}V%5pUfOkmC3wjvX
ztK)5<cDrBoR~GqxJW=k0kyvqD9%|2r`sgb0=HibyTA2Rfu(0dL8^3d%Pn|wyollFn
z{xtXO{m31UVz>AYvu8x;LFvD=n6O$m%)0EZd!{?9;Gps<ZJ!!)m`H;$d<^W29)&c-
z^;F5W>_|WN4@>OeMwXGj!HBvyk<*rf6bwkFRElyos$F@Qv_Hb8^E->dxmam3Y)hVQ
zen3P0+sW)3nfdtG_l4`ZFBS)i({A<kWmc;dI)@xSxrS@mGVLxn%}O<p8JvnLZgg!~
zpB#@6$ZVpze<~yM&6IxHY_=;I7FPZGVkX7fNjC4CYolk{7E&U!8DBrK@B6(@He}>L
z_Y%x%(plBZ4RQAGV^rh1)n~ZTISljTJIOvpCywr}&+bNsE#34Am@*ryZ%S$%{*V!D
zX_QhlUA|avdVqhSC5NTw#c;?7M7sBkrICtsa^oxVUh@BD!c8J7MKb*ii(r0E8`oaA
zU;V5!ZR)*V0szg#PZrSDp+m0=+7}#ljCfW?8>Yloyn2Y(wU0mE7&=HP?W;IRgU)CC
zEGjV9Zqm7!9+gy3S^?TNRxQ9gY!ba_0)hJ6<1x3;dY6zA29G}e!0hhCo+rUKtD?t-
z7VAyaYbf}s$X>{wi=<rGKHuM%Z}q@hKKkL3abYei&cZoRr5g%0X?X@##bP_oAxW)w
z4BFRD9Dk=I(t2;DU+JvsUYv71<Uo;AygJ#2aNzRg0JRyR_2B(@WUgaQ%^g`v=gHam
ztA&@O85$9toBDO2LxHNw`eh^AO=(-rws;fyT*q|O!)a@y^ox^*2UB~Fp2$<nEUkR9
z{&qGE{dB6~jZ^3(`<JRaM%G57N8H=UvAu=sXD?}KHh6T2Zp62TCI3F}R$Ex?<{QGO
ztj);KHb1gizvvVkhDgQz+-ro$AuguE|CoARYaag(SWVMCG0Xq<^K!lLA6`|uNs1p2
zQT7~;L0zV5RY^At@M1zY*@j2!=riiC9ky2K5DyGE^u>yblxvz`gPT~hP3fjvoByrU
z?dAG%uTfnFH+%Q#B-!~+F=P=s2?<rkud@ER`6avLL02uSaJQH00K!sU5+3$3{Px7u
zsUdmfldOY1$mjHhdzry{ngwX<N;2c%wb}F$UijS&T0l;9?mPboi{~gixt9&bX^IyW
z9DBxIY<}UY{)Wb0uDZM<v-zm+Ak?=j&7^tp?346uYn7&L=N`OD!plQQjd2U>(1)dH
zOQuI|lj#Rm+v1?>gj{LxN!X8GSs4^7lR!13#S-Zd*>3p7l}{Xe`pdEw)Qg~B4lQw7
z>m0Izb!5IlpNt+-_rp|oS}gdju4@)#Rd`>#L{`e?`JGGuxUQuYMkVEV5s|Z*w3xM5
z+RJ^st9P(4DD!)x-wgy-PR~5+aaHc=n$n@D<{D2bmphi^TG4(TMp$ocBSakQSN_f2
ullQoUwWK!gaW8tld3C~-<OiShBVl9kfygyMvwN0*b3EOAsTD4fY5xHSEZD99

literal 0
HcmV?d00001