let the GUI module directly return a ScreenSetup instance

[lilass.git] / gui.py

diff --git a/gui.py b/gui.py
index b6906e122af59c70f1310c9fa8538894ed15d0eb..2e5d47673f05397e46788dcf2c67d7869f7a5a61 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -25,12 +25,6 @@ def error(message):
        '''Displays a fatal error to the user'''
        QtGui.QMessageBox.critical(None, 'Fatal error', message)
 
-def getDialogue(externalName, internalResolutions, externalResolutions):
-       '''Returns a class implementing the following functions:
-        * run() opens the dialogue. returns True if it was accepted, False otherwise
-        * getRelativeScreenPosition() returns one of the RelativeScreenPosition values (see dsl.py)
-        * getIntResolutionIndex() returns the index of an element in the internalResolutions list
-        * getExtResolutionIndex() returns the index of an element in the externalResolutions list
-        * externalIsPrimary() returns whether the external screen is the primary one (True) or the internal one (False)
-       '''
-       return PositionSelection(externalName, internalResolutions, externalResolutions)
+def setup(internalResolutions, externalResolutions):
+       '''Returns a ScreenSetup instance, or None if the user canceled'''
+       return PositionSelection(internalResolutions, externalResolutions).run()