X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/191bb9843e48154f8c616a9b81f49cc4c3b4f13d..41c87e2c4099296550511b3752358e7417e62877:/zenity_dialogue.py?ds=inline diff --git a/zenity_dialogue.py b/zenity_dialogue.py index 33f3177..2d523fe 100644 --- a/zenity_dialogue.py +++ b/zenity_dialogue.py @@ -18,26 +18,23 @@ import subprocess from dsl import RelativeScreenPosition, ScreenSetup, res2user -def userChoose (title, choices, returns): +def userChoose (title, choices, returns, fallback): assert len(choices) == len(returns) p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE) switch = dict (zip (choices,returns)) for line in p.stdout: - return switch.get(line.strip(), None) + 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]) + 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", map(res2user,internalResolutions), internalResolutions) - if intres == None: - return None - extres = userChoose ("external display resolution", map(res2user,externalResolutions), externalResolutions) - if extres == None: - return None - extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True]) + intres = userChoose ("internal display resolution", map(res2user,internalResolutions), internalResolutions, internalResolutions[0]) + extres = userChoose ("external display resolution", 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)