tab -> whitespace

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 8cba4d9dff7b7dc351308b362c9baacc3e4c3a60..93213e9af1a0fc00003aaba46d205275e90e56e1 100644 (file)
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -12,32 +12,28 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License

-# along with this program (gpl.txt); if not, write to the Free Software
+# along with this program; if not, write to the Free Software

 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # 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):
-       assert len(choices) == len(returns)
-       p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)
-       switch = zip (choices,returns)
-       for line in p.stdout:
-               return switch.get(line, None)
+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

 
 def run (internalResolutions, externalResolutions):
 
 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])
-       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])
-       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)