From 595f29d26b5246a1ab1f19fa3f7543d745c414a4 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 9 Mar 2015 10:56:04 +0100 Subject: [PATCH] fix the zenity backend to work. it doesn't provide all the possible functionality though. --- gui.py | 2 +- zenity_dialogue.py | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gui.py b/gui.py index c1f045d..998783f 100644 --- a/gui.py +++ b/gui.py @@ -68,7 +68,7 @@ class ZenityFrontend: @staticmethod def isAvailable(): try: - from dsl import processOutputIt + from screen import processOutputIt processOutputIt("zenity", "--version") return True except Exception: diff --git a/zenity_dialogue.py b/zenity_dialogue.py index b5e72d0..7dbbc87 100644 --- a/zenity_dialogue.py +++ b/zenity_dialogue.py @@ -31,18 +31,12 @@ def userChoose (title, choices, returns, 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) + relpos = userChoose ("Position of external screen", ["Left of internal screen", "Right of internal screen"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT], None) if relpos == None: return None intres = internalResolutions[0] extres = externalResolutions[0] - extprim = None - if relpos != RelativeScreenPosition.EXTERNAL_ONLY: - intres = userChoose ("internal display resolution", list(map(str,internalResolutions)), internalResolutions, None) - if intres == None: - return None - else: - extprim = True + extprim = True extres = userChoose ("external display resolution", list(map(str,externalResolutions)), externalResolutions, None) if extres == None: return None @@ -50,4 +44,4 @@ def run (internalResolutions, externalResolutions): extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None) if extprim == None: return None - return ScreenSetup(intres,extres,relpos,extprim) + return ScreenSetup(intres, extres, relpos, extIsPrimary = extprim) -- 2.30.2