From: Ralf Jung Date: Sun, 25 Jan 2015 16:31:03 +0000 (+0100) Subject: tab -> whitespace X-Git-Url: https://git.ralfj.de/lilass.git/commitdiff_plain/7129adf1f29ada89d37adf131dbab8d3c5483408?ds=inline;hp=--cc tab -> whitespace --- 7129adf1f29ada89d37adf131dbab8d3c5483408 diff --git a/dsl.py b/dsl.py index 9bbf45f..e0e71d1 100755 --- a/dsl.py +++ b/dsl.py @@ -25,224 +25,224 @@ commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1'] # this is as close as one can get to an enum in Python class RelativeScreenPosition: - LEFT = 0 - RIGHT = 1 - EXTERNAL_ONLY = 2 + LEFT = 0 + RIGHT = 1 + EXTERNAL_ONLY = 2 # storing what's necessary for screen setup class ScreenSetup: - def __init__(self, relPosition, intResolution, extResolution, extIsPrimary = False): - '''relPosition must be one of the RelativeScreenPosition members, the resolutions must be (width, height) pairs''' - self.relPosition = relPosition - self.intResolution = intResolution # value doesn't matter if the internal screen is disabled - self.extResolution = extResolution - self.extIsPrimary = extIsPrimary or self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY # external is always primary if it is the only one - - def getInternalArgs(self): - if self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY: - return ["--off"] - args = ["--mode", res2xrandr(self.intResolution)] # set internal screen to desired resolution - if not self.extIsPrimary: - args.append('--primary') - return args - - def getExternalArgs(self, intName): - args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution - if self.extIsPrimary: - args.append('--primary') - if self.relPosition == RelativeScreenPosition.LEFT: - args += ['--left-of', intName] - elif self.relPosition == RelativeScreenPosition.RIGHT: - args += ['--right-of', intName] - return args + def __init__(self, relPosition, intResolution, extResolution, extIsPrimary = False): + '''relPosition must be one of the RelativeScreenPosition members, the resolutions must be (width, height) pairs''' + self.relPosition = relPosition + self.intResolution = intResolution # value doesn't matter if the internal screen is disabled + self.extResolution = extResolution + self.extIsPrimary = extIsPrimary or self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY # external is always primary if it is the only one + + def getInternalArgs(self): + if self.relPosition == RelativeScreenPosition.EXTERNAL_ONLY: + return ["--off"] + args = ["--mode", res2xrandr(self.intResolution)] # set internal screen to desired resolution + if not self.extIsPrimary: + args.append('--primary') + return args + + def getExternalArgs(self, intName): + args = ["--mode", res2xrandr(self.extResolution)] # set external screen to desired resolution + if self.extIsPrimary: + args.append('--primary') + if self.relPosition == RelativeScreenPosition.LEFT: + args += ['--left-of', intName] + elif self.relPosition == RelativeScreenPosition.RIGHT: + args += ['--right-of', intName] + return args # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation) def loadConfigFile(filename): - import shlex - result = {} - if not os.path.exists(filename): - return result # no config file - # read config file - linenr = 0 - with open(filename) as f: - for line in f: - linenr += 1 - line = line.strip() - if not len(line) or line.startswith("#"): continue # skip empty and comment lines - try: - # parse line - pos = line.index("=") # will raise exception when substring is not found - curKey = line[:pos].strip() - result[curKey] = shlex.split(line[pos+1:]) # shlex.split also strips - except Exception: - raise Exception("Invalid config, line %d: Error parsing line (may be a quoting issue)." % linenr) - # add some convencience get functions - return result + import shlex + result = {} + if not os.path.exists(filename): + return result # no config file + # read config file + linenr = 0 + with open(filename) as f: + for line in f: + linenr += 1 + line = line.strip() + if not len(line) or line.startswith("#"): continue # skip empty and comment lines + try: + # parse line + pos = line.index("=") # will raise exception when substring is not found + curKey = line[:pos].strip() + result[curKey] = shlex.split(line[pos+1:]) # shlex.split also strips + except Exception: + raise Exception("Invalid config, line %d: Error parsing line (may be a quoting issue)." % linenr) + # add some convencience get functions + return result # helper function: execute a process, return output as iterator, throw exception if there was an error # you *must* iterate to the end if you use this! def processOutputGen(*args): - with subprocess.Popen(args, stdout=subprocess.PIPE) as p: - for line in p.stdout: - yield line.decode("utf-8") - if p.returncode != 0: - raise Exception("Error executing "+str(args)) + with subprocess.Popen(args, stdout=subprocess.PIPE) as p: + for line in p.stdout: + yield line.decode("utf-8") + if p.returncode != 0: + raise Exception("Error executing "+str(args)) def processOutputIt(*args): - return list(processOutputGen(*args)) # list() iterates over the generator + return list(processOutputGen(*args)) # list() iterates over the generator # Run xrandr and return a dict of output names mapped to lists of available resolutions, each being a (width, height) pair. # An empty list indicates that the connector is disabled. def getXrandrInformation(): - connectors = {} # map of connector names to a list of resolutions - connector = None # current connector - for line in processOutputGen("xrandr", "-q"): - # screen? - m = re.search(r'^Screen [0-9]+: ', line) - if m is not None: # ignore this line - connector = None - continue - # new connector? - m = re.search(r'^([\w\-]+) (dis)?connected ', line) - if m is not None: - connector = m.groups()[0] - assert connector not in connectors - connectors[connector] = [] - continue - # new resolution? - m = re.search(r'^ ([\d]+)x([\d]+) +', line) - if m is not None: - assert connector is not None - connectors[connector].append((int(m.groups()[0]), int(m.groups()[1]))) - continue - # unknown line - # not fatal as my xrandr shows strange stuff when a display is enabled, but not connected - #raise Exception("Unknown line in xrandr output:\n"+line) - print("Warning: Unknown xrandr line %s" % line) - return connectors + connectors = {} # map of connector names to a list of resolutions + connector = None # current connector + for line in processOutputGen("xrandr", "-q"): + # screen? + m = re.search(r'^Screen [0-9]+: ', line) + if m is not None: # ignore this line + connector = None + continue + # new connector? + m = re.search(r'^([\w\-]+) (dis)?connected ', line) + if m is not None: + connector = m.groups()[0] + assert connector not in connectors + connectors[connector] = [] + continue + # new resolution? + m = re.search(r'^ ([\d]+)x([\d]+) +', line) + if m is not None: + assert connector is not None + connectors[connector].append((int(m.groups()[0]), int(m.groups()[1]))) + continue + # unknown line + # not fatal as my xrandr shows strange stuff when a display is enabled, but not connected + #raise Exception("Unknown line in xrandr output:\n"+line) + print("Warning: Unknown xrandr line %s" % line) + return connectors # convert a (width, height) pair into a string accepted by xrandr as argument for --mode def res2xrandr(res): - (w, h) = res - return str(w)+'x'+str(h) + (w, h) = res + return str(w)+'x'+str(h) # convert a (width, height) pair into a string to be displayed to the user def res2user(res): - (w, h) = res - # get ratio - ratio = int(round(16.0*h/w)) - if ratio == 12: # 16:12 = 4:3 - strRatio = '4:3' - elif ratio == 13: # 16:12.8 = 5:4 - strRatio = '5:4' - else: # let's just hope this will never be 14 or more... - strRatio = '16:%d' % ratio - return '%dx%d (%s)' %(w, h, strRatio) + (w, h) = res + # get ratio + ratio = int(round(16.0*h/w)) + if ratio == 12: # 16:12 = 4:3 + strRatio = '4:3' + elif ratio == 13: # 16:12.8 = 5:4 + strRatio = '5:4' + else: # let's just hope this will never be 14 or more... + strRatio = '16:%d' % ratio + return '%dx%d (%s)' %(w, h, strRatio) # return the first available connector from those listed in tryConnectors, skipping disabled connectors def findAvailableConnector(tryConnectors, allConnectors): - for connector in tryConnectors: - if connector in allConnectors and allConnectors[connector]: # if the connector exists and is active (i.e. there is a resolution) - return connector - return None + for connector in tryConnectors: + if connector in allConnectors and allConnectors[connector]: # if the connector exists and is active (i.e. there is a resolution) + return connector + return None # Return a (internalConnector, externalConnectors) pair: The name of the internal connector, and a list of external connectors. # Use the config file at ~/.dsl.conf and fall back to auto-detection def classifyConnectors(allConnectors): - config = loadConfigFile(os.getenv('HOME') + '/.dsl.conf') - # find internal connector - if 'internalConnector' in config: - if len(config['internalConnector']) != 1: - raise Exception("You must specify exactly one internal connector.") - internalConnector = config['internalConnector'][0] - if not internalConnector in allConnectors: - raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector) - else: - # auto-config - internalConnector = findAvailableConnector(commonInternalConnectorNames, allConnectors) - if internalConnector is None: - raise Exception("Could not automatically find internal connector, please use ~/.dsl.conf to specify it manually.") - # all the rest is external then, obviously - unless the user wants to do that manually - if 'externalConnectors' in config: - externalConnectors = config['externalConnectors'] - for connector in externalConnectors: - if not connector in allConnectors: - raise Exception("Connector %s does not exist, there is an error in your config file." % connector) - if connector == internalConnector: - raise Exception("%s is both internal and external, that doesn't make sense." % connector) - else: - externalConnectors = list(allConnectors.keys()) - externalConnectors.remove(internalConnector) - if not externalConnectors: - raise Exception("No external connector found - either your config is wrong, or your machine has only one connector.") - # done! - return (internalConnector, externalConnectors) + config = loadConfigFile(os.getenv('HOME') + '/.dsl.conf') + # find internal connector + if 'internalConnector' in config: + if len(config['internalConnector']) != 1: + raise Exception("You must specify exactly one internal connector.") + internalConnector = config['internalConnector'][0] + if not internalConnector in allConnectors: + raise Exception("Connector %s does not exist, there is an error in your config file." % internalConnector) + else: + # auto-config + internalConnector = findAvailableConnector(commonInternalConnectorNames, allConnectors) + if internalConnector is None: + raise Exception("Could not automatically find internal connector, please use ~/.dsl.conf to specify it manually.") + # all the rest is external then, obviously - unless the user wants to do that manually + if 'externalConnectors' in config: + externalConnectors = config['externalConnectors'] + for connector in externalConnectors: + if not connector in allConnectors: + raise Exception("Connector %s does not exist, there is an error in your config file." % connector) + if connector == internalConnector: + raise Exception("%s is both internal and external, that doesn't make sense." % connector) + else: + externalConnectors = list(allConnectors.keys()) + externalConnectors.remove(internalConnector) + if not externalConnectors: + raise Exception("No external connector found - either your config is wrong, or your machine has only one connector.") + # done! + return (internalConnector, externalConnectors) # if we run top-level if __name__ == "__main__": - try: - # parse command-line arguments - parser = argparse.ArgumentParser(description='easy Display Setup for Laptops') - parser.add_argument("-f", "--frontend", - dest="frontend", - help="The frontend to be used for user interaction") - parser.add_argument("-r", "--relative-position", - dest="rel_position", choices=('left', 'right', 'external-only'), - help="Position of external screen relative to internal one") - parser.add_argument("-i", "--internal-only", - dest="internal_only", action='store_true', - help="Enable internal screen, disable all the others (as if no external screen was connected") - cmdArgs = parser.parse_args() - - # load frontend - frontend = getFrontend(cmdArgs.frontend) - - # load connectors and classify them - connectors = getXrandrInformation() - (internalConnector, externalConnectors) = classifyConnectors(connectors) - - # default: screen off - connectorArgs = {} # maps connector names to xrand arguments - for c in externalConnectors+[internalConnector]: - connectorArgs[c] = ["--off"] - - # check whether we got an external screen or not - # Check what to do - usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used - hasExternal = not cmdArgs.internal_only and usedExternalConnector is not None - if hasExternal: - # there's an external screen connected, we need to get a setup - if cmdArgs.rel_position is not None: - # use command-line arguments (can we do this relPosition stuff more elegant?) - if cmdArgs.rel_position == 'left': - relPosition = RelativeScreenPosition.LEFT - elif cmdArgs.rel_position == 'right': - relPosition = RelativeScreenPosition.RIGHT - else: - relPosition = RelativeScreenPosition.EXTERNAL_ONLY - setup = ScreenSetup(relPosition, connectors[internalConnector][0], connectors[usedExternalConnector][0]) # use default resolutions - else: - # use GUI - setup = frontend.setup(connectors[internalConnector], connectors[usedExternalConnector]) - if setup is None: sys.exit(1) # the user canceled - # apply it - connectorArgs[internalConnector] = setup.getInternalArgs() - connectorArgs[usedExternalConnector] = setup.getExternalArgs(internalConnector) - else: - # use first resolution of internal connector - connectorArgs[internalConnector] = ["--mode", res2xrandr(connectors[internalConnector][0]), "--primary"] - - # and do it - call = ["xrandr"] - for name in connectorArgs: - call += ["--output", name] + connectorArgs[name] - print("Call that will be made:",call) - subprocess.check_call(call) - - # make sure the internal screen is really, *really* turned on if there is no external screen - if not hasExternal: - backlight = float(subprocess.check_output(["xbacklight", "-get"]).strip()) - if backlight == 0: # it's completely turned off, we better enable it - subprocess.check_call(["xbacklight", "-set", "100"]) - except Exception as e: - frontend.error(str(e)) - raise + try: + # parse command-line arguments + parser = argparse.ArgumentParser(description='easy Display Setup for Laptops') + parser.add_argument("-f", "--frontend", + dest="frontend", + help="The frontend to be used for user interaction") + parser.add_argument("-r", "--relative-position", + dest="rel_position", choices=('left', 'right', 'external-only'), + help="Position of external screen relative to internal one") + parser.add_argument("-i", "--internal-only", + dest="internal_only", action='store_true', + help="Enable internal screen, disable all the others (as if no external screen was connected") + cmdArgs = parser.parse_args() + + # load frontend + frontend = getFrontend(cmdArgs.frontend) + + # load connectors and classify them + connectors = getXrandrInformation() + (internalConnector, externalConnectors) = classifyConnectors(connectors) + + # default: screen off + connectorArgs = {} # maps connector names to xrand arguments + for c in externalConnectors+[internalConnector]: + connectorArgs[c] = ["--off"] + + # check whether we got an external screen or not + # Check what to do + usedExternalConnector = findAvailableConnector(externalConnectors, connectors) # *the* external connector which is actually used + hasExternal = not cmdArgs.internal_only and usedExternalConnector is not None + if hasExternal: + # there's an external screen connected, we need to get a setup + if cmdArgs.rel_position is not None: + # use command-line arguments (can we do this relPosition stuff more elegant?) + if cmdArgs.rel_position == 'left': + relPosition = RelativeScreenPosition.LEFT + elif cmdArgs.rel_position == 'right': + relPosition = RelativeScreenPosition.RIGHT + else: + relPosition = RelativeScreenPosition.EXTERNAL_ONLY + setup = ScreenSetup(relPosition, connectors[internalConnector][0], connectors[usedExternalConnector][0]) # use default resolutions + else: + # use GUI + setup = frontend.setup(connectors[internalConnector], connectors[usedExternalConnector]) + if setup is None: sys.exit(1) # the user canceled + # apply it + connectorArgs[internalConnector] = setup.getInternalArgs() + connectorArgs[usedExternalConnector] = setup.getExternalArgs(internalConnector) + else: + # use first resolution of internal connector + connectorArgs[internalConnector] = ["--mode", res2xrandr(connectors[internalConnector][0]), "--primary"] + + # and do it + call = ["xrandr"] + for name in connectorArgs: + call += ["--output", name] + connectorArgs[name] + print("Call that will be made:",call) + subprocess.check_call(call) + + # make sure the internal screen is really, *really* turned on if there is no external screen + if not hasExternal: + backlight = float(subprocess.check_output(["xbacklight", "-get"]).strip()) + if backlight == 0: # it's completely turned off, we better enable it + subprocess.check_call(["xbacklight", "-set", "100"]) + except Exception as e: + frontend.error(str(e)) + raise diff --git a/gui.py b/gui.py index c069761..7db44b8 100644 --- a/gui.py +++ b/gui.py @@ -22,70 +22,70 @@ import sys This module implements two functions: def error(message): - This function displays the error message to the user in some appropriate fassion + This function displays the error message to the user in some appropriate fassion def setup(internalResolutions, externalResolutions): - Both arguments are lists of (width, height) tuples of resolutions. You can use dsl.res2user to obtain a user-readable representation of a resolution tuple. - The user should be asked about his display setup preferences. - The function returns None if the user cancelled, and an instance of dsl.ScreenSetup otherwise. + Both arguments are lists of (width, height) tuples of resolutions. You can use dsl.res2user to obtain a user-readable representation of a resolution tuple. + The user should be asked about his display setup preferences. + The function returns None if the user cancelled, and an instance of dsl.ScreenSetup otherwise. ''' import subprocess, collections # Qt frontend class QtFrontend: - def __init__(self): - from PyQt4 import QtGui - self.app = QtGui.QApplication(sys.argv) - print("Qt loaded") - - def error(self, message): - from PyQt4 import QtGui - QtGui.QMessageBox.critical(None, 'Fatal error', message) - - def setup(self, internalResolutions, externalResolutions): - from qt_dialogue import PositionSelection - return PositionSelection(internalResolutions, externalResolutions).run() - - @staticmethod - def isAvailable(): - try: - import PyQt4 - return True - except ImportError: - return False + def __init__(self): + from PyQt4 import QtGui + self.app = QtGui.QApplication(sys.argv) + print("Qt loaded") + + def error(self, message): + from PyQt4 import QtGui + QtGui.QMessageBox.critical(None, 'Fatal error', message) + + def setup(self, internalResolutions, externalResolutions): + from qt_dialogue import PositionSelection + return PositionSelection(internalResolutions, externalResolutions).run() + + @staticmethod + def isAvailable(): + try: + import PyQt4 + return True + except ImportError: + return False # Zenity frontend class ZenityFrontend: - def error(message): - '''Displays a fatal error to the user''' - subprocess.check_call(["zenity", "--error", "--text="+message]) - - def setup(self, internalResolutions, externalResolutions): - from zenity_dialogue import run - run(internalResolutions, externalResolutions) - - @staticmethod - def isAvailable(): - try: - from dsl import processOutputIt - processOutputIt("zenity", "--version") - return True - except Exception: - return False + def error(message): + '''Displays a fatal error to the user''' + subprocess.check_call(["zenity", "--error", "--text="+message]) + + def setup(self, internalResolutions, externalResolutions): + from zenity_dialogue import run + run(internalResolutions, externalResolutions) + + @staticmethod + def isAvailable(): + try: + from dsl import processOutputIt + processOutputIt("zenity", "--version") + return True + except Exception: + return False # CLI frontend class CLIFrontend: - def error(self, message): - print(message, file=sys.stderr) - - def setup(self, internalResolutions, externalResolutions): - raise Exception("Choosing the setup interactively is not supported with the CLI frontend") - - @staticmethod - def isAvailable(): - return True + def error(self, message): + print(message, file=sys.stderr) + + def setup(self, internalResolutions, externalResolutions): + raise Exception("Choosing the setup interactively is not supported with the CLI frontend") + + @staticmethod + def isAvailable(): + return True # list of available frontends frontends = collections.OrderedDict() @@ -95,15 +95,15 @@ frontends["cli"] = CLIFrontend # get a frontend def getFrontend(name = None): - # by name - if name is not None: - if name in frontends: - if frontends[name].isAvailable(): - return frontends[name]() # call constructor - # frontend not found or not available - raise Exception("Frontend %s not found or not available" % name) - # auto-detect - for frontend in frontends.values(): - if frontend.isAvailable(): - return frontend() # call constructor - raise Exception("No frontend is available - this should not happen") + # by name + if name is not None: + if name in frontends: + if frontends[name].isAvailable(): + return frontends[name]() # call constructor + # frontend not found or not available + raise Exception("Frontend %s not found or not available" % name) + # auto-detect + for frontend in frontends.values(): + if frontend.isAvailable(): + return frontend() # call constructor + raise Exception("No frontend is available - this should not happen") diff --git a/qt_dialogue.py b/qt_dialogue.py index 0986106..879a09a 100644 --- a/qt_dialogue.py +++ b/qt_dialogue.py @@ -18,76 +18,76 @@ from dsl import RelativeScreenPosition, ScreenSetup, res2user from PyQt4 import QtCore, QtGui def makeLayout(layout, members): - for m in members: - if isinstance(m, QtGui.QLayout): - layout.addLayout(m) - else: - layout.addWidget(m) - return layout + for m in members: + if isinstance(m, QtGui.QLayout): + layout.addLayout(m) + else: + layout.addWidget(m) + return layout class PositionSelection(QtGui.QDialog): - def __init__(self, internalResolutions, externalResolutions): - # set up main window - super(PositionSelection, self).__init__() - self.setWindowTitle('DSL - easy Display Setup for Laptops') - - # position selection - posBox = QtGui.QGroupBox('Position of external screen', self) - self.posLeft = QtGui.QRadioButton('Left of internal screen', posBox) - self.posRight = QtGui.QRadioButton('Right of internal screen', posBox) - self.posRight.setChecked(True) - self.posRight.setFocus() - self.extOnly = QtGui.QRadioButton('Use external screen exclusively', posBox) - posBox.setLayout(makeLayout(QtGui.QVBoxLayout(), [self.posLeft, self.posRight, self.extOnly])) - - # primary screen - primBox = QtGui.QGroupBox('Which should be the primary screen?', self) - self.extOnly.toggled.connect(primBox.setDisabled) # disable the box if there's just one screen in use - self.primExt = QtGui.QRadioButton('The external screen', primBox) - self.primInt = QtGui.QRadioButton('The internal screen', primBox) - self.primInt.setChecked(True) - primBox.setLayout(makeLayout(QtGui.QVBoxLayout(), [self.primExt, self.primInt])) - - # resolution selection - resBox = QtGui.QGroupBox('Screen resolutions', self) - extResLabel = QtGui.QLabel('Resolution of external screen:', resBox) - self.extResolutions = externalResolutions - self.extResolutionsBox = QtGui.QComboBox(resBox) - for res in externalResolutions: - self.extResolutionsBox.addItem(res2user(res)) - self.extResolutionsBox.setCurrentIndex(0) # select first resolution - extRow = makeLayout(QtGui.QHBoxLayout(), [extResLabel, self.extResolutionsBox]) - intResLabel = QtGui.QLabel('Resolution of internal screen:', resBox) - self.extOnly.toggled.connect(intResLabel.setDisabled) # disable the label if there's just one screen in use - self.intResolutions = internalResolutions - self.intResolutionsBox = QtGui.QComboBox(resBox) - for res in internalResolutions: - self.intResolutionsBox.addItem(res2user(res)) - self.intResolutionsBox.setCurrentIndex(0) # select first resolution - self.extOnly.toggled.connect(self.intResolutionsBox.setDisabled) # disable the box if there's just one screen in use - intRow = makeLayout(QtGui.QHBoxLayout(), [intResLabel, self.intResolutionsBox]) - resBox.setLayout(makeLayout(QtGui.QVBoxLayout(), [extRow, intRow])) - - # last row: buttons - buttons = QtGui.QDialogButtonBox(QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Cancel, QtCore.Qt.Horizontal, self) - buttons.accepted.connect(self.accept) - buttons.rejected.connect(self.reject) - - # add them all to the window - self.setLayout(makeLayout(QtGui.QVBoxLayout(), [posBox, primBox, resBox, buttons])) - - def run(self): - self.exec_() - if not self.result(): return None - return ScreenSetup(self.getRelativeScreenPosition(), - self.intResolutions[self.intResolutionsBox.currentIndex()], - self.extResolutions[self.extResolutionsBox.currentIndex()], - self.primExt.isChecked()) - - def getRelativeScreenPosition(self): - if self.posLeft.isChecked(): - return RelativeScreenPosition.LEFT - elif self.posRight.isChecked(): - return RelativeScreenPosition.RIGHT - else: - return RelativeScreenPosition.EXTERNAL_ONLY + def __init__(self, internalResolutions, externalResolutions): + # set up main window + super(PositionSelection, self).__init__() + self.setWindowTitle('DSL - easy Display Setup for Laptops') + + # position selection + posBox = QtGui.QGroupBox('Position of external screen', self) + self.posLeft = QtGui.QRadioButton('Left of internal screen', posBox) + self.posRight = QtGui.QRadioButton('Right of internal screen', posBox) + self.posRight.setChecked(True) + self.posRight.setFocus() + self.extOnly = QtGui.QRadioButton('Use external screen exclusively', posBox) + posBox.setLayout(makeLayout(QtGui.QVBoxLayout(), [self.posLeft, self.posRight, self.extOnly])) + + # primary screen + primBox = QtGui.QGroupBox('Which should be the primary screen?', self) + self.extOnly.toggled.connect(primBox.setDisabled) # disable the box if there's just one screen in use + self.primExt = QtGui.QRadioButton('The external screen', primBox) + self.primInt = QtGui.QRadioButton('The internal screen', primBox) + self.primInt.setChecked(True) + primBox.setLayout(makeLayout(QtGui.QVBoxLayout(), [self.primExt, self.primInt])) + + # resolution selection + resBox = QtGui.QGroupBox('Screen resolutions', self) + extResLabel = QtGui.QLabel('Resolution of external screen:', resBox) + self.extResolutions = externalResolutions + self.extResolutionsBox = QtGui.QComboBox(resBox) + for res in externalResolutions: + self.extResolutionsBox.addItem(res2user(res)) + self.extResolutionsBox.setCurrentIndex(0) # select first resolution + extRow = makeLayout(QtGui.QHBoxLayout(), [extResLabel, self.extResolutionsBox]) + intResLabel = QtGui.QLabel('Resolution of internal screen:', resBox) + self.extOnly.toggled.connect(intResLabel.setDisabled) # disable the label if there's just one screen in use + self.intResolutions = internalResolutions + self.intResolutionsBox = QtGui.QComboBox(resBox) + for res in internalResolutions: + self.intResolutionsBox.addItem(res2user(res)) + self.intResolutionsBox.setCurrentIndex(0) # select first resolution + self.extOnly.toggled.connect(self.intResolutionsBox.setDisabled) # disable the box if there's just one screen in use + intRow = makeLayout(QtGui.QHBoxLayout(), [intResLabel, self.intResolutionsBox]) + resBox.setLayout(makeLayout(QtGui.QVBoxLayout(), [extRow, intRow])) + + # last row: buttons + buttons = QtGui.QDialogButtonBox(QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Cancel, QtCore.Qt.Horizontal, self) + buttons.accepted.connect(self.accept) + buttons.rejected.connect(self.reject) + + # add them all to the window + self.setLayout(makeLayout(QtGui.QVBoxLayout(), [posBox, primBox, resBox, buttons])) + + def run(self): + self.exec_() + if not self.result(): return None + return ScreenSetup(self.getRelativeScreenPosition(), + self.intResolutions[self.intResolutionsBox.currentIndex()], + self.extResolutions[self.extResolutionsBox.currentIndex()], + self.primExt.isChecked()) + + def getRelativeScreenPosition(self): + if self.posLeft.isChecked(): + return RelativeScreenPosition.LEFT + elif self.posRight.isChecked(): + return RelativeScreenPosition.RIGHT + else: + return RelativeScreenPosition.EXTERNAL_ONLY diff --git a/zenity_dialogue.py b/zenity_dialogue.py index 75011f8..93213e9 100644 --- a/zenity_dialogue.py +++ b/zenity_dialogue.py @@ -18,22 +18,22 @@ from dsl import RelativeScreenPosition, ScreenSetup, res2user, processOutputIt def userChoose (title, choices, returns, fallback): - assert len(choices) == len(returns) - args = ["zenity", "--list", "--text="+title, "--column="]+choices - switch = dict (list(zip (choices,returns))) - for line in processOutputIt(*args): - return switch.get(line.strip(), fallback) - return fallback + assert len(choices) == len(returns) + args = ["zenity", "--list", "--text="+title, "--column="]+choices + switch = dict (list(zip (choices,returns))) + for line in processOutputIt(*args): + return switch.get(line.strip(), fallback) + return fallback def run (internalResolutions, externalResolutions): - relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen", "Use external screen only"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT, RelativeScreenPosition.EXTERNAL_ONLY], None) - if relpos == None: - return None - intres = internalResolutions[0] - if relpos != RelativeScreenPosition.EXTERNAL_ONLY: - intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, internalResolutions[0]) - extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, externalResolutions[0]) - extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None) - if extprim == None: - return None - return ScreenSetup(relpos,intres,extres,extprim) + relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen", "Use external screen only"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT, RelativeScreenPosition.EXTERNAL_ONLY], None) + if relpos == None: + return None + intres = internalResolutions[0] + if relpos != RelativeScreenPosition.EXTERNAL_ONLY: + intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, internalResolutions[0]) + extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, externalResolutions[0]) + extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None) + if extprim == None: + return None + return ScreenSetup(relpos,intres,extres,extprim)