fixed zenity

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 45cf557a9bea9edbca5b744bee84f094c7f79090..e926b3a0efdd65d4806f5309e92660a208140dce 100644 (file)
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -15,26 +15,38 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import subprocess
-from dsl import RelativeScreenPosition, ScreenSetup, res2user
+from dsl import RelativeScreenPosition, ScreenSetup, res2user, processOutputIt
 
 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(), fallback)
-       return fallback
+    assert len(choices) == len(returns)
+    args = ["zenity", "--list", "--text="+title, "--column="]+choices
+    switch = dict (list(zip (choices,returns)))
+    try:
+        for line in processOutputIt(*args):
+            return switch.get(line.strip(), fallback)
+    except Exception:
+        # on user cancel, the return code of zenity is nonzero
+        return 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", 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)
+    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]
+    extres = externalResolutions[0]
+    extprim = None
+    if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
+        intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, None)
+        if intres == None:
+            return None
+    else:
+        extprim = True
+    extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, None)
+    if extres == None:
+        return None
+    if extprim == None:
+        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)