9 files changed, 29 insertions, 33 deletions
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):