Migration Wizard
- Not fully working yet - show this wizard and connection confirmation dialog before showing the main window, and don't open main window until these two have finished or were canceled
This commit is contained in:
parent
3a294ac672
commit
83a069d1f6
|
@ -1627,6 +1627,13 @@ class MyForm(QtGui.QMainWindow):
|
||||||
else:
|
else:
|
||||||
self.click_actionSettings()
|
self.click_actionSettings()
|
||||||
|
|
||||||
|
def showMigrationWizard(self, level):
|
||||||
|
self.migrationWizardInstance = Ui_MigrationWizard(["a"])
|
||||||
|
if self.migrationWizardInstance.exec_():
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
pass
|
||||||
|
|
||||||
def changeEvent(self, event):
|
def changeEvent(self, event):
|
||||||
if event.type() == QtCore.QEvent.LanguageChange:
|
if event.type() == QtCore.QEvent.LanguageChange:
|
||||||
self.ui.retranslateUi(self)
|
self.ui.retranslateUi(self)
|
||||||
|
@ -4148,12 +4155,20 @@ def run():
|
||||||
app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
|
app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
|
||||||
myapp = MyForm()
|
myapp = MyForm()
|
||||||
|
|
||||||
if not shared.config.getboolean('bitmessagesettings', 'startintray'):
|
|
||||||
myapp.show()
|
|
||||||
|
|
||||||
myapp.appIndicatorInit(app)
|
myapp.appIndicatorInit(app)
|
||||||
myapp.ubuntuMessagingMenuInit()
|
myapp.ubuntuMessagingMenuInit()
|
||||||
myapp.notifierInit()
|
myapp.notifierInit()
|
||||||
if shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
|
if shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
|
||||||
myapp.showConnectDialog() # ask the user if we may connect
|
myapp.showConnectDialog() # ask the user if we may connect
|
||||||
|
|
||||||
|
try:
|
||||||
|
if shared.config.get('bitmessagesettings', 'mailchuck') < 1:
|
||||||
|
myapp.showMigrationWizard(shared.config.get('bitmessagesettings', 'mailchuck'))
|
||||||
|
except:
|
||||||
|
myapp.showMigrationWizard(0)
|
||||||
|
|
||||||
|
# only show after wizards and connect dialogs have completed
|
||||||
|
if not shared.config.getboolean('bitmessagesettings', 'startintray'):
|
||||||
|
myapp.show()
|
||||||
|
|
||||||
sys.exit(app.exec_())
|
sys.exit(app.exec_())
|
||||||
|
|
Loading…
Reference in New Issue
Block a user