Integrate check for updates at startup in the general tab

This commit is contained in:
Manuel Cortez 2016-04-27 16:33:51 -05:00
parent 92d803717f
commit a312b7f63c
2 changed files with 5 additions and 14 deletions

View File

@ -64,13 +64,13 @@ class globalSettingsController(object):
self.dialog.set_value("general", "use_invisible_shorcuts", config.app["app-settings"]["use_invisible_keyboard_shorcuts"])
self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"])
self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"])
self.dialog.set_value("general", "check_for_updates", config.app["app-settings"]["check_for_updates"])
self.dialog.create_proxy()
self.dialog.set_value("proxy", "server", config.app["proxy"]["server"])
self.dialog.set_value("proxy", "port", config.app["proxy"]["port"])
self.dialog.set_value("proxy", "user", config.app["proxy"]["user"])
self.dialog.set_value("proxy", "password", config.app["proxy"]["password"])
self.dialog.create_postabandonment()
self.dialog.set_value("postabandonment", "check_for_updates", config.app["app-settings"]["check_for_updates"])
self.dialog.realize()
self.response = self.dialog.get_response()
@ -94,6 +94,7 @@ class globalSettingsController(object):
config.app["app-settings"]["handle_longtweets"] = self.dialog.get_value("general", "handle_longtweets")
config.app["app-settings"]["play_ready_sound"] = self.dialog.get_value("general", "play_ready_sound")
config.app["app-settings"]["speak_ready_msg"] = self.dialog.get_value("general", "speak_ready_msg")
config.app["app-settings"]["check_for_updates"] = self.dialog.get_value("general", "check_for_updates")
if config.app["proxy"]["server"] != self.dialog.get_value("proxy", "server") or config.app["proxy"]["port"] != self.dialog.get_value("proxy", "port") or config.app["proxy"]["user"] != self.dialog.get_value("proxy", "user") or config.app["proxy"]["password"] != self.dialog.get_value("proxy", "password"):
if self.is_started == True:
self.needs_restart = True
@ -101,7 +102,6 @@ class globalSettingsController(object):
config.app["proxy"]["port"] = self.dialog.get_value("proxy", "port")
config.app["proxy"]["user"] = self.dialog.get_value("proxy", "user")
config.app["proxy"]["password"] = self.dialog.get_value("proxy", "password")
config.app["app-settings"]["check_for_updates"] = self.dialog.get_value("postabandonment", "check_for_updates")
config.app.write()
class accountSettingsController(globalSettingsController):

View File

@ -38,6 +38,8 @@ class general(wx.Panel, baseDialog.BaseWXDialog):
self.km.SetSize(self.km.GetBestSize())
kmbox.Add(km_label, 0, wx.ALL, 5)
kmbox.Add(self.km, 0, wx.ALL, 5)
self.check_for_updates = wx.CheckBox(self, -1, _(U"Check for updates when {0} launches").format(application.name,))
sizer.Add(self.check_for_updates, 0, wx.ALL, 5)
sizer.Add(kmbox, 0, wx.ALL, 5)
self.SetSizer(sizer)
@ -72,13 +74,6 @@ class proxy(wx.Panel, baseDialog.BaseWXDialog):
sizer.Add(serverBox, 0, wx.ALL, 5)
self.SetSizer(sizer)
class postabandonment(wx.Panel, baseDialog.BaseWXDialog):
def __init__(self, parent):
super(postabandonment, self).__init__(parent)
sizer = wx.BoxSizer(wx.VERTICAL)
self.check_for_updates = wx.CheckBox(self, -1, _(U"Check for updates when {0} launches").format(application.name,))
sizer.Add(self.check_for_updates, 0, wx.ALL, 5)
class generalAccount(wx.Panel, baseDialog.BaseWXDialog):
def __init__(self, parent):
super(generalAccount, self).__init__(parent)
@ -326,10 +321,6 @@ class configurationDialog(baseDialog.BaseWXDialog):
self.proxy = proxy(self.notebook)
self.notebook.AddPage(self.proxy, _(u"Proxy"))
def create_postabandonment(self):
self.postabandonment = postabandonment(self.notebook)
self.notebook.AddPage(self.postabandonment, _(u"Codeofdusk's post-abandonment fixes"))
def create_general_account(self):
self.general = generalAccount(self.notebook)
self.notebook.AddPage(self.general, _(u"General"))