diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-09 23:43:44 +0200 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-09 23:43:44 +0200 |
commit | d8c4bacde00e2be0e5d5aaf7f85f139aae6a95d6 (patch) | |
tree | 12f088e6c07b690cccbcc073b744dc5760713918 /portato/gui/windows/main.py | |
parent | 3cc84485184c1662fabb53f35df43a539021ff93 (diff) | |
parent | 359309950a1283dbbf9df6ce1085838087cfc262 (diff) | |
download | portato-no_config.tar.gz portato-no_config.tar.bz2 portato-no_config.zip |
Merge branch 'master' into no_config to pickup the recent changes andno_config
fixes.
Conflicts:
portato/db/__init__.py
portato/session.py
Diffstat (limited to '')
-rw-r--r-- | portato/gui/windows/main.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index cd4cf24..2f5b48e 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -1434,8 +1434,8 @@ class MainWindow (Window): """Execute the current queue.""" if len(flags.newUseFlags) > 0: - if not self.session.get_boolean("useflags", "dialogs"): - self.session.set("useflags", dialogs.changed_flags_dialog(_("use flags"))[1], "dialogs") + if not self.session.get_bool("useflags", "dialogs"): + self.session.set("useflags", str(dialogs.changed_flags_dialog(_("use flags"))[1]), "dialogs") try: flags.write_use_flags() except IOError, e: @@ -1446,8 +1446,8 @@ class MainWindow (Window): debug("new masked: %s",flags.new_masked) debug("new unmasked: %s", flags.new_unmasked) debug("new testing: %s", flags.newTesting) - if not self.session.get_boolean("keywords", "dialogs"): - self.session.set("keywords", dialogs.changed_flags_dialog(_("masking keywords"))[1], "dialogs") + if not self.session.get_bool("keywords", "dialogs"): + self.session.set("keywords", str(dialogs.changed_flags_dialog(_("masking keywords"))[1]), "dialogs") try: flags.write_masked() flags.write_testing() @@ -1511,8 +1511,15 @@ class MainWindow (Window): gobject.idle_add(cb_idle_append, updating) finally: self.window.window.set_cursor(None) - - GtkThread(name="Update-Thread", target=__update).start() + + # for some reason, I have to create the thread before displaying the dialog + # else the GUI hangs + t = GtkThread(name="Update-Thread", target=__update) + + if not self.session.get_bool("update_world_warning", "dialogs"): + self.session.set("update_world_warning", str(dialogs.update_world_warning_dialog()[1]), "dialogs") + + t.start() return True |