Merge branch 'optimize-images' of https://github.com/Metallicow/Pyfa into Metallicow-optimize-images

eos/db/migrations/upgrade33.py

@@ -6,16 +6,16 @@ Allow use of floats in damage pattern values
 
 tmpTable = """
 CREATE TABLE "damagePatternsTemp" (
-	"ID" INTEGER NOT NULL, 
-	"name" VARCHAR, 
-	"emAmount" FLOAT, 
-	"thermalAmount" FLOAT, 
-	"kineticAmount" FLOAT, 
-	"explosiveAmount" FLOAT, 
-	"ownerID" INTEGER, 
-	"created" DATETIME, 
-	"modified" DATETIME, 
-	PRIMARY KEY ("ID"), 
+	"ID" INTEGER NOT NULL,
+	"name" VARCHAR,
+	"emAmount" FLOAT,
+	"thermalAmount" FLOAT,
+	"kineticAmount" FLOAT,
+	"explosiveAmount" FLOAT,
+	"ownerID" INTEGER,
+	"created" DATETIME,
+	"modified" DATETIME,
+	PRIMARY KEY ("ID"),
 	FOREIGN KEY("ownerID") REFERENCES users ("ID")
 )
 """

gui/builtinPreferenceViews/pyfaGeneralPreferences.py

@@ -25,7 +25,7 @@ class PFGeneralPref(PreferenceView):
         self.stTitle.Wrap(-1)
         self.stTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString))
         mainSizer.Add(self.stTitle, 0, wx.EXPAND | wx.ALL, 5)
-        
+
         helpCursor = wx.Cursor(wx.CURSOR_QUESTION_ARROW)
 
         self.m_staticline1 = wx.StaticLine(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL)