Updated update preference view with new icon and text wrapping

gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py

@@ -31,7 +31,7 @@ class PFHTMLExportPref ( PreferenceView):
         mainSizer.Add( self.stTitle, 0, wx.ALL, 5 )
 
         self.stDesc = wx.StaticText( panel, wx.ID_ANY, self.desc, wx.DefaultPosition, wx.DefaultSize, 0 )
-        self.stDesc.Wrap(dlgWidth - 120)
+        self.stDesc.Wrap(dlgWidth - 50)
         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 )

gui/builtinPreferenceViews/pyfaUpdatePreferences.py

@@ -10,17 +10,17 @@ import gui.globalEvents as GE
 
 
 class PFUpdatePref (PreferenceView):
-    title = "Pyfa Update Options"
+    title = "Updates"
-    desc  = """
+    desc  = "Pyfa can automatically check and notify you of new releases. "+\
-Pyfa can automatically check and notify you of new releases.
+            "These options will allow you to choose what kind of updates, "+\
-These options will allow you to choose what kind of updates, if any, you wish
+            "if any, you wish to receive notifications for."
-to receive notifications for.
-"""
 
     def populatePanel( self, panel ):
         self.UpdateSettings = service.settings.UpdateSettings.getInstance()
         self.dirtySettings = False
 
+        dlgWidth = panel.GetParent().GetParent().ClientSize.width
+
         mainSizer = wx.BoxSizer( wx.VERTICAL )
 
         self.stTitle = wx.StaticText( panel, wx.ID_ANY, self.title, wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -29,6 +29,7 @@ to receive notifications for.
         mainSizer.Add( self.stTitle, 0, wx.ALL, 5 )
 
         self.stDesc = wx.StaticText( panel, wx.ID_ANY, self.desc, wx.DefaultPosition, wx.DefaultSize, 0 )
+        self.stDesc.Wrap(dlgWidth - 50)
         mainSizer.Add( self.stDesc, 0, wx.ALL, 5 )
 
         self.suppressAll = wx.CheckBox( panel, wx.ID_ANY, u"Don't check for updates", wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -51,11 +52,9 @@ to receive notifications for.
             self.versionTitle.Wrap( -1 )
             self.versionTitle.SetFont( wx.Font( 12, 70, 90, 90, False, wx.EmptyString ) )
 
-            self.versionInfo = '''
+            self.versionInfo = "There is a release available which you have chosen to suppress. "+\
-There is a release available which you have chosen to suppress.
+                               "You can choose to reset notification suppression for this release, "+\
-You can choose to reset notification suppression for this release,
+                               "or download the new release from GitHub."
-or download the new release from GitHub.
-'''
 
             self.versionSizer.AddSpacer( ( 5, 5), 0, wx.EXPAND, 5 )
 
@@ -64,6 +63,7 @@ or download the new release from GitHub.
 
             self.versionSizer.Add( self.versionTitle, 0, wx.EXPAND, 5 )
             self.versionDesc = wx.StaticText( panel, wx.ID_ANY, self.versionInfo, wx.DefaultPosition, wx.DefaultSize, 0 )
+            self.versionDesc.Wrap(dlgWidth - 50)
             self.versionSizer.Add( self.versionDesc, 0, wx.ALL, 5 )
 
             actionSizer = wx.BoxSizer( wx.HORIZONTAL )
@@ -114,6 +114,6 @@ or download the new release from GitHub.
         wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.UpdateSettings.get('version'))
 
     def getImage(self):
-        return bitmapLoader.getBitmap("pyfa64", "icons")
+        return bitmapLoader.getBitmap("prefs_update", "icons")
 
 PFUpdatePref.register()