fixed zenity

[lilass.git] / gui.py

diff --git a/gui.py b/gui.py
index 7db44b83e1fe9f9128d1c6554eea6eb968349e26..40cafa55e8dc2cda6c0850cbfa42723f407b8c99 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -42,9 +42,9 @@ class QtFrontend:
         from PyQt4 import QtGui
         QtGui.QMessageBox.critical(None, 'Fatal error', message)
     
         from PyQt4 import QtGui
         QtGui.QMessageBox.critical(None, 'Fatal error', message)
     

-    def setup(self, internalResolutions, externalResolutions):
+    def setup(self, internalResolutions, externalResolutions, commonRes):

         from qt_dialogue import PositionSelection
         from qt_dialogue import PositionSelection

-        return PositionSelection(internalResolutions, externalResolutions).run()
+        return PositionSelection(internalResolutions, externalResolutions, commonRes).run()

     
     @staticmethod
     def isAvailable():
     
     @staticmethod
     def isAvailable():


@@ -61,9 +61,9 @@ class ZenityFrontend:
         '''Displays a fatal error to the user'''
         subprocess.check_call(["zenity", "--error", "--text="+message])
     
         '''Displays a fatal error to the user'''
         subprocess.check_call(["zenity", "--error", "--text="+message])
     

-    def setup(self, internalResolutions, externalResolutions):
+    def setup(self, internalResolutions, externalResolutions, commonRes):

         from zenity_dialogue import run
         from zenity_dialogue import run

-        run(internalResolutions, externalResolutions)
+        return run(internalResolutions, externalResolutions)

     
     @staticmethod
     def isAvailable():
     
     @staticmethod
     def isAvailable():


@@ -80,7 +80,7 @@ class CLIFrontend:
     def error(self, message):
         print(message, file=sys.stderr)
     
     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
         raise Exception("Choosing the setup interactively is not supported with the CLI frontend")
     
     @staticmethod