V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 049e226ddc - Show all commits

View File

@ -2862,6 +2862,14 @@ class MyForm(settingsmixin.SMainWindow):
if reply is QtGui.QMessageBox.No: if reply is QtGui.QMessageBox.No:
return return
''' '''
# save state and geometry self and all widgets
self.saveSettings()
for attr, obj in self.ui.__dict__.iteritems():
if hasattr(obj, "__class__") and isinstance(obj, settingsmixin.SettingsMixin):
saveMethod = getattr(obj, "saveSettings", None)
if callable (saveMethod):
obj.saveSettings()
shared.doCleanShutdown() shared.doCleanShutdown()
self.tray.hide() self.tray.hide()
# unregister the messaging system # unregister the messaging system
@ -2891,13 +2899,6 @@ class MyForm(settingsmixin.SMainWindow):
# minimize the application # minimize the application
event.ignore() event.ignore()
else: else:
# save state and geometry self and all widgets
self.saveSettings()
for attr, obj in self.ui.__dict__.iteritems():
if hasattr(obj, "__class__") and isinstance(obj, settingsmixin.SettingsMixin):
saveMethod = getattr(obj, "saveSettings", None)
if callable (saveMethod):
obj.saveSettings()
# quit the application # quit the application
event.accept() event.accept()
self.quit() self.quit()