Author: andar
Revision: 5599
Log:
Add support for the deluge-gtk start script
Diff:
Modified: trunk/deluge/ui/gtkui/__init__.py
===================================================================
--- trunk/deluge/ui/gtkui/__init__.py 2009-07-31 00:46:42 UTC (rev 5598)
+++ trunk/deluge/ui/gtkui/__init__.py 2009-07-31 00:57:04 UTC (rev 5599)
@@ -0,0 +1 @@
+from gtkui import start
Modified: trunk/deluge/ui/gtkui/aboutdialog.py
===================================================================
--- trunk/deluge/ui/gtkui/aboutdialog.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/aboutdialog.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -40,7 +40,7 @@
import pkg_resources
import deluge.common
-import deluge.ui.gtkui.common as common
+import common
class AboutDialog:
def __init__(self):
Modified: trunk/deluge/ui/gtkui/addtorrentdialog.py
===================================================================
--- trunk/deluge/ui/gtkui/addtorrentdialog.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/addtorrentdialog.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -46,7 +46,7 @@
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
Modified: trunk/deluge/ui/gtkui/connectionmanager.py
===================================================================
--- trunk/deluge/ui/gtkui/connectionmanager.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/connectionmanager.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -42,7 +42,7 @@
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
Modified: trunk/deluge/ui/gtkui/createtorrentdialog.py
===================================================================
--- trunk/deluge/ui/gtkui/createtorrentdialog.py 2009-07-31 00:46:42 UTC
(rev 5598)
+++ trunk/deluge/ui/gtkui/createtorrentdialog.py 2009-07-31 00:57:04 UTC
(rev 5599)
@@ -41,7 +41,7 @@
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
Modified: trunk/deluge/ui/gtkui/edittrackersdialog.py
===================================================================
--- trunk/deluge/ui/gtkui/edittrackersdialog.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/edittrackersdialog.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -38,7 +38,7 @@
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
Modified: trunk/deluge/ui/gtkui/gtkui.py
===================================================================
--- trunk/deluge/ui/gtkui/gtkui.py 2009-07-31 00:46:42 UTC (rev 5598)
+++ trunk/deluge/ui/gtkui/gtkui.py 2009-07-31 00:57:04 UTC (rev 5599)
@@ -71,6 +71,23 @@
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 @@
"show_rate_in_title": False
}
-class GtkUI:
+class GtkUI(object):
def __init__(self, args):
# Initialize gettext
Modified: trunk/deluge/ui/gtkui/mainwindow.py
===================================================================
--- trunk/deluge/ui/gtkui/mainwindow.py 2009-07-31 00:46:42 UTC (rev 5598)
+++ trunk/deluge/ui/gtkui/mainwindow.py 2009-07-31 00:57:04 UTC (rev 5599)
@@ -48,7 +48,7 @@
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
Modified: trunk/deluge/ui/gtkui/menubar.py
===================================================================
--- trunk/deluge/ui/gtkui/menubar.py 2009-07-31 00:46:42 UTC (rev 5598)
+++ trunk/deluge/ui/gtkui/menubar.py 2009-07-31 00:57:04 UTC (rev 5599)
@@ -43,7 +43,7 @@
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
Modified: trunk/deluge/ui/gtkui/notification.py
===================================================================
--- trunk/deluge/ui/gtkui/notification.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/notification.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -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
Modified: trunk/deluge/ui/gtkui/preferences.py
===================================================================
--- trunk/deluge/ui/gtkui/preferences.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/preferences.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -44,7 +44,7 @@
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
Modified: trunk/deluge/ui/gtkui/queuedtorrents.py
===================================================================
--- trunk/deluge/ui/gtkui/queuedtorrents.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/queuedtorrents.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -45,7 +45,7 @@
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):
Modified: trunk/deluge/ui/gtkui/statusbar.py
===================================================================
--- trunk/deluge/ui/gtkui/statusbar.py 2009-07-31 00:46:42 UTC (rev 5598)
+++ trunk/deluge/ui/gtkui/statusbar.py 2009-07-31 00:57:04 UTC (rev 5599)
@@ -40,7 +40,7 @@
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
Modified: trunk/deluge/ui/gtkui/systemtray.py
===================================================================
--- trunk/deluge/ui/gtkui/systemtray.py 2009-07-31 00:46:42 UTC (rev 5598)
+++ trunk/deluge/ui/gtkui/systemtray.py 2009-07-31 00:57:04 UTC (rev 5599)
@@ -42,7 +42,7 @@
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):
Modified: trunk/deluge/ui/gtkui/torrentview.py
===================================================================
--- trunk/deluge/ui/gtkui/torrentview.py 2009-07-31 00:46:42 UTC (rev
5598)
+++ trunk/deluge/ui/gtkui/torrentview.py 2009-07-31 00:57:04 UTC (rev
5599)
@@ -47,7 +47,7 @@
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
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
