refactor pretty much everything. some features are still missing.

[lilass.git] / gui.py

diff --git a/gui.py b/gui.py
index 7db44b83e1fe9f9128d1c6554eea6eb968349e26..c1f045d6c1d5ecdeae46f46307c821aaa73f9386 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -1,5 +1,5 @@
 # DSL - easy Display Setup for Laptops
-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012-2015 Ralf Jung <post@ralfj.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,9 +42,9 @@ class QtFrontend:
         from PyQt4 import QtGui
         QtGui.QMessageBox.critical(None, 'Fatal error', message)
     
-    def setup(self, internalResolutions, externalResolutions):
+    def setup(self, situation):
         from qt_dialogue import PositionSelection
-        return PositionSelection(internalResolutions, externalResolutions).run()
+        return PositionSelection(situation).run()
     
     @staticmethod
     def isAvailable():
@@ -61,9 +61,9 @@ class ZenityFrontend:
         '''Displays a fatal error to the user'''
         subprocess.check_call(["zenity", "--error", "--text="+message])
     
-    def setup(self, internalResolutions, externalResolutions):
+    def setup(self, situation):
         from zenity_dialogue import run
-        run(internalResolutions, externalResolutions)
+        return run(situation.internalResolutions(), situation.externalResolutions())
     
     @staticmethod
     def isAvailable():
@@ -80,7 +80,7 @@ class CLIFrontend:
     def error(self, message):
         print(message, file=sys.stderr)
     
-    def setup(self, internalResolutions, externalResolutions):
+    def setup(self, internalResolutions, externalResolutions, commonRes):
         raise Exception("Choosing the setup interactively is not supported with the CLI frontend")
     
     @staticmethod