From 4fdd3f177a23bafe84d6a58fea391ff51986d892 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 25 Feb 2014 23:54:27 -0500 Subject: [PATCH] Applying appropriate icons --- gui/aboutData.py | 2 +- .../pyfaGlobalPreferences.py | 6 +++--- .../pyfaHTMLExportPreferences.py | 20 +++++++++--------- gui/preferenceDialog.py | 8 ++++--- icons/prefs_html.png | Bin 0 -> 1825 bytes icons/prefs_settings.png | Bin 0 -> 2315 bytes 6 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 icons/prefs_html.png create mode 100644 icons/prefs_settings.png diff --git a/gui/aboutData.py b/gui/aboutData.py index 5af49e734..0d1b029b5 100644 --- a/gui/aboutData.py +++ b/gui/aboutData.py @@ -23,4 +23,4 @@ license = "pyfa is released under GNU GPLv3" licenseLocation = "gpl.txt" developers = ("\n cncfanatics \t(Sakari Orisi)\n" , " DarkPhoenix \t(Kadesh Priestess)\n", " Darriele \t(Darriele)") credits = (("Entity (Entity) \t\tCapacitor calculations / EVEAPI python lib / Reverence"), ("Aurora \t\tMaths"), ("Corollax (Aamrr) \tVarious EOS/pyfa improvements")) -description = "Pyfa (the Python Fitting Assistant) is a standalone application able to create and simulate fittings for EVE-Online SciFi MMORPG with a very high degree of accuracy.\nPyfa can be virtually ran on all platforms where python and wxwidgets are supported.\n\n\nAll EVE-Online related materials are property of CCP hf.\n\nSilk Icons Set by famfamfam.com released under Creative Commons Attribution 2.5 License" +description = "Pyfa (the Python Fitting Assistant) is a standalone application able to create and simulate fittings for EVE-Online SciFi MMORPG with a very high degree of accuracy.\nPyfa can be virtually ran on all platforms where python and wxwidgets are supported.\n\n\nAll EVE-Online related materials are property of CCP hf.\n\nSilk Icons Set by famfamfam.com released under Creative Commons Attribution 2.5 License\n\nFat Cow Icons by fatcow.com released under Creative Commons Attribution 3.0 License" diff --git a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py index e40b87f91..a70ba2777 100644 --- a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py @@ -11,7 +11,7 @@ import gui.globalEvents as GE class PFGlobalPref ( PreferenceView): - title = "Pyfa Global Options" + title = "Global Options" def populatePanel( self, panel ): @@ -243,7 +243,7 @@ class PFGlobalPref ( PreferenceView): self.sFit.refreshFit(fitID) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) event.Skip() - + def OnCBGlobalForceReloadStateChange(self, event): self.sFit.serviceFittingOptions["useGlobalForceReload"] = self.cbGlobalForceReload.GetValue() fitID = self.mainFrame.getActiveFit() @@ -260,6 +260,6 @@ class PFGlobalPref ( PreferenceView): event.Skip() def getImage(self): - return bitmapLoader.getBitmap("pyfa64", "icons") + return bitmapLoader.getBitmap("prefs_settings", "icons") PFGlobalPref.register() \ No newline at end of file diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py index 1e9a50bbd..4a68a25a5 100644 --- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py +++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py @@ -12,10 +12,10 @@ import gui.globalEvents as GE class PFHTMLExportPref ( PreferenceView): - title = "Pyfa HTML Export Options" + title = "HTML Export" desc = """Turning this feature on will create a HTML file at the specified location -with all your fits in it. If you browse to this HTML file from the -in-game browser you can easily view and import your fits by clicking on them. +with all your fits in it. If you browse to this HTML file from the +in-game browser you can easily view and import your fits by clicking on them. The file will be updated every time a fit changes or gets added. """ @@ -30,23 +30,23 @@ The file will be updated every time a fit changes or gets added. self.stTitle.Wrap( -1 ) self.stTitle.SetFont( wx.Font( 12, 70, 90, 90, False, wx.EmptyString ) ) mainSizer.Add( self.stTitle, 0, wx.ALL, 5 ) - + self.stDesc = wx.StaticText( panel, wx.ID_ANY, self.desc, wx.DefaultPosition, wx.DefaultSize, 0 ) mainSizer.Add( self.stDesc, 0, wx.ALL, 5 ) - + self.exportEnabled = wx.CheckBox( panel, wx.ID_ANY, u"Enable HTML export", wx.DefaultPosition, wx.DefaultSize, 0 ) self.exportEnabled.SetValue(self.HTMLExportSettings.getEnabled()) self.exportEnabled.Bind(wx.EVT_CHECKBOX, self.OnExportEnabledChange) mainSizer.Add( self.exportEnabled, 0, wx.ALL|wx.EXPAND, 5 ) self.PathLinkCtrl = wx.HyperlinkCtrl( panel, wx.ID_ANY, str(self.HTMLExportSettings.getPath()), 'file:///' + str(self.HTMLExportSettings.getPath()), wx.DefaultPosition, wx.DefaultSize, wx.HL_ALIGN_LEFT|wx.NO_BORDER|wx.HL_CONTEXTMENU ) - mainSizer.Add( self.PathLinkCtrl, 0, wx.ALL|wx.EXPAND, 5) + mainSizer.Add( self.PathLinkCtrl, 0, wx.ALL|wx.EXPAND, 5) self.fileSelectDialog = wx.FileDialog(None, "Save Fitting As...", wildcard = "EVE IGB HTML fitting file (*.html)|*.html", style = wx.FD_SAVE) self.fileSelectDialog.SetPath(self.HTMLExportSettings.getPath()) self.fileSelectDialog.SetFilename(os.path.basename(self.HTMLExportSettings.getPath())); - - self.fileSelectButton = wx.Button(panel, -1, "Set export destination", pos=(0,0)) + + self.fileSelectButton = wx.Button(panel, -1, "Set export destination", pos=(0,0)) self.fileSelectButton.Bind(wx.EVT_BUTTON, self.selectHTMLExportFilePath) mainSizer.Add( self.fileSelectButton, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) @@ -55,7 +55,7 @@ The file will be updated every time a fit changes or gets added. def setPathLinkCtrlValues(self, path): self.PathLinkCtrl.SetLabel(self.HTMLExportSettings.getPath()) - self.PathLinkCtrl.SetURL('file:///' + self.HTMLExportSettings.getPath()) + self.PathLinkCtrl.SetURL('file:///' + self.HTMLExportSettings.getPath()) self.PathLinkCtrl.SetSize(wx.DefaultSize); self.PathLinkCtrl.Refresh() @@ -69,6 +69,6 @@ The file will be updated every time a fit changes or gets added. self.HTMLExportSettings.setEnabled(self.exportEnabled.GetValue()) def getImage(self): - return bitmapLoader.getBitmap("pyfa64", "icons") + return bitmapLoader.getBitmap("prefs_html", "icons") PFHTMLExportPref.register() \ No newline at end of file diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py index 8127ad77f..c9b10c636 100644 --- a/gui/preferenceDialog.py +++ b/gui/preferenceDialog.py @@ -31,10 +31,12 @@ class PreferenceDialog(wx.Dialog): mainSizer = wx.BoxSizer(wx.VERTICAL) self.listbook = wx.Listbook(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LB_DEFAULT) - self.listbook.GetListView().SetMinSize((500, -1)) - self.listbook.GetListView().SetSize((500, -1)) - self.imageList = wx.ImageList(64,64) + self.listview = self.listbook.GetListView() + self.listview.SetMinSize((500, -1)) + self.listview.SetSize((500, -1)) + + self.imageList = wx.ImageList(32,32) self.listbook.SetImageList(self.imageList) mainSizer.Add(self.listbook, 1, wx.EXPAND | wx.TOP|wx.BOTTOM|wx.LEFT, 5) diff --git a/icons/prefs_html.png b/icons/prefs_html.png new file mode 100644 index 0000000000000000000000000000000000000000..d86548cd5241066299ab0c6cd2f26a4f4b800acb GIT binary patch literal 1825 zcmV++2j2LJP)F8i5d=XlFE2kx z&-uEp<53Ff0O=?%E-qe7O|7pn*1Ei6Hc~4pDvbZCG&MCD`}XZCBfU~G08Hc_eRgZ- zzn{MVK@=g-XRyU!ADaKd^HZ>Q?_MlhwhTo@Ma2Z-$dV;X<|bo8?8%%}QB)PGqCi!L zAT*xM<4Os<&*z87GiJ;fNlsq>APBinT4*;S_W`p_6@}UkMZ~VNetdq`hkJhV7eQp(#fUT+%O^Qe z;&t=!<8pIBw&zSRM`OOle1ghjBu)}vzW~^7MUzhUt4IQ3v|hoU>kv~fVb}YIk?Xk$ zU&w~qz-81nrr?L;8&UDC7nSe1F(p5rOOnu22WCJ@08nWAE>*Rx$xP-Ttp%nxEHQQSUif<^!3Qenv8JNgQ{Dlc-319&Hfv{{38gbYJ)0MWJofX zWF?6YNMv_`KmayX!j97oSWq+-Db#Kbr$Ck3U~{cSu(K0^=pEc?eFL>k^AU*!F=y&7 z>^$nlD(^5v1%sPTx3b<~8IVl|BvGctWHk69$aJTop#!+nuA(jCN4r)_&lrVf4C6_w+q=ooA&Qz98vQTQTn+66PG%GeMk4PImI2ENxg#<$BuswlO;k2&xalV#Z3P69 zfKqtgX2^ zgsR({AkwC;-d#nRun~6UJObe~bVTjw40T{khRRj5`Ee7-|AGN#2DU}|zB4@wN6&iD zNqmQ*A>3`9fNzesP#zeL*5K1vJUt&P=O|b)GXrfce!Mkp6hB(nd`s7$09dxN(yvIF zPNS|(^Kvmtjo?b{Ed;uv1SE(+2sm}E1a9XAo)C2cdho;sj88MLZgvi02KanSSFbz3 zfDEuyOhy(+46YqGzt)R%Er9APf1}wKARu9cA^{w#-iFE=FFxG!6M`*EQMD!?s!b+9 zBA?InFnxoH0?|zVD)TTHJ+C+rC>k!TpN+3i-^A7<*HP0N;*p~13K}!Eqoi;YHoTl2 zKhzDKB0zfRq!)z&065k72tiD4vlRuSx%7W0V`2Pox1~QRfNhm7?C-dYD^+#oK__q` zdS)`##rj37(Zhdq1HG8DZdB~Q@sqQ0{i3UX0Jr=S(gZiIb+z!bpCzIgO%6wOez33w zm@?5!QjAiOepHDayP#ZPaIow@)>dQzvJju+kS5E)sxxtuvN=_rp@-4)R9z6SP08f_KVE6W zf(aSWOr~^t8miQ9rX))c P00000NkvXXu0mjf#%4;^ literal 0 HcmV?d00001 diff --git a/icons/prefs_settings.png b/icons/prefs_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..2a1e72744479f7980973cc388a14300bb0a4bef4 GIT binary patch literal 2315 zcmV+m3H0`fP)Ran$O@M`*`EZE8B1X%mg1D)>ymAr_M{CaIk`W%965Q81mxv`xZe zQKX=gqVirrfqgH#?C#z7tLMMDo2-b)w7oNDcK6=@{@-_A-}#pZQ@plq-w~OZka$8Q z5)~&TB#4q{B*C<4(}1RFkl(upJw3g$lYe+~B`)0EEC!8613Vr+ z@Oo?Q4#xpp*N^M`WMAGCu;~M3hyExK2zE&~Zh-l@Il!YRP$-qq+WIg2R6$=~U*mhH zPwl|9hVtWY_9Z1GCM;XN6vT0H;P?9xoCi*)6Z-q_!PoT-pim5Fo_YVhK0<>3B=CI) z%4+iS@(_DH3v6YqP~X@DvgT&!>g=p!7|U?8tf>Xpy5Fd%?3*`tZbD(<66m;n7p`A# z1&jo1@zdiWH#-ZGlat_svw!Zv^&&LqWCZB_r3Y*B3-Y9!q#I#$)Bpyf5gHJ@x3^dS zR@I3uxJHL&Mq~Dt?0(Ei527iwbg!!*?`v zVoe6N1c>)Sp&-~}?L?s-AAwLFkK(`w5!{5;>j0<2 z33~k~7T$H(^qiDzzK*O7evuI1(|oqAz6IyAHSnZHqsA3ob$;FgP^#20Hf9F9!vzk9 z1MGwZwvk4wgRklvSun1Ozq`C1muhfu0OGOl1p+>jK;zTk_xUCzKo9~4v`FApIF%;&G0||ZrHPSCA6s+XdhBRidzM*X82%8qlf0}EsDs<$QZ1Y&}m^|=!}I0!=i5a;7@1v z;nxRT8@qU1D@LKEAc?nU&(0`JPELl7jt)3fw*P6oujfRBlyuD2&6|()F50!`x6dwv zyE;3l83(xi6x_Tw2h{R2Dn9eSYwuMTAFzY}f#e zZj~ZC1j$}lF%YJ@gRyv;>U}5>D}4s*?IjH>wgSa z2D#niBz=C@aT#4Xb{Q!KmEgK|~d6~1~#hHJvZ>XINc%leQC{(fg&KEDr zoLl|!@`dolIB+k5t8q?v3=iN`o&ac`4}O%t0CxVh58CxUFqzF)bjQ|h;qnhtk>ZD* z#gv@ezI=X8b=k8E;cCBu&3Q1m&TNEXtr8@+s{d)wsX>4Ov+=`r7^5QKFWZ;GvUzD6 z;||tc92e=wrr;s)=-18_uUI(0diRQKxNz6NR=d~#J-FU%0Ht~aj31U2-ERK!YM4+k z>u-YWG(mhC{C-sq{6lVmUo1!lwbd)pNmk|BWEU3z>hAgyZB;Zfpl$dGFC2@7 z>3(bk=;+egnmwx*OMjY~2p79XLGw89Pb;?A?l!mKJL*8E@N!lZT{Ay7uXfP7m2_iv1 z?viW|Uzi#qie%$!cTG+rK!6sP)t=q;lSM@<(ep>au`d}5C{z!?*?H}_{?qc0IDv8m zc|%CJnH!(AhU6@fxM^XkF!aeJ0tBYTu6f~N>FNboaKYey)^i3ABqPcJaNLnq=+7Vj zm;<+uE2{4lbutn!APKF_C(&oG&a*b1uL-oFXpT4vAK=cI^KV=2d+_@s{oppJWe9$b zlUOSUIR5em6jXI`=N?AUBhzY!!HU9bMI{(EIpA`)5lU8N;U5A4d#VZ$pwt!{P&k$d zII&=G&!|eKs@nbvm-EMgPfEguBy31R$++N^+FQV5j7?;~1yT^kEBN`AteJ698ap4H zxP=*y;X{ghsB)@i)yW-uaLq6`l)O{;H|2jM9sH0~QCKvx8iEmdr%Y2-{4zct4d?(S z3NjMPF4yuzVJUc`W{*x@?eG_>Q@ajwL&-QraF}4gr6j)g(P^PL`5BjPq(xO#{5x*X zu>b)w>toSoaFdYYMy8P~xUtFfe2OFjQ`XGY5$jN}5(>C;nvhdSAJ=B~|HAV})RjBN l3pmH@|ARyS-|IgD3;=X$f&6|~5VHUP002ovPDHLkV1lF~V^078 literal 0 HcmV?d00001