summaryrefslogtreecommitdiff
path: root/portato/gui/gtk/windows.py
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-03-07 17:54:38 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-03-07 17:54:38 +0100
commit7c06ac66c161cc8b4110999dc2bf2f2a98ae574b (patch)
treee3fb80e65bb9b51090d36f95b92b503a39f7305b /portato/gui/gtk/windows.py
parent60f1e4d9191a3bc046bf5659c57ed98df5ebb888 (diff)
downloadportato-7c06ac66c161cc8b4110999dc2bf2f2a98ae574b.tar.gz
portato-7c06ac66c161cc8b4110999dc2bf2f2a98ae574b.tar.bz2
portato-7c06ac66c161cc8b4110999dc2bf2f2a98ae574b.zip
Better session handling
Diffstat (limited to 'portato/gui/gtk/windows.py')
-rw-r--r--portato/gui/gtk/windows.py59
1 files changed, 54 insertions, 5 deletions
diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py
index 50acdb8..c6aaab6 100644
--- a/portato/gui/gtk/windows.py
+++ b/portato/gui/gtk/windows.py
@@ -41,6 +41,26 @@ from .dialogs import (blocked_dialog, changed_flags_dialog, io_ex_dialog,
nothing_found_dialog, queue_not_empty_dialog, remove_deps_dialog,
remove_queue_dialog, remove_updates_dialog, unmask_dialog)
+# the current version for saved sessions
+# change this, whenever the change is incompatible with previous versions
+SESSION_VERSION = 1
+
+class SessionException (Exception):
+
+ error = _("Version mismatch.")
+ def __init__ (self, got, expected):
+ self.got = got
+ self.expected = expected
+
+ def __str__ (self):
+ return "%s %s" % (self.error, (_("Got '%d' - expected '%d'.") % (self.got, self.expected)))
+
+class OldSessionException (SessionException):
+ error = _("Current session format is too old.")
+
+class NewSessionException (SessionException):
+ error = _("Current session format is newer than this version supports.")
+
class AboutWindow (AbstractDialog):
"""A window showing the "about"-informations."""
@@ -1142,7 +1162,13 @@ class MainWindow (Window):
# session
splash(_("Restoring Session"))
- self.load_session()
+ try:
+ try:
+ self.load_session()
+ except OldSessionException, e:
+ self.load_session(e)
+ except SessionException, e:
+ warning(str(e))
splash(_("Finishing startup"))
@@ -1280,7 +1306,7 @@ class MainWindow (Window):
except AttributeError: # no selCatName -> so no category selected --> ignore
debug("No category selected --> should be no harm.")
- def load_session(self):
+ def load_session(self, sessionEx = None):
"""
Loads the session data.
"""
@@ -1290,11 +1316,21 @@ class MainWindow (Window):
io_ex_dialog(e)
return
+ oldVersion = SESSION_VERSION
+ allowedVersions = (0,)
+
+ if sessionEx and isinstance(sessionEx, SessionException):
+ if sessionEx.got in allowedVersions:
+ info(_("Translating session from version %d to %d.") % (sessionEx.got, sessionEx.expected))
+ oldVersion = sessionEx.got
+ else:
+ warning(_("Cannot translate session from version %d to %d.") % (session.got, session.expected))
+ raise session_ex
+
#
# the callbacks for the different session variables
#
-
# QUEUE
def load_queue (merge, unmerge, oneshot):
def _load(q, **kwargs):
@@ -1371,13 +1407,26 @@ class MainWindow (Window):
return ""
return _save
+ # SESSION VERSION
+ def load_session_version (version):
+ if oldVersion != SESSION_VERSION: # we are trying to convert
+ return
+
+ version = int(version)
+
+ if version < SESSION_VERSION:
+ raise OldSessionException(version, SESSION_VERSION)
+ elif version > SESSION_VERSION:
+ raise NewSessionException(version, SESSION_VERSION)
+
# set the simple ones :)
map(self.session.add_handler,[
+ ([("gtksessionversion", "session")], load_session_version, lambda: SESSION_VERSION),
([("width", "window"), ("height", "window")], lambda w,h: self.window.resize(int(w), int(h)), self.window.get_size),
([("vpanedpos", "window"), ("hpanedpos", "window")], load_paned, save_paned),
([("catsel", "window")], load_selection(self.catList, 0), save_cat_selection),
- ([("pkgsel", "window")], load_selection(self.pkgList, 1), save_pkg_selection),
- ([("merge", "queue"), ("unmerge", "queue"), ("oneshot", "queue")], load_queue, save_queue)
+ ([("pkgsel", "window")], load_selection(self.pkgList, 1), save_pkg_selection)
+ #([("merge", "queue"), ("unmerge", "queue"), ("oneshot", "queue")], load_queue, save_queue),
])
# set the plugins