21 files changed, 79 insertions, 134 deletions
diff --git a/portato.py b/portato.py
index fd1d541..866dd49 100755
--- a/portato.py
+++ b/portato.py
@@ -5,7 +5,7 @@
 # File: portato.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2006-2007 René 'Necoro' Neumann
+# Copyright (C) 2006-2008 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.
@@ -19,10 +19,7 @@ import gettext, locale
 from optparse import OptionParser, SUPPRESS_HELP
 
 from portato import get_listener
-from portato.constants import VERSION, FRONTENDS, STD_FRONTEND, XSD_LOCATION, LOCALE_DIR, APP, SU_COMMAND
-
-def get_frontend_list ():
-	return ", ".join(["'%s'" % x for x in FRONTENDS])
+from portato.constants import VERSION, XSD_LOCATION, LOCALE_DIR, APP, SU_COMMAND
 
 def main ():
 	# set gettext stuff
@@ -38,9 +35,6 @@ def main ():
 
 	parser = OptionParser(version = vers, prog = "Portato", description = desc, usage = usage)
 	
-	parser.add_option("-f", "--frontend", action = "store", choices = FRONTENDS, default = STD_FRONTEND, dest = "frontend",
-			help = _("the frontend to use - possible values are: %s [default: %%default]") % get_frontend_list())
-
 	parser.add_option("--shm", action = "store", nargs = 3, type="long", dest = "shm",
 			help = SUPPRESS_HELP)
 
@@ -53,20 +47,6 @@ def main ():
 	# run parser
 	(options, args) = parser.parse_args()
 
-	if len(args): # additional arguments overwrite given frontend
-		arg = args[0]
-		if arg not in FRONTENDS:
-			print _("Unknown frontend '%(frontend)s'. Correct frontends are: %(list)s") % {"frontend": arg, "list": get_frontend_list()}
-			sys.exit(2)
-		else:
-			options.frontend = arg
-
-	try:
-		exec ("from portato.gui.%s import run" % options.frontend)
-	except ImportError, e:
-		print _("'%(frontend)s' should be installed, but cannot be imported. This is definitely a bug. (%(error)s)") % {"frontend": options.frontend, "error": e[0]}
-		sys.exit(1)
-
 	if options.validate: # validate a plugin
 		from lxml import etree
 		try:
@@ -80,8 +60,10 @@ def main ():
 		else:
 			print _("Validation succeeded.")
 			return
-
+	
 	elif options.nofork or os.getuid() == 0: # start GUI
+		from portato.gui import run
+		
 		if options.shm:
 			get_listener().set_send(*options.shm)
 		else:
@@ -100,15 +82,11 @@ def main ():
 		sig = shm.create_semaphore(InitialValue = 0, permissions = 0600)
 		rw = shm.create_semaphore(InitialValue = 1, permissions = 0600)
 		
-		additional = []
-		if options.frontend:
-			additional.extend(["--frontend", options.frontend])
-
 		# set DBUS_SESSION_BUS_ADDRESS to "" to make dbus work as root ;)
 		env = os.environ.copy()
 		env.update(DBUS_SESSION_BUS_ADDRESS="")
 		cmd = SU_COMMAND.split()
-		subprocess.Popen(cmd+["%s --no-fork --shm %ld %ld %ld %s" % (sys.argv[0], mem.key, sig.key, rw.key, " ".join(additional))], env = env)
+		subprocess.Popen(cmd+["%s --no-fork --shm %ld %ld %ld" % (sys.argv[0], mem.key, sig.key, rw.key)], env = env)
 		
 		get_listener().set_recv(mem, sig, rw)
 
diff --git a/portato/constants.py b/portato/constants.py
index 2059315..1257256 100644
--- a/portato/constants.py
+++ b/portato/constants.py
@@ -25,11 +25,6 @@ These should be set during the installation.
 @var USE_CATAPULT: use the catapult backend or the normal ones
 @type USE_CATAPULT: boolean
 
-@var FRONTENDS: the list of frontends which are installed
-@type FRONTENDS: string[]
-@var STD_FRONTEND: the frontend uses as the default, i.e. if no other one is given on the cmdline
-@type STD_FRONTEND: string
-
 @var CONFIG_DIR: The configuration directory.
 @type CONFIG_DIR: string
 @var CONFIG_LOCATION: L{CONFIG_DIR} plus name of the config file.
@@ -67,10 +62,6 @@ HOME = os.environ["HOME"]
 SU_COMMAND = "gksu -D 'Portato'"
 USE_CATAPULT = True
 
-# frontends
-FRONTENDS = ["gtk"]
-STD_FRONTEND = "gtk"
-
 # config
 CONFIG_DIR = "/etc/portato/"
 CONFIG_LOCATION = pjoin(CONFIG_DIR, "portato.cfg")
diff --git a/portato/gui/__init__.py b/portato/gui/__init__.py
index 6df684c..1349e00 100644
--- a/portato/gui/__init__.py
+++ b/portato/gui/__init__.py
@@ -3,9 +3,30 @@
 # File: portato/gui/__init__.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2006-2007 René 'Necoro' Neumann
+# Copyright (C) 2006-2008 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>
+
+from __future__ import absolute_import
+
+from ..helper import _
+from .. import get_listener
+from .exception_handling import register_ex_handler
+
+def run ():
+	from .windows.splash import SplashScreen
+	try:
+		s = SplashScreen(_("Loading Portage"))
+		register_ex_handler()
+		s.show()
+		from .windows.main import MainWindow
+		m = MainWindow(s)
+		s.hide()
+		m.main()
+	except KeyboardInterrupt:
+		pass
+
+	get_listener().close()
diff --git a/portato/gui/gtk/dialogs.py b/portato/gui/dialogs.py
index c26835c..1beb6be 100644
--- a/portato/gui/gtk/dialogs.py
+++ b/portato/gui/dialogs.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/dialogs.py
+# File: portato/gui/dialogs.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2006 René 'Necoro' Neumann
+# Copyright (C) 2006-2008 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.
@@ -11,8 +11,7 @@
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
 import gtk
-from ...helper import error
-from gettext import lgettext as _
+from ..helper import _, error
 
 def queue_not_empty_dialog():
 	dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_NONE, _("There are some packages in the emerge queue and/or an emerge process is running.\nDo you really want to quit?"))
diff --git a/portato/gui/gtk/exception_handling.py b/portato/gui/exception_handling.py
index c44f554..db0cab9 100644
--- a/portato/gui/gtk/exception_handling.py
+++ b/portato/gui/exception_handling.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/exception_handling.py
+# File: portato/gui/exception_handling.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2007 René 'Necoro' Neumann
+# Copyright (C) 2007-2008 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.
@@ -17,10 +17,9 @@ import gtk, pango, gobject
 import sys, traceback
 
 from threading import Thread
-from gettext import lgettext as _
 from StringIO import StringIO
 
-from ...helper import debug, error
+from ..helper import _, debug, error
 from .dialogs import file_chooser_dialog, io_ex_dialog
 
 class GtkThread (Thread):
diff --git a/portato/gui/gtk/__init__.py b/portato/gui/gtk/__init__.py
deleted file mode 100644
index 9a5338b..0000000
--- a/portato/gui/gtk/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# File: portato/gui/gtk/__init__.py
-# This file is part of the Portato-Project, a graphical portage-frontend.
-#
-# 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>
-
-from __future__ import absolute_import
-
-from gettext import lgettext as _
-
-from ... import get_listener
-from .exception_handling import register_ex_handler
-
-def run ():
-	from .splash import SplashScreen
-	try:
-		s = SplashScreen(_("Loading Portage"))
-		register_ex_handler()
-		s.show()
-		from .windows import MainWindow
-		m = MainWindow(s)
-		s.hide()
-		m.main()
-	except KeyboardInterrupt:
-		pass
-
-	get_listener().close()
diff --git a/portato/gui/queue.py b/portato/gui/queue.py
index cfd0581..40b765d 100644
--- a/portato/gui/queue.py
+++ b/portato/gui/queue.py
@@ -25,7 +25,7 @@ from ..waiting_queue import WaitingQueue
 from .updater import Updater
 
 # the wrapper
-from .gtk.wrapper import GtkConsole, GtkTree
+from .wrapper import GtkConsole, GtkTree
 
 class EmergeQueue:
 	"""This class manages the emerge queue."""
diff --git a/portato/gui/gtk/session.py b/portato/gui/session.py
index 5d6c607..e356fbd 100644
--- a/portato/gui/gtk/session.py
+++ b/portato/gui/session.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/session.py
+# File: portato/gui/session.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -10,7 +10,7 @@
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
-from ...helper import debug, _
+from ..helper import _, debug
 
 # the current version for saved sessions
 # change this, whenever the change is incompatible with previous versions
diff --git a/portato/gui/updater.py b/portato/gui/updater.py
index c21f547..d6087ee 100644
--- a/portato/gui/updater.py
+++ b/portato/gui/updater.py
@@ -14,9 +14,8 @@ from __future__ import absolute_import
 
 from ..backend import system
 
-from gettext import lgettext as _
 import threading, subprocess, time
-from ..helper import debug, error
+from ..helper import _, debug, error
 
 class Updater (object):
 	"""
diff --git a/portato/gui/gtk/views.py b/portato/gui/views.py
index d341c10..b069aae 100644
--- a/portato/gui/gtk/views.py
+++ b/portato/gui/views.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/views.py
+# File: portato/gui/views.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2006-2007 René 'Necoro' Neumann
+# Copyright (C) 2006-2008 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.
@@ -12,13 +12,12 @@
 
 from __future__ import absolute_import, with_statement
 
+import gtk
 import pango
 import gtksourceview2
-import gtk
 import logging
 
-from gettext import lgettext as _
-from ...helper import warning
+from ..helper import _, warning
 
 class LazyView (object):
 	def __init__ (self):
diff --git a/portato/gui/gtk/windows/__init__.py b/portato/gui/windows/__init__.py
index 0107937..394e84e 100644
--- a/portato/gui/gtk/windows/__init__.py
+++ b/portato/gui/windows/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/__init__.py
+# File: portato/gui/gtk/__init__.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -9,7 +9,3 @@
 # There is NO WARRANTY, to the extent permitted by law.
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
-
-from __future__ import absolute_import
-
-from .main import MainWindow
diff --git a/portato/gui/gtk/windows/about.py b/portato/gui/windows/about.py
index d9297d0..df724f3 100644
--- a/portato/gui/gtk/windows/about.py
+++ b/portato/gui/windows/about.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/about.py
+# File: portato/gui/windows/about.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -15,7 +15,7 @@ from __future__ import absolute_import
 import gtk
 
 from .basic import AbstractDialog
-from ....constants import VERSION, APP_ICON
+from ...constants import VERSION, APP_ICON
 
 class AboutWindow (AbstractDialog):
 	"""A window showing the "about"-informations."""
diff --git a/portato/gui/gtk/windows/basic.py b/portato/gui/windows/basic.py
index e202ac9..101b7ae 100644
--- a/portato/gui/gtk/windows/basic.py
+++ b/portato/gui/windows/basic.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/basic.py
+# File: portato/gui/windows/basic.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2006-2007 René 'Necoro' Neumann
+# Copyright (C) 2006-2008 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.
@@ -20,7 +20,7 @@ import gobject
 from functools import wraps
 import os.path
 
-from ....constants import TEMPLATE_DIR, APP_ICON, APP, LOCALE_DIR
+from ...constants import TEMPLATE_DIR, APP_ICON, APP, LOCALE_DIR
 
 gtk.glade.bindtextdomain (APP, LOCALE_DIR)
 gtk.glade.textdomain (APP)
diff --git a/portato/gui/gtk/windows/main.py b/portato/gui/windows/main.py
index 0f25572..2dbecde 100644
--- a/portato/gui/gtk/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/main.py
+# File: portato/gui/windows/main.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2006-2008 René 'Necoro' Neumann
@@ -21,16 +21,16 @@ import os.path
 import itertools as itt
 
 # our backend stuff
-from ....backend import flags, system # must be the first to avoid circular deps
-from .... import get_listener, plugin, dependency
-from ....helper import debug, warning, error, info, unique_array, N_, _
-from ....session import Session
-from ....constants import CONFIG_LOCATION, VERSION, APP_ICON
-from ....backend.exceptions import PackageNotFoundException, BlockedException
+from ...backend import flags, system # must be the first to avoid circular deps
+from ... import get_listener, plugin, dependency
+from ...helper import debug, warning, error, info, unique_array, N_, _
+from ...session import Session
+from ...constants import CONFIG_LOCATION, VERSION, APP_ICON
+from ...backend.exceptions import PackageNotFoundException, BlockedException
 
 # more GUI stuff
-from ...utils import Database, Config
-from ...queue import EmergeQueue
+from ..utils import Database, Config
+from ..queue import EmergeQueue
 from ..session import SESSION_VERSION, SessionException, OldSessionException, NewSessionException
 from ..wrapper import GtkTree, GtkConsole
 from ..exception_handling import GtkThread
diff --git a/portato/gui/gtk/windows/plugin.py b/portato/gui/windows/plugin.py
index 6bb4db5..672bff5 100644
--- a/portato/gui/gtk/windows/plugin.py
+++ b/portato/gui/windows/plugin.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/plugin.py
+# File: portato/gui/windows/plugin.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -15,7 +15,7 @@ from __future__ import absolute_import
 import gtk
 
 from .basic import AbstractDialog
-from ....helper import debug, _
+from ...helper import _, debug
 
 class PluginWindow (AbstractDialog):
 	
diff --git a/portato/gui/gtk/windows/preference.py b/portato/gui/windows/preference.py
index aa5aea8..04cd329 100644
--- a/portato/gui/gtk/windows/preference.py
+++ b/portato/gui/windows/preference.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/preference.py
+# File: portato/gui/windows/preference.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -16,7 +16,7 @@ import gtk
 
 from .basic import AbstractDialog
 from ..dialogs import io_ex_dialog
-from ....helper import _, debug
+from ...helper import _, debug
 
 class PreferenceWindow (AbstractDialog):
 	"""Window displaying some preferences."""
diff --git a/portato/gui/gtk/windows/search.py b/portato/gui/windows/search.py
index 4b1f3ae..6e34a0e 100644
--- a/portato/gui/gtk/windows/search.py
+++ b/portato/gui/windows/search.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/search.py
+# File: portato/gui/windows/search.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -14,7 +14,7 @@ from __future__ import absolute_import
 
 import gtk
 from .basic import AbstractDialog
-from ....helper import _, debug
+from ...helper import _, debug
 
 class SearchWindow (AbstractDialog):
 	"""A window showing the results of a search process."""
diff --git a/portato/gui/gtk/splash.py b/portato/gui/windows/splash.py
index 48f8061..52c2543 100644
--- a/portato/gui/gtk/splash.py
+++ b/portato/gui/windows/splash.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/splash.py
+# File: portato/gui/windows/splash.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
-# Copyright (C) 2007 René 'Necoro' Neumann
+# Copyright (C) 2007-2008 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.
@@ -13,10 +13,10 @@
 from __future__ import absolute_import
 
 import gtk
-from gettext import lgettext as _
 
+from .basic import Window
+from ...helper import _
 from ...constants import VERSION, APP_ICON
-from .windows.basic import Window
 
 class SplashScreen (Window):
 	
diff --git a/portato/gui/gtk/windows/update.py b/portato/gui/windows/update.py
index a068315..8e4fad1 100644
--- a/portato/gui/gtk/windows/update.py
+++ b/portato/gui/windows/update.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/windows/update.py
+# File: portato/gui/windows/update.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2008 René 'Necoro' Neumann
@@ -15,9 +15,9 @@ from __future__ import absolute_import
 import gtk
 from .basic import AbstractDialog
 from ..dialogs import unmask_dialog, blocked_dialog
-from ....backend import system
-from ....backend.exceptions import PackageNotFoundException, BlockedException
-from ....helper import debug, _
+from ...backend import system
+from ...backend.exceptions import PackageNotFoundException, BlockedException
+from ...helper import _, debug
 
 class UpdateWindow (AbstractDialog):
 
diff --git a/portato/gui/gtk/wrapper.py b/portato/gui/wrapper.py
index ffc3c3b..8be3b6a 100644
--- a/portato/gui/gtk/wrapper.py
+++ b/portato/gui/wrapper.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# File: portato/gui/gtk/wrapper.py
+# File: portato/gui/wrapper.py
 # This file is part of the Portato-Project, a graphical portage-frontend.
 #
 # Copyright (C) 2006-2008 René 'Necoro' Neumann
@@ -13,9 +13,7 @@
 from __future__ import absolute_import
 
 import vte
-from gettext import lgettext as _
-from ..wrapper import Tree, Console
-from ...helper import debug
+from ..helper import _,debug
 
 class GtkTree (object):
 	"""The implementation of the abstract tree."""
diff --git a/setup.py b/setup.py
index c595cd9..c8fe3e6 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 
 import sys, os, os.path
 from distutils.core import setup, Extension
-from portato.constants import FRONTENDS, VERSION, DATA_DIR, ICON_DIR, PLUGIN_DIR, TEMPLATE_DIR
+from portato.constants import VERSION, DATA_DIR, ICON_DIR, PLUGIN_DIR, TEMPLATE_DIR
 
 ### copied from shm's setup.py ###
 
@@ -122,23 +122,21 @@ def plugin_list (*args):
 	"""Creates a list of correct plugin pathes out of the arguments."""
 	return [("plugins/%s.xml" % x) for x in args]
 
-packages = ["portato", "portato.gui", "portato.plugins", "portato.backend", "portato.backend.portage", "portato.backend.catapult", "portato._shm"]
+packages = ["portato", "portato.gui", "portato.gui.windows", "portato.plugins", "portato.backend", "portato.backend.portage", "portato.backend.catapult", "portato._shm"]
 ext_modules = [Extension("portato._shm.shm", ["_shm/shmmodule.c"], define_macros = MacrosAndDefines, extra_compile_args=["-fPIC"])]
 data_files = [
-		(ICON_DIR, ["icons/portato-icon.png"]), 
+		(TEMPLATE_DIR, [os.path.join("portato/gui/templates",x) for x in os.listdir("portato/gui/templates") if x.endswith(".glade")]),
+		(ICON_DIR, ["icons/portato-icon.png"]),
 		#(PLUGIN_DIR, plugin_list("shutdown", "resume_loop")), 
 		(DATA_DIR, ["plugin.xsd"])]
+
 cmdclass = {}
 package_dir = {"portato._shm" : "_shm"}
 
-if "gtk" in FRONTENDS:
-	packages.append("portato.gui.gtk")
-	data_files.append((TEMPLATE_DIR, [os.path.join("portato/gui/templates",x) for x in os.listdir("portato/gui/templates") if x.endswith(".glade")]))
-
 # do the distutils setup
 setup(name="Portato",
 		version = VERSION,
-		description = "Frontends to Portage",
+		description = "GTK-Frontend to Portage",
 		license = "GPLv2",
 		url = "http://portato.origo.ethz.ch/",
 		author = "René 'Necoro' Neumann",