Applying appropriate icons

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"

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()

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()

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)