mcvsoftware/socializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display version type in about dialog between alpha or stable

Browse Source
This commit is contained in:
Manuel Cortez 2019-07-02 09:26:07 -05:00
parent d95dfb18fd
commit ae93efb17a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller/mainController.py
View File

@ -547,7 +547,7 @@ class Controller(object):
widgetUtils.connect_event(self.window, widgetUtils.CLOSE_EVENT, self.exit) widgetUtils.connect_event(self.window, widgetUtils.CLOSE_EVENT, self.exit)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.update_buffer, menuitem=self.window.update_buffer) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.update_buffer, menuitem=self.window.update_buffer)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.check_for_updates, menuitem=self.window.check_for_updates) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.check_for_updates, menuitem=self.window.check_for_updates)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.window.about_dialog, menuitem=self.window.about) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_about, menuitem=self.window.about)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.search_audios, menuitem=self.window.search_audios) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.search_audios, menuitem=self.window.search_audios)
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.search_videos, menuitem=self.window.search_videos) widgetUtils.connect_event(self.window, widgetUtils.MENU, self.search_videos, menuitem=self.window.search_videos)
widgetUtils.connect_event(self.window, widgetUtils.MENU,self.remove_buffer, menuitem=self.window.remove_buffer_) widgetUtils.connect_event(self.window, widgetUtils.MENU,self.remove_buffer, menuitem=self.window.remove_buffer_)
@ -598,6 +598,10 @@ class Controller(object):
if update == False: if update == False:
commonMessages.no_update_available() commonMessages.no_update_available()
def on_about(self, *args, **kwargs):
channel = self.session.settings["general"]["update_channel"]
self.window.about_dialog(channel)
def search_audios(self, *args, **kwargs): def search_audios(self, *args, **kwargs):
dlg = searchDialogs.searchAudioDialog() dlg = searchDialogs.searchAudioDialog()
if dlg.get_response() == widgetUtils.OK: if dlg.get_response() == widgetUtils.OK:

8
src/wxUI/mainWindow.py
View File

@ -133,10 +133,14 @@ class mainWindow(wx.Frame):
def advance_selection(self, forward): def advance_selection(self, forward):
self.tb.AdvanceSelection(forward) self.tb.AdvanceSelection(forward)
def about_dialog(self, *args, **kwargs): def about_dialog(self, channel="stable", *args, **kwargs):
if channel == "stable":
version = _("{version} (stable)").format(version=application.version)
else:
version = _("{version} (alpha)").format(version=application.update_next_version)
info = wx.adv.AboutDialogInfo() info = wx.adv.AboutDialogInfo()
info.SetName(application.name) info.SetName(application.name)
info.SetVersion(application.version) info.SetVersion(version)
info.SetDescription(application.description) info.SetDescription(application.description)
info.SetCopyright(application.copyright) info.SetCopyright(application.copyright)
info.SetTranslators(application.translators) info.SetTranslators(application.translators)