updated zenity frontend, added cli frontend

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
deleted file mode 100644 (file)
index 7dbbc87..0000000
--- a/zenity_dialogue.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# DSL - easy Display Setup for Laptops
-# Copyright (C) 2012      Ralf Jung <post@ralfj.de>
-# Copyright (C) 2012-2015 Constantin Berhard<constantin@exxxtremesys.lu>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-from screen import RelativeScreenPosition, ScreenSetup, processOutputIt
-
-def userChoose (title, choices, returns, 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"], [RelativeScreenPosition.LEFT, RelativeScreenPosition.RIGHT], None)
-    if relpos == None:
-        return None
-    intres = internalResolutions[0]
-    extres = externalResolutions[0]
-    extprim = True
-    extres = userChoose ("external display resolution", list(map(str,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(intres, extres, relpos, extIsPrimary = extprim)