From 73c45eaeed3a962894c26ee021d12f9e1402a857 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 7 Oct 2012 15:41:08 +0200 Subject: [PATCH 1/1] let the GUI module directly return a ScreenSetup instance --- dsl.py | 5 ++--- gui.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dsl.py b/dsl.py index f9c58fa..52bcd08 100755 --- a/dsl.py +++ b/dsl.py @@ -46,7 +46,7 @@ class ScreenSetup: return args def getExternalArgs(self, intName): - args = ["--mode", res2xrandr(self.extResolution)] + args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution if self.extIsPrimary: args.append('--primary') if self.relPosition == RelativeScreenPosition.LEFT: @@ -187,8 +187,7 @@ if __name__ == "__main__": usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used if usedExternalConnector is not None: # there's an external screen connected, we need to ask what to do # get setup - dialogue = gui.getDialogue(connectors[internalConnector], connectors[usedExternalConnector]) - setup = dialogue.run() + setup = gui.setup(connectors[internalConnector], connectors[usedExternalConnector]) if setup is None: sys.exit(1) # the user canceled # apply it connectorArgs[internalConnector] = setup.getInternalArgs() diff --git a/gui.py b/gui.py index 84e0da3..2e5d476 100644 --- a/gui.py +++ b/gui.py @@ -25,6 +25,6 @@ def error(message): '''Displays a fatal error to the user''' QtGui.QMessageBox.critical(None, 'Fatal error', message) -def getDialogue(internalResolutions, externalResolutions): - '''Returns a class implementing a function run() which returns a ScreenSetup instance, or None if the user canceled''' - return PositionSelection(internalResolutions, externalResolutions) +def setup(internalResolutions, externalResolutions): + '''Returns a ScreenSetup instance, or None if the user canceled''' + return PositionSelection(internalResolutions, externalResolutions).run() -- 2.30.2