[kupfer] Create kupfer.ui subpackage for Kupfer's user interface

[Ulrik Sverdrup <usverdrup src gnome org>]

commit eac88f548f35981f0b4b98f6d083ee539a91c5e9
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Thu Jan 7 18:02:43 2010 +0100

    Create kupfer.ui subpackage for Kupfer's user interface

 kupfer/kupferui.py             |    4 ++--
 kupfer/launch.py               |    2 +-
 kupfer/main.py                 |    3 ++-
 kupfer/plugin/triggers.py      |    4 ++--
 kupfer/{ => ui}/browser.py     |    7 ++++---
 kupfer/{ => ui}/keybindings.py |    0
 kupfer/{ => ui}/listen.py      |    0
 kupfer/{ => ui}/preferences.py |    4 ++--
 kupfer/{ => ui}/session.py     |    0
 9 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/kupfer/kupferui.py b/kupfer/kupferui.py
index cc391d7..ca2f53b 100644
--- a/kupfer/kupferui.py
+++ b/kupfer/kupferui.py
@@ -48,11 +48,11 @@ def _response_callback(dialog, response_id):
 
 
 def show_preferences():
-	from kupfer import preferences
+	from kupfer.ui import preferences
 	win = preferences.GetPreferencesWindowController()
 	win.show()
 
 def show_plugin_info(plugin_id):
-	from kupfer import preferences
+	from kupfer.ui import preferences
 	prefs = preferences.GetPreferencesWindowController()
 	prefs.show_focus_plugin(plugin_id)
diff --git a/kupfer/launch.py b/kupfer/launch.py
index 167a90e..2f71c3b 100644
--- a/kupfer/launch.py
+++ b/kupfer/launch.py
@@ -7,7 +7,7 @@ import gobject
 
 from kupfer import pretty, config
 from kupfer import scheduler
-from kupfer import keybindings
+from kupfer.ui import keybindings
 
 try:
 	import wnck
diff --git a/kupfer/main.py b/kupfer/main.py
index 6c57150..9aa48dc 100644
--- a/kupfer/main.py
+++ b/kupfer/main.py
@@ -134,7 +134,8 @@ def main():
 	cli_opts = get_options()
 	print_banner()
 
-	from kupfer import browser, pretty
+	from kupfer.ui import browser
+	from kupfer import pretty
 
 	if _debug:
 		pretty.debug = _debug
diff --git a/kupfer/plugin/triggers.py b/kupfer/plugin/triggers.py
index e3bd5a3..338599c 100644
--- a/kupfer/plugin/triggers.py
+++ b/kupfer/plugin/triggers.py
@@ -1,12 +1,12 @@
 import gtk
 
 
-from kupfer import keybindings
-
 from kupfer.objects import Leaf, Action, Source, TextSource
 from kupfer.objects import ComposedLeaf, TextLeaf, RunnableLeaf
 from kupfer import puid
 
+from kupfer.ui import keybindings
+
 __kupfer_name__ = _("Triggers")
 __kupfer_sources__ = ("Triggers", )
 __kupfer_actions__ = (
diff --git a/kupfer/ui/__init__.py b/kupfer/ui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kupfer/browser.py b/kupfer/ui/browser.py
similarity index 99%
rename from kupfer/browser.py
rename to kupfer/ui/browser.py
index a370e5b..5d47021 100644
--- a/kupfer/browser.py
+++ b/kupfer/ui/browser.py
@@ -12,11 +12,12 @@ import gtk
 import gio
 import gobject
 
-from kupfer import listen, scheduler
+from kupfer import scheduler
+from kupfer.ui  import listen
+from kupfer.ui import keybindings
 from kupfer.core import data, relevance, learn
 from kupfer import icons
 from kupfer import interface
-from kupfer import keybindings
 from kupfer import pretty
 
 
@@ -1484,7 +1485,7 @@ class WindowController (pretty.OutputMixin):
 		callbacks etc).
 		"""
 		import signal
-		from kupfer import session
+		from kupfer.ui import session
 		from kupfer.core import settings
 
 		self.output_debug("in lazy_setup")
diff --git a/kupfer/keybindings.py b/kupfer/ui/keybindings.py
similarity index 100%
rename from kupfer/keybindings.py
rename to kupfer/ui/keybindings.py
diff --git a/kupfer/listen.py b/kupfer/ui/listen.py
similarity index 100%
rename from kupfer/listen.py
rename to kupfer/ui/listen.py
diff --git a/kupfer/preferences.py b/kupfer/ui/preferences.py
similarity index 99%
rename from kupfer/preferences.py
rename to kupfer/ui/preferences.py
index 1f0f1b2..b9536b9 100644
--- a/kupfer/preferences.py
+++ b/kupfer/ui/preferences.py
@@ -9,9 +9,9 @@ from xdg import BaseDirectory as base
 from xdg import DesktopEntry as desktop
 
 
-from kupfer import config, pretty, utils, icons
+from kupfer import config, pretty, utils, icons, version
 from kupfer.core import settings, plugins
-from kupfer import keybindings, version
+from kupfer.ui import keybindings
 
 class PreferencesWindowController (pretty.OutputMixin):
 	def __init__(self):
diff --git a/kupfer/session.py b/kupfer/ui/session.py
similarity index 100%
rename from kupfer/session.py
rename to kupfer/ui/session.py