Updates "update" prefs to reflect new changes

gui/builtinPreferenceViews/pyfaNetworkPreferences.py

@@ -42,6 +42,13 @@ class PFNetworkPref ( PreferenceView):
 
         mainSizer.Add( subSizer, 0, wx.LEFT|wx.EXPAND, 30 )
 
+        proxyTitle = wx.StaticText( panel, wx.ID_ANY, "Proxy settings", wx.DefaultPosition, wx.DefaultSize, 0 )
+        proxyTitle.Wrap( -1 )
+        proxyTitle.SetFont( wx.Font( 12, 70, 90, 90, False, wx.EmptyString ) )
+
+        mainSizer.Add( proxyTitle, 0, wx.ALL, 5 )
+        mainSizer.Add( wx.StaticLine( panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ), 0, wx.EXPAND, 5 )
+
         self.cbEnableNetwork.SetValue(self.settings.isEnabled(self.network.ENABLED))
         self.cbEve.SetValue(self.settings.isEnabled(self.network.EVE))
         self.cbPricing.SetValue(self.settings.isEnabled(self.network.PRICES))

gui/builtinPreferenceViews/pyfaUpdatePreferences.py

@@ -12,8 +12,9 @@ import gui.globalEvents as GE
 class PFUpdatePref (PreferenceView):
     title = "Updates"
     desc  = "Pyfa can automatically check and notify you of new releases. "+\
-            "These options will allow you to choose what kind of updates, "+\
-            "if any, you wish to receive notifications for."
+            "This feature is toggled in the Network settings. "+\
+            "Here, you may allow pre-release notifications and view "+\
+            "suppressed release notifications, if any."
 
     def populatePanel( self, panel ):
         self.UpdateSettings = service.settings.UpdateSettings.getInstance()
@@ -35,18 +36,12 @@ class PFUpdatePref (PreferenceView):
         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 )
         self.suppressPrerelease = wx.CheckBox( panel, wx.ID_ANY, u"Allow pre-release notifications", wx.DefaultPosition, wx.DefaultSize, 0 )
-
-        mainSizer.Add( self.suppressAll, 0, wx.ALL|wx.EXPAND, 5 )
-        mainSizer.Add( self.suppressPrerelease, 0, wx.ALL|wx.EXPAND, 5 )
-
-        self.suppressAll.Bind(wx.EVT_CHECKBOX, self.OnSuppressAllStateChange)
         self.suppressPrerelease.Bind(wx.EVT_CHECKBOX, self.OnPrereleaseStateChange)
-
-        self.suppressAll.SetValue(self.UpdateSettings.get('all'))
         self.suppressPrerelease.SetValue(not self.UpdateSettings.get('prerelease'))
 
+        mainSizer.Add( self.suppressPrerelease, 0, wx.ALL|wx.EXPAND, 5 )
+
         if (self.UpdateSettings.get('version')):
             self.versionSizer = wx.BoxSizer( wx.VERTICAL )
 
@@ -83,22 +78,9 @@ class PFUpdatePref (PreferenceView):
             self.versionSizer.Add( actionSizer, 0, wx.EXPAND, 5 )
             mainSizer.Add( self.versionSizer, 0, wx.EXPAND, 5 )
 
-        self.ToggleSuppressAll(self.suppressAll.IsChecked())
-
         panel.SetSizer( mainSizer )
         panel.Layout()
 
-    def ToggleSuppressAll(self, bool):
-        ''' Toggles other inputs on/off depending on value of SuppressAll '''
-        if bool:
-            self.suppressPrerelease.Disable()
-        else:
-            self.suppressPrerelease.Enable()
-
-    def OnSuppressAllStateChange(self, event):
-        self.UpdateSettings.set('all', self.suppressAll.IsChecked())
-        self.ToggleSuppressAll(self.suppressAll.IsChecked())
-
     def OnPrereleaseStateChange(self, event):
         self.UpdateSettings.set('prerelease', not self.suppressPrerelease.IsChecked())
 
@@ -119,4 +101,4 @@ class PFUpdatePref (PreferenceView):
     def getImage(self):
         return bitmapLoader.getBitmap("prefs_update", "icons")
 
-PFUpdatePref.register()
+PFUpdatePref.register()

service/settings.py

@@ -251,10 +251,10 @@ class UpdateSettings():
 
     def __init__(self):
         # Settings
-        # all        - If True, suppress all update notifications
-        # prerelease - If True, suppress only prerelease notifications
+        # Updates are completely suppressed via network settings
+        # prerelease - If True, suppress prerelease notifications
         # version    - Set to release tag that user does not want notifications for
-        serviceUpdateDefaultSettings = { "all": False, "prerelease": True, 'version': None }
+        serviceUpdateDefaultSettings = {"prerelease": True, 'version': None }
         self.serviceUpdateSettings = SettingsProvider.getInstance().getSettings("pyfaServiceUpdateSettings", serviceUpdateDefaultSettings)
 
     def get(self, type):
@@ -263,5 +263,4 @@ class UpdateSettings():
     def set(self, type, value):
         self.serviceUpdateSettings[type] = value
 
-# @todo: "reopen fits" setting class
 # @todo: migrate fit settings (from fit service) here?

service/update.py

@@ -32,14 +32,9 @@ class CheckUpdateThread(threading.Thread):
         self.network = service.Network.getInstance()
 
     def run(self):
-        # Suppress all
-        if (self.settings.get('all')):
-            return
-
         network = service.Network.getInstance()
 
         try:
-            # @todo: use proxy settings?
             response = network.request('https://api.github.com/repos/DarkFenX/Pyfa/releases', network.UPDATE)
             jsonResponse = json.loads(response.read())
 
@@ -73,7 +68,7 @@ class CheckUpdateThread(threading.Thread):
                     if release['prerelease'] and rVersion > config.expansionVersion:
                         wx.CallAfter(self.callback, release) # Singularity -> Singularity
                 break
-        except: # for when there is no internet connection
+        except:
             pass
 
     def versiontuple(self, v):