Added cmd-line support for switching uis

3 files changed, 22 insertions, 9 deletions

diff --git a/portato.py b/portato.py
index 810dd67..1f77354 100755
--- a/portato.py
+++ b/portato.py
@@ -16,15 +16,27 @@ from portato.constants import VERSION
 import sys
 
 if __name__ == "__main__":
-	if len(sys.argv) > 1 and sys.argv[1] in ("--help","--version","-h","-v"):
-		print """Portato %s
+	
+	uimod = "gtk"
+
+	if len(sys.argv) > 1:
+		if sys.argv[1] in ("--help","--version","-h","-v"):
+			print """Portato %s
 Copyright (C) 2006-2007 René 'Necoro' Neumann
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by René 'Necoro' Neumann <necoro@necoro.net>""" % VERSION
+		else:
+			uimod = sys.argv[1]
+	
+	if uimod == "gtk":
+		from portato.gui.gtk import run
+	elif uimod == "curses":
+		from portato.gui.curses import run
 	else:
-		from portato.gui import MainWindow
-		m = MainWindow()
-		m.main()
+		print "Unknown interface %s. Correct interfaces are: gtk, curses" % uimod
+		sys.exit(1)
+	
+	run()
diff --git a/portato/gui/__init__.py b/portato/gui/__init__.py
index 6248ece..6df684c 100644
--- a/portato/gui/__init__.py
+++ b/portato/gui/__init__.py
@@ -3,12 +3,9 @@
 # File: portato/gui/__init__.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2006 René 'Necoro' Neumann
+# Copyright (C) 2006-2007 René 'Necoro' Neumann
 # This is free software.  You may redistribute copies of it under the terms of
 # the GNU General Public License version 2.
 # There is NO WARRANTY, to the extent permitted by law.
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
-
-import gtk
-from gtk import *
diff --git a/portato/gui/gtk/__init__.py b/portato/gui/gtk/__init__.py
index 85938b4..5e164db 100644
--- a/portato/gui/gtk/__init__.py
+++ b/portato/gui/gtk/__init__.py
@@ -11,3 +11,7 @@
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
 from windows import MainWindow
+
+def run ():
+	m = MainWindow()
+	m.main()