From 2334fff3887b2f8d21cbac1554aefa81c7f00f57 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Fri, 31 Jul 2009 00:57:04 +0000 Subject: [PATCH] Add support for the deluge-gtk start script --- deluge/ui/gtkui/__init__.py | 1 + deluge/ui/gtkui/aboutdialog.py | 2 +- deluge/ui/gtkui/addtorrentdialog.py | 2 +- deluge/ui/gtkui/connectionmanager.py | 2 +- deluge/ui/gtkui/createtorrentdialog.py | 2 +- deluge/ui/gtkui/edittrackersdialog.py | 2 +- deluge/ui/gtkui/gtkui.py | 19 ++++++++++++++++++- deluge/ui/gtkui/mainwindow.py | 2 +- deluge/ui/gtkui/menubar.py | 2 +- deluge/ui/gtkui/notification.py | 2 +- deluge/ui/gtkui/preferences.py | 2 +- deluge/ui/gtkui/queuedtorrents.py | 2 +- deluge/ui/gtkui/statusbar.py | 2 +- deluge/ui/gtkui/systemtray.py | 2 +- deluge/ui/gtkui/torrentview.py | 2 +- 15 files changed, 32 insertions(+), 14 deletions(-) diff --git a/deluge/ui/gtkui/__init__.py b/deluge/ui/gtkui/__init__.py index e69de29bb..c5a539add 100644 --- a/deluge/ui/gtkui/__init__.py +++ b/deluge/ui/gtkui/__init__.py @@ -0,0 +1 @@ +from gtkui import start diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py index c5591a218..bb1266200 100644 --- a/deluge/ui/gtkui/aboutdialog.py +++ b/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): diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index 66d47c7e5..a9de36a2e 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/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 diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index ab29f4574..6b8123777 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/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 diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 74e3d1bee..9bc13ba54 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/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 diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py index c7f857b83..f16e4bc1a 100644 --- a/deluge/ui/gtkui/edittrackersdialog.py +++ b/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 diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 5780562e3..a5ca9d04c 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/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 diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index 0140ba89b..f7a6d2b5a 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/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 diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index a2bee0780..565b6d211 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/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 diff --git a/deluge/ui/gtkui/notification.py b/deluge/ui/gtkui/notification.py index 858bd1b0e..7d5d34723 100644 --- a/deluge/ui/gtkui/notification.py +++ b/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 diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index b9057213f..5fc92ce89 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/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 diff --git a/deluge/ui/gtkui/queuedtorrents.py b/deluge/ui/gtkui/queuedtorrents.py index 49f079dba..f70c5e2aa 100644 --- a/deluge/ui/gtkui/queuedtorrents.py +++ b/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): diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py index 970983945..a94775a55 100644 --- a/deluge/ui/gtkui/statusbar.py +++ b/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 diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index 99e5f5fce..70f8bd64c 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/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): diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 50569e3bb..fd1df1870 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/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