X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/41c87e2c4099296550511b3752358e7417e62877..7129adf1f29ada89d37adf131dbab8d3c5483408:/zenity_dialogue.py?ds=inline

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 2d523fe..93213e9 100644
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -12,29 +12,28 @@
 # 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.
 
-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)))
+    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", 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]
+    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)