updated zenity frontend, added cli frontend

[lilass.git] / gui.py

diff --git a/gui.py b/gui.py
index 50cb3a3d6377c7ce4bed77040fe79099ac08aca4..d586442711a4a27cf45fb331b78cdeacf0a104a4 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -1,5 +1,5 @@
 # DSL - easy Display Setup for Laptops
 # DSL - easy Display Setup for Laptops

-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012-2015 Ralf Jung <post@ralfj.de>

 #
 # 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
 #
 # 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


@@ -31,6 +31,9 @@ def setup(internalResolutions, externalResolutions):
 '''
 import subprocess, collections
 
 '''
 import subprocess, collections
 

+from question_frontend import QuestionFrontend
+from screen import processOutputIt
+

 # Qt frontend
 class QtFrontend:
     def __init__(self):
 # Qt frontend
 class QtFrontend:
     def __init__(self):


@@ -42,9 +45,9 @@ class QtFrontend:
         from PyQt4 import QtGui
         QtGui.QMessageBox.critical(None, 'Fatal error', message)
     
         from PyQt4 import QtGui
         QtGui.QMessageBox.critical(None, 'Fatal error', message)
     

-    def setup(self, internalResolutions, externalResolutions, commonRes):
+    def setup(self, situation):

         from qt_dialogue import PositionSelection
         from qt_dialogue import PositionSelection

-        return PositionSelection(internalResolutions, externalResolutions, commonRes).run()
+        return PositionSelection(situation).run()

     
     @staticmethod
     def isAvailable():
     
     @staticmethod
     def isAvailable():


@@ -56,33 +59,57 @@ class QtFrontend:
 
 
 # Zenity frontend
 
 
 # Zenity frontend

-class ZenityFrontend:
-    def error(message):
+class ZenityFrontend(QuestionFrontend):
+    def error(self, message):

         '''Displays a fatal error to the user'''
         subprocess.check_call(["zenity", "--error", "--text="+message])
         '''Displays a fatal error to the user'''
         subprocess.check_call(["zenity", "--error", "--text="+message])

-    
-    def setup(self, internalResolutions, externalResolutions, commonRes):
-        from zenity_dialogue import run
-        run(internalResolutions, externalResolutions)
-    
-    @staticmethod
+    def userChoose (self, 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
+        # if the output was empty
+        return fallback

     def isAvailable():
         try:
     def isAvailable():
         try:

-            from dsl import processOutputIt

             processOutputIt("zenity", "--version")
             return True
             processOutputIt("zenity", "--version")
             return True

-        except Exception:
+        except FileNotFoundError:
+            return False
+        except PermissionError:

             return False
             return False

-

 
 # CLI frontend
 
 # CLI frontend

-class CLIFrontend:
+class CLIFrontend(QuestionFrontend):

     def error(self, message):
         print(message, file=sys.stderr)
     def error(self, message):
         print(message, file=sys.stderr)

-    
-    def setup(self, internalResolutions, externalResolutions, commonRes):
-        raise Exception("Choosing the setup interactively is not supported with the CLI frontend")
-    
+
+    def userChoose (self, title, choices, returns, fallback):
+        while True:
+            # print question
+            print(title)
+            for i in range(len(choices)):
+                print("%d. %s"%(i,choices[i]))
+            print("Enter 'c' to cancel.")
+            # handle input
+            answer = input("> ")
+            if answer == "c":
+                return None
+            #else
+            try:
+                answerint = int(answer)
+                if answerint >= 0 and answerint < len(choices):
+                    return returns[answerint]
+            except ValueError:
+                pass
+            # if we are here something invalid was entered
+            print("INVALID ANSWER: '%s'" % answer)
+

     @staticmethod
     def isAvailable():
         return True
     @staticmethod
     def isAvailable():
         return True


@@ -100,8 +127,10 @@ def getFrontend(name = None):
         if name in frontends:
             if frontends[name].isAvailable():
                 return frontends[name]() # call constructor
         if name in frontends:
             if frontends[name].isAvailable():
                 return frontends[name]() # call constructor

-        # frontend not found or not available
-        raise Exception("Frontend %s not found or not available" % name)
+            else:
+                raise Exception("Frontend %s not available" % name)
+        # frontend not found
+        raise Exception("Frontend %s not found" % name)

     # auto-detect
     for frontend in frontends.values():
         if frontend.isAvailable():
     # auto-detect
     for frontend in frontends.values():
         if frontend.isAvailable():