Add support for the deluge-gtk start script

deluge/ui/gtkui/__init__.py

@@ -0,0 +1 @@
+from gtkui import start

deluge/ui/gtkui/aboutdialog.py

@@ -40,7 +40,7 @@ import gtk
 import pkg_resources
 
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 
 class AboutDialog:
     def __init__(self):

deluge/ui/gtkui/addtorrentdialog.py

@@ -46,7 +46,7 @@ import pkg_resources
 
 from deluge.ui.client import client
 import deluge.component as component
-import deluge.ui.gtkui.listview as listview
+import listview
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
 import deluge.common

deluge/ui/gtkui/connectionmanager.py

@@ -42,7 +42,7 @@ from twisted.internet import reactor
 
 import deluge.component as component
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 import deluge.configmanager
 from deluge.ui.client import client
 import deluge.ui.client

deluge/ui/gtkui/createtorrentdialog.py

@@ -41,7 +41,7 @@ import gobject
 import base64
 
 from deluge.ui.client import client
-import deluge.ui.gtkui.listview as listview
+import listview
 import deluge.component as component
 import deluge.common
 from deluge.configmanager import ConfigManager

deluge/ui/gtkui/edittrackersdialog.py

@@ -38,7 +38,7 @@ import gtk, gtk.glade
 import pkg_resources
 
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 from deluge.ui.client import client
 import deluge.component as component
 from deluge.log import LOG as log

deluge/ui/gtkui/gtkui.py

@@ -71,6 +71,23 @@ import deluge.configmanager
 import deluge.common
 import deluge.error
 
+from deluge.ui.ui import _UI
+
+class Gtk(_UI):
+
+    help = """Starts the Deluge GTK+ interface"""
+
+    def __init__(self):
+        super(Gtk, self).__init__("gtk")
+
+    def start(self):
+        super(Gtk, self).start()
+
+        GtkUI(self.args)
+
+def start():
+    Gtk().start()
+
 DEFAULT_PREFS = {
     "classic_mode": True,
     "interactive_add": True,
@@ -122,7 +139,7 @@ DEFAULT_PREFS = {
     "show_rate_in_title": False
 }
 
-class GtkUI:
+class GtkUI(object):
     def __init__(self, args):
 
         # Initialize gettext

deluge/ui/gtkui/mainwindow.py

@@ -48,7 +48,7 @@ from deluge.configmanager import ConfigManager
 from deluge.ui.gtkui.ipcinterface import process_args
 
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 
 from deluge.log import LOG as log
 

deluge/ui/gtkui/menubar.py

@@ -43,7 +43,7 @@ import deluge.error
 import deluge.component as component
 from deluge.ui.client import client
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 from deluge.configmanager import ConfigManager
 
 from deluge.log import LOG as log

deluge/ui/gtkui/notification.py

@@ -36,7 +36,7 @@
 
 import deluge.component as component
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 from deluge.log import LOG as log
 from deluge.configmanager import ConfigManager
 from deluge.ui.client import client

deluge/ui/gtkui/preferences.py

@@ -44,7 +44,7 @@ from deluge.log import LOG as log
 from deluge.ui.client import client
 import deluge.common
 import deluge.error
-import deluge.ui.gtkui.common as common
+import common
 from deluge.configmanager import ConfigManager
 import deluge.configmanager
 

deluge/ui/gtkui/queuedtorrents.py

@@ -45,7 +45,7 @@ from deluge.ui.client import client
 import deluge.common
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
-import deluge.ui.gtkui.common as common
+import common
 
 class QueuedTorrents(component.Component):
     def __init__(self):

deluge/ui/gtkui/statusbar.py

@@ -40,7 +40,7 @@ import gobject
 from deluge.ui.client import client
 import deluge.component as component
 import deluge.common
-import deluge.ui.gtkui.common as common
+import common
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
 

deluge/ui/gtkui/systemtray.py

@@ -42,7 +42,7 @@ from deluge.ui.client import client
 import deluge.common
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
-import deluge.ui.gtkui.common as common
+import common
 
 class SystemTray(component.Component):
     def __init__(self):

deluge/ui/gtkui/torrentview.py

@@ -47,7 +47,7 @@ import deluge.common
 import deluge.component as component
 from deluge.ui.client import client
 from deluge.log import LOG as log
-import deluge.ui.gtkui.listview as listview
+import listview
 from deluge.ui.tracker_icons import TrackerIcons
 
 # Status icons.. Create them from file only once to avoid constantly