diff --git a/deluge/src/__init__.py b/deluge/__init__.py similarity index 100% rename from deluge/src/__init__.py rename to deluge/__init__.py diff --git a/deluge/src/common.py b/deluge/common.py similarity index 100% rename from deluge/src/common.py rename to deluge/common.py diff --git a/deluge/src/config.py b/deluge/config.py similarity index 100% rename from deluge/src/config.py rename to deluge/config.py diff --git a/deluge/core/__init__.py b/deluge/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/deluge/src/core.py b/deluge/core/core.py similarity index 98% rename from deluge/src/core.py rename to deluge/core/core.py index ea7fc4e8f..6ce6e690f 100644 --- a/deluge/src/core.py +++ b/deluge/core/core.py @@ -47,11 +47,11 @@ except: dbus_imported = False else: dbus_imported = True import gobject -import libtorrent as lt +import deluge.libtorrent as lt from deluge.config import Config import deluge.common -from deluge.torrent import Torrent +from deluge.core.torrent import Torrent # Get the logger log = logging.getLogger("deluge") diff --git a/deluge/src/daemon.py b/deluge/core/daemon.py similarity index 98% rename from deluge/src/daemon.py rename to deluge/core/daemon.py index d21082ee2..828a15927 100644 --- a/deluge/src/daemon.py +++ b/deluge/core/daemon.py @@ -45,7 +45,7 @@ else: dbus_imported = True import logging -from deluge.core import Core +from deluge.core.core import Core # Get the logger log = logging.getLogger("deluge") diff --git a/deluge/src/torrent.py b/deluge/core/torrent.py similarity index 98% rename from deluge/src/torrent.py rename to deluge/core/torrent.py index 1c4f6592c..1ee75a775 100644 --- a/deluge/src/torrent.py +++ b/deluge/core/torrent.py @@ -31,7 +31,7 @@ # this exception statement from your version. If you delete this exception # statement from all source files in the program, then also delete it here. -import libtorrent as lt +import deluge.libtorrent as lt class Torrent: def __init__(self, filename=None, url=None): diff --git a/deluge/glade/about_dialog.glade b/deluge/glade/about_dialog.glade deleted file mode 100644 index c8799dc0d..000000000 --- a/deluge/glade/about_dialog.glade +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - 5 - True - True - True - False - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - False - GTK_PACK_END - - - - - - diff --git a/deluge/glade/dgtkpopups.glade b/deluge/glade/dgtkpopups.glade deleted file mode 100644 index 63279d9a9..000000000 --- a/deluge/glade/dgtkpopups.glade +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - True - - - True - Size - True - True - - - - - - True - Status - True - True - - - - - - True - Seeders - True - True - - - - - - True - Peers - True - True - - - - - - True - Download Speed - True - True - - - - - - True - Upload Speed - True - True - - - - - - True - Time Remaining - True - True - - - - - - True - Share Ratio - True - True - - - - - - Remove Torrent - True - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - False - - - True - - - True - 10 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-dialog-warning - 6 - - - False - False - 5 - - - - - True - 0 - <span size="large"><b>Are you sure you want to remove the selected torrent(s) from Deluge?</b></span> - True - True - - - 10 - 1 - - - - - False - False - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 20 - - - True - Delete downloaded files - 0 - True - - - - - False - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 20 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Delete .torrent file - 0 - True - True - - - - - False - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - - - - - False - False - 5 - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - gtk-no - True - 0 - - - - - True - gtk-yes - True - 1 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - True - - - True - Show/Hide - True - - - - - - True - Add a Torrent... - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-add - 1 - - - - - - - True - Clear Finished - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-clear - 1 - - - - - - - True - - - - - True - gtk-preferences - True - True - - - - - - True - Plugins - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-execute - 1 - - - - - - - True - - - - - True - gtk-quit - True - True - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - GTK_WIN_POS_MOUSE - True - GDK_WINDOW_TYPE_HINT_DIALOG - True - False - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Rate: - - - False - - - - - True - True - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - 1 - 0 -1 10000 1 10 10 - True - - - False - False - 1 - - - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel - True - 0 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-ok - True - 1 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/deluge/glade/edit_trackers.glade b/deluge/glade/edit_trackers.glade deleted file mode 100644 index 32053dcd5..000000000 --- a/deluge/glade/edit_trackers.glade +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - 300 - 200 - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Edit Trackers - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 36 - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Tracker Editing - - - False - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - 1 - - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel - True - 0 - - - - False - False - 1 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-ok - True - 0 - - - - False - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - 1 - - - - - - 3 - - - - - False - False - 2 - - - - - - diff --git a/deluge/glade/file_tab_menu.glade b/deluge/glade/file_tab_menu.glade deleted file mode 100644 index 8e3f34162..000000000 --- a/deluge/glade/file_tab_menu.glade +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - True - - - - True - Select All - True - - - - - True - gtk-select-all - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Unselect All - True - - - - - True - gtk-file - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Check Selected - True - - - - - True - gtk-ok - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Uncheck Selected - True - - - - - True - gtk-remove - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - diff --git a/deluge/glade/main_window.glade b/deluge/glade/main_window.glade deleted file mode 100644 index a60828804..000000000 --- a/deluge/glade/main_window.glade +++ /dev/null @@ -1,1140 +0,0 @@ - - - - - - Deluge - - - - - - True - 4 - 3 - - - True - False - - - True - Add Torrent - Add Torrent - True - gtk-add - - - - False - - - - - True - False - Remove Torrent - Remove Torrent - True - gtk-remove - - - - False - - - - - True - Clear Finished Torrents - Clear Finished - True - gtk-clear - - - - False - - - - - True - - - False - False - - - - - True - False - Start / Pause - Start - True - gtk-media-play - - - - False - - - - - True - False - Queue Torrent Up - Move Up - True - gtk-go-up - - - - False - - - - - True - False - Queue Torrent Down - Move Down - True - gtk-go-down - - - - False - - - - - True - - - False - False - - - - - True - Preferences - Preferences - True - gtk-preferences - - - - False - - - - - True - Plugins - Plugins - True - gtk-disconnect - - - - False - - - - - 1 - 2 - GTK_FILL - - - - - True - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - - - 2 - 3 - 1 - 2 - - GTK_FILL - - - - - True - - - True - _File - True - - - - - True - _Add Torrent - True - - - - True - gtk-add - 1 - - - - - - - True - Add _URL - True - - - - - - True - _Clear Completed - True - - - - True - gtk-clear - 1 - - - - - - - True - - - - - True - gtk-quit - True - True - - - - - - - - - - True - _Edit - True - - - True - - - True - gtk-preferences - True - True - - - - - - True - Pl_ugins - True - - - - True - gtk-disconnect - 1 - - - - - - - - - - - True - _Torrent - True - - - - - True - _View - True - - - True - - - True - _Toolbar - True - True - - - - - - True - _Details - True - True - - - - - - True - Columns - True - - - True - - - True - Size - True - True - - - - - - True - Status - True - True - - - - - - True - Seeders - True - True - - - - - - True - Peers - True - True - - - - - - True - Download - True - True - - - - - - True - Upload - True - True - - - - - - True - Time Remaining - True - True - - - - - - True - Share Ratio - True - True - - - - - - - - - - - - - - True - _Help - True - - - - - True - gtk-about - True - True - - - - - - - - - - 3 - - - - - - True - - - 3 - 3 - 4 - - - - - - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - True - True - False - - - - - - - True - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - False - True - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_NEVER - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_RESIZE_QUEUE - - - True - 1 - 2 - 10 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - 10 - 15 - 15 - - - True - 6 - 2 - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b>Next Announce:</b> - True - - - - - 5 - 6 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b>Tracker Status:</b> - True - - - - - 4 - 5 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 0 - 1 - <b>Tracker:</b> - True - - - - - 3 - 4 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b>Pieces:</b> - True - - - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b>Total Size:</b> - True - - - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 0 - 1 - <b>Name:</b> - True - - - - - GTK_FILL - - - - - True - 0 - True - PANGO_WRAP_WORD_CHAR - - - 1 - 2 - - - - - - True - 0 - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - True - PANGO_WRAP_WORD_CHAR - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - - - 1 - 2 - 5 - 6 - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Torrent Info</b> - True - - - label_item - - - - - 1 - 2 - GTK_FILL - - - - - True - 0 - - - True - 10 - 10 - 15 - 15 - - - True - 5 - - - True - 0.10000000149 - - - False - False - - - - - True - 4 - 4 - 5 - - - True - 15 - 5 - - - True - 0 - <b>ETA:</b> - True - - - - - 2 - 3 - 3 - 4 - - - - - True - 15 - 5 - - - True - 0 - <b>Peers:</b> - True - - - - - 2 - 3 - 2 - 3 - - - - - True - 15 - 5 - - - True - 0 - <b>Rate:</b> - True - - - - - 2 - 3 - 1 - 2 - - - - - True - 15 - 5 - - - True - 0 - <b>Rate:</b> - True - - - - - 2 - 3 - - - - - True - 5 - - - True - 0 - <b>Share Ratio:</b> - True - - - - - 3 - 4 - - - - - True - 5 - - - True - 0 - <b>Seeders:</b> - True - - - - - 2 - 3 - - - - - True - 5 - - - True - 0 - <b>Uploaded:</b> - True - - - - - 1 - 2 - - - - - True - 5 - - - True - 0 - <b>Downloaded:</b> - True - - - - - - - True - 0 - - - 3 - 4 - 3 - 4 - - - - - True - 0 - - - 1 - 2 - 3 - 4 - - - - - True - 0 - - - 3 - 4 - 2 - 3 - - - - - True - 0 - - - 1 - 2 - 2 - 3 - - - - - True - 0 - - - 3 - 4 - 1 - 2 - - - - - True - 0 - - - 1 - 2 - 1 - 2 - - - - - True - 0 - - - 3 - 4 - - - - - True - 0 - - - 1 - 2 - - - - - False - 1 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Statistics</b> - True - - - label_item - - - - - - GTK_FILL - - - - - - - - - False - - - - - True - Details - - - tab - False - False - - - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - - - 1 - False - - - - - True - Peers - - - tab - 1 - False - False - - - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - - - - - 2 - False - - - - - True - Files - - - tab - 2 - False - False - - - - - - - False - False - - - - - 3 - 2 - 3 - - - - - - diff --git a/deluge/glade/plugin_dialog.glade b/deluge/glade/plugin_dialog.glade deleted file mode 100644 index 68fa97357..000000000 --- a/deluge/glade/plugin_dialog.glade +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - 480 - 5 - Plugin Manager - 583 - 431 - True - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK - 2 - - - True - False - - - True - True - - - True - - - - - True - - - True - False - GTK_WRAP_WORD - False - - - 10 - - - - - True - GTK_BUTTONBOX_SPREAD - - - True - False - gtk-preferences - True - - - - - - False - 1 - - - - - 10 - 1 - - - - - False - - - - - True - Plugins - - - tab - False - False - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK - GTK_BUTTONBOX_END - - - True - gtk-close - True - - - - - False - GTK_PACK_END - - - - - - diff --git a/deluge/glade/preferences_dialog.glade b/deluge/glade/preferences_dialog.glade deleted file mode 100644 index 4e8eca460..000000000 --- a/deluge/glade/preferences_dialog.glade +++ /dev/null @@ -1,1461 +0,0 @@ - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Deluge Preferences - GTK_WIN_POS_CENTER_ON_PARENT - 550 - True - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - False - - - True - 1 - - - True - True - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_SHADOW_NONE - - - True - 2 - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - - - True - Ask where to save each download - True - 0 - True - - - - - True - 10 - - - True - Save all downloads to: - True - 0 - True - radio_ask_save - - - False - - - - - True - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - - - 1 - - - - - 1 - - - - - - - - - True - <b>Download Location</b> - True - - - label_item - - - - - False - False - 2 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - 10 - - - True - The number of active torrents that Deluge will run. Set to -1 for unlimited. - 0 - Maximum simultaneous active torrents: - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - The number of active torrents that Deluge will run. Set to -1 for unlimited. - 1 - -1 -1 1000 1 10 10 - 1 - True - GTK_UPDATE_IF_VALID - - - False - 2 - 1 - - - - - - - - - True - <b>Torrents</b> - True - - - label_item - - - - - False - False - 2 - 1 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - Compact allocation will only allocate as much storage as it needs to keep the pieces downloaded so far. - Use compact storage allocation - True - 0 - True - - - - - - - True - <b>Compact Allocation</b> - True - - - label_item - - - - - False - False - 2 - 2 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - - - True - True - Queue torrents to bottom when they begin seeding - True - 0 - True - - - - - True - 10 - - - True - Stop seeding torrents when their share ratio reaches: - True - 0 - True - - - False - - - - - True - True - 1 - 0 0 10 0.050000000745099998 10 9 - 1 - 2 - True - - - False - 1 - - - - - 1 - - - - - - - - - True - <b>Seeding</b> - True - - - label_item - - - - - False - False - 2 - 3 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 2 - - - True - True - The maximum upload rate for all torrents. Set -1 for unlimited. - 1 - -1 -1 9000 1 10 10 - 1 - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - The maximum download rate for all torrents. Set -1 for unlimited. - 1 - -1 -1 9000 1 10 10 - 1 - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - True - The maximum number of upload slots. Set -1 for unlimited. - 1 - -1 -1 1000 1 10 10 - 1 - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - The maximum number of connections allowed. Set -1 for unlimited. - 1 - -1 -1 1000 1 10 10 - 1 - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - True - The maximum number of connections allowed. Set -1 for unlimited. - 0 - Maximum Connections: - - - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - True - The maximum number of upload slots. Set -1 for unlimited. - 0 - Upload Slots: - - - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - True - The maximum download rate for all torrents. Set -1 for unlimited. - 0 - Maximum Download Rate (KiB/s): - - - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - True - The maximum upload rate for all torrents. Set -1 for unlimited. - 0 - Maximum Upload Rate (KiB/s): - - - - - 3 - 4 - GTK_FILL - - - - - - - - - True - <b>Bandwidth Usage</b> - True - - - label_item - - - - - False - False - 2 - 4 - - - - - - - - - False - - - - - True - Downloads - - - tab - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_SHADOW_NONE - - - True - - - True - - - True - 2 - - - True - gtk-dialog-warning - 6 - - - False - False - 10 - - - - - True - 0.20000000298023224 - <b>Please Note - Changes to these settings will only be applied the next time Deluge is restarted.</b> - True - True - 0 - - - False - False - 1 - - - - - False - False - 5 - - - - - False - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - - - True - - - True - From: - - - False - - - - - True - True - 0 0 65535 1 10 10 - 1 - - - False - 5 - 1 - - - - - True - 5 - To: - - - False - False - 2 - - - - - True - True - 0 0 65535 1 10 10 - 1 - - - False - 5 - 3 - - - - - True - 1 - Active Port: - GTK_JUSTIFY_RIGHT - - - False - 5 - 4 - - - - - True - 0 - 0000 - 5 - - - False - 5 - 5 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Test Active Port - 0 - - - - False - False - 6 - - - - - 5 - - - - - - - - - True - <b>TCP Port</b> - True - - - label_item - - - - - False - 2 - 1 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - - - True - True - Distributed hash table may improve the amount of active connections. - Enable Mainline DHT - True - 0 - True - - - - - - - - - - - - True - <b>DHT</b> - True - - - label_item - - - - - False - 2 - 2 - - - - - True - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - - - True - True - Universal Plug and Play - UPnP - True - 0 - True - True - - - 2 - - - - - True - True - NAT Port Mapping Protocol - NAT-PMP - True - 0 - True - True - - - 2 - 1 - - - - - True - True - µTorrent Peer-Exchange - µTorrent-PeX - True - 0 - True - True - - - 2 - 2 - - - - - - - - - True - <b>Network Extras</b> - True - - - label_item - - - - - 2 - - - - - False - False - 3 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - 2 - - - True - - - True - 1 - Inbound: - - - False - - - - - True - Disabled -Enabled -Forced - - - 5 - 1 - - - - - True - 1 - Outbound: - - - 2 - - - - - True - Disabled -Enabled -Forced - - - 5 - 3 - - - - - - - True - - - True - True - Prefer to encrypt the entire stream - True - 0 - True - - - False - - - - - True - 1 - Level: - - - 1 - - - - - True - Handshake -Either -Full Stream - - - 6 - 2 - - - - - 1 - - - - - - - - - True - <b>Encryption</b> - True - - - label_item - - - - - False - False - 2 - 4 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Affects regular bittorrent peers - Peer Proxy - 0 - True - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Only affects HTTP tracker connections (UDP tracker connections are affected if the given proxy supports UDP, e.g. SOCKS5). - Tracker Proxy - 0 - True - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Affects the DHT messages. Since they are sent over UDP, it only has any effect if the proxy supports UDP. - DHT Proxy - 0 - True - - - 2 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 4 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Proxy type - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Username - - - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Password - - - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth - - - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Server - - - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Port - - - 2 - 3 - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 3 - 4 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8080 0 10000 1 10 10 - - - 3 - 4 - 1 - 2 - - - - - 1 - - - - - - - True - <b>Proxy</b> - True - - - label_item - - - - - False - 2 - 5 - - - - - - - - - 1 - False - - - - - True - Network - - - tab - 1 - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_SHADOW_NONE - - - True - 2 - - - True - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - - - True - Enable system tray icon - True - 0 - True - True - - - - - True - 10 - - - True - Minimize to tray on close - True - 0 - True - - - - - 1 - - - - - True - 3 - 10 - - - True - - - True - True - Password protect system tray - True - 0 - True - - - - - True - - - True - 5 - - - True - 0 - Password: - - - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - 16 - - - False - 1 - - - - - 1 - - - - - - - False - 2 - - - - - - - - - True - <b>System Tray</b> - True - - - label_item - - - - - False - 2 - - - - - 0 - GTK_SHADOW_NONE - - - True - 2 - 2 - 12 - - - True - 15 - - - True - 0 - GUI update interval (seconds) - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.5 0.5 5 0.5 0.5 1 - 1 - 1 - True - - - False - 1 - - - - - - - - - True - <b>Performance</b> - True - - - label_item - - - - - False - False - 2 - 1 - - - - - - - - - 2 - False - - - - - True - Other - - - tab - 2 - False - False - - - - - 2 - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - gtk-cancel - True - 0 - - - - - True - gtk-ok - True - 1 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/deluge/glade/torrent_menu.glade b/deluge/glade/torrent_menu.glade deleted file mode 100644 index 70f9eebf9..000000000 --- a/deluge/glade/torrent_menu.glade +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-media-pause - True - True - - - - - - True - _Update Tracker - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-refresh - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Edit Trackers - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-edit - 1 - - - - - - - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Remove Torrent - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-remove - 1 - - - - - - - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Queue - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Top - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-goto-top - 1 - - - - - - - True - _Up - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-go-up - 1 - - - - - - - True - _Down - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-go-down - 1 - - - - - - - True - _Bottom - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-goto-bottom - 1 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-sort-ascending - 1 - - - - - - diff --git a/deluge/glade/tray_menu.glade b/deluge/glade/tray_menu.glade deleted file mode 100644 index 22411c91d..000000000 --- a/deluge/glade/tray_menu.glade +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Show Deluge - True - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Add Torrent - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-add - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Clear Finished - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-clear - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Download Limit - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-missing-image - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Upload Limit - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-missing-image - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-preferences - True - True - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Plu_gins - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-disconnect - 1 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Quit - True - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-quit - 1 - - - - - - diff --git a/deluge/src/main.py b/deluge/main.py similarity index 97% rename from deluge/src/main.py rename to deluge/main.py index 87bc8eb71..f18fa4dca 100644 --- a/deluge/src/main.py +++ b/deluge/main.py @@ -39,8 +39,8 @@ import os import signal from optparse import OptionParser -from deluge.daemon import Daemon -from deluge.ui import UI +from deluge.core.daemon import Daemon +from deluge.ui.ui import UI import deluge.common # Setup the logger diff --git a/deluge/pixmaps/deluge-about.png b/deluge/pixmaps/deluge-about.png deleted file mode 100644 index 63aef4fbb..000000000 Binary files a/deluge/pixmaps/deluge-about.png and /dev/null differ diff --git a/deluge/pixmaps/deluge128.png b/deluge/pixmaps/deluge128.png deleted file mode 100644 index 840b96704..000000000 Binary files a/deluge/pixmaps/deluge128.png and /dev/null differ diff --git a/deluge/pixmaps/deluge192.png b/deluge/pixmaps/deluge192.png deleted file mode 100644 index 9491409d6..000000000 Binary files a/deluge/pixmaps/deluge192.png and /dev/null differ diff --git a/deluge/pixmaps/deluge22.png b/deluge/pixmaps/deluge22.png deleted file mode 100644 index 29319b3f3..000000000 Binary files a/deluge/pixmaps/deluge22.png and /dev/null differ diff --git a/deluge/pixmaps/deluge256.png b/deluge/pixmaps/deluge256.png deleted file mode 100644 index a57e7687b..000000000 Binary files a/deluge/pixmaps/deluge256.png and /dev/null differ diff --git a/deluge/pixmaps/deluge32.png b/deluge/pixmaps/deluge32.png deleted file mode 100644 index 723372764..000000000 Binary files a/deluge/pixmaps/deluge32.png and /dev/null differ diff --git a/deluge/pixmaps/downloading16.png b/deluge/pixmaps/downloading16.png deleted file mode 100644 index 53a2b6e61..000000000 Binary files a/deluge/pixmaps/downloading16.png and /dev/null differ diff --git a/deluge/pixmaps/inactive16.png b/deluge/pixmaps/inactive16.png deleted file mode 100644 index 10342be18..000000000 Binary files a/deluge/pixmaps/inactive16.png and /dev/null differ diff --git a/deluge/pixmaps/seeding16.png b/deluge/pixmaps/seeding16.png deleted file mode 100644 index 6994323de..000000000 Binary files a/deluge/pixmaps/seeding16.png and /dev/null differ diff --git a/deluge/share/applications/deluge.desktop b/deluge/share/applications/deluge.desktop deleted file mode 100644 index 570cd9ed8..000000000 --- a/deluge/share/applications/deluge.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=Deluge BitTorrent Client -Comment=Bittorrent client written in PyGTK -Exec=deluge -Icon=deluge.xpm -Terminal=false -Type=Application -Categories=Application;Network -StartupNotify=true -MimeType=application/x-bittorrent; -GenericName= diff --git a/deluge/share/pixmaps/deluge.xpm b/deluge/share/pixmaps/deluge.xpm deleted file mode 100644 index 5c3d1eae7..000000000 --- a/deluge/share/pixmaps/deluge.xpm +++ /dev/null @@ -1,415 +0,0 @@ -/* XPM */ -static char * deluge_torrent_xpm[] = { -"32 32 380 2", -" c None", -". c #8893A8", -"+ c #8994A8", -"@ c #B0B7C5", -"# c #919BAE", -"$ c #737F98", -"% c #A3ABBB", -"& c #8E98AD", -"* c #AEB5C4", -"= c #858FA5", -"- c #5E6D89", -"; c #929CB0", -"> c #8794A9", -", c #8592AA", -"' c #919FB5", -") c #A5B0C3", -"! c #7688A4", -"~ c #7687A1", -"{ c #8A99B1", -"] c #768AA7", -"^ c #7E92AE", -"/ c #8397B3", -"( c #92A4BD", -"_ c #96A8C0", -": c #5B7295", -"< c #8B9DB7", -"[ c #6A83A4", -"} c #728BAD", -"| c #7791B3", -"1 c #7B95B6", -"2 c #7C96B8", -"3 c #95ABC6", -"4 c #829CBC", -"5 c #45618C", -"6 c #7F96B3", -"7 c #6483A9", -"8 c #6384AC", -"9 c #6B8BB3", -"0 c #7091B8", -"a c #7495BC", -"b c #7596BD", -"c c #7496BD", -"d c #95AECC", -"e c #6F91B9", -"f c #6081A9", -"g c #3C6292", -"h c #365989", -"i c #4B6B97", -"j c #5676A1", -"k c #5F81AB", -"l c #6E93BF", -"m c #7097C2", -"n c #7297C3", -"o c #8FADCE", -"p c #618AB7", -"q c #476D9D", -"r c #5A779F", -"s c #1B4075", -"t c #1F4377", -"u c #365785", -"v c #4A6791", -"w c #4D6B94", -"x c #5D80AA", -"y c #6C93BF", -"z c #779DC6", -"A c #84A6CB", -"B c #5382B6", -"C c #3A659A", -"D c #5C789F", -"E c #224579", -"F c #1E4277", -"G c #274A7C", -"H c #2E4F7F", -"I c #335483", -"J c #44628D", -"K c #557197", -"L c #526E95", -"M c #506F99", -"N c #668FBD", -"O c #7FA3CA", -"P c #7299C4", -"Q c #36639A", -"R c #4F6D97", -"S c #345484", -"T c #305181", -"U c #42618A", -"V c #4E6992", -"W c #4A678F", -"X c #4B6992", -"Y c #4B6994", -"Z c #5F7A9E", -"` c #5E779C", -" . c #597398", -".. c #527099", -"+. c #618ABA", -"@. c #84A6CD", -"#. c #5D89BB", -"$. c #375A89", -"%. c #4C6992", -"&. c #3A5986", -"*. c #536E94", -"=. c #577197", -"-. c #6F92BB", -";. c #759ECA", -">. c #739CCA", -",. c #759DC9", -"'. c #6880A4", -"). c #5C7699", -"!. c #4F6F98", -"~. c #618DBD", -"{. c #81A4CA", -"]. c #4B7CB3", -"^. c #274F84", -"/. c #5A759B", -"(. c #375784", -"_. c #577196", -":. c #5A7498", -"<. c #6F89AB", -"[. c #8BADD1", -"}. c #7EA5D0", -"|. c #7FA6D0", -"1. c #7CA4CF", -"2. c #7CA4CE", -"3. c #789FC7", -"4. c #6984A7", -"5. c #5A7398", -"6. c #5076A5", -"7. c #6791C0", -"8. c #7198C3", -"9. c #2D5081", -"0. c #25477A", -"a. c #4C6890", -"b. c #627A9D", -"c. c #657DA1", -"d. c #A0BBD7", -"e. c #89AED6", -"f. c #8BAFD7", -"g. c #8BB0D7", -"h. c #8AAED6", -"i. c #86ACD4", -"j. c #82A8D2", -"k. c #7CA3CF", -"l. c #749DC8", -"m. c #6984A6", -"n. c #567298", -"o. c #5786BA", -"p. c #779CC6", -"q. c #5583B7", -"r. c #295086", -"s. c #2C4E7F", -"t. c #345483", -"u. c #5B7498", -"v. c #5D7699", -"w. c #93AAC4", -"x. c #9EBDDD", -"y. c #96B8DD", -"z. c #97B9DE", -"A. c #94B7DC", -"B. c #90B3DA", -"C. c #8AAFD6", -"D. c #83A9D2", -"E. c #7AA2CE", -"F. c #6F95BF", -"G. c #667E9F", -"H. c #577FAF", -"I. c #5585B8", -"J. c #759AC5", -"K. c #3F6FA7", -"L. c #254A80", -"M. c #5C769C", -"N. c #3C5B87", -"O. c #60789C", -"P. c #B0C3D8", -"Q. c #A1C0E3", -"R. c #A3C2E4", -"S. c #A3C3E5", -"T. c #A2C2E4", -"U. c #9EBFE2", -"V. c #98BADE", -"W. c #91B4DA", -"X. c #88AED6", -"Y. c #759ECB", -"Z. c #6885AD", -"`. c #5780B0", -" + c #5383B8", -".+ c #7299C3", -"++ c #4675AB", -"@+ c #395A89", -"#+ c #46648F", -"$+ c #3E5D88", -"%+ c #617A9C", -"&+ c #637B9D", -"*+ c #BFD1E4", -"=+ c #ADCBEA", -"-+ c #B0CDEB", -";+ c #AFCCEB", -">+ c #ACCAE9", -",+ c #A7C6E6", -"'+ c #9FC0E2", -")+ c #8DB1D8", -"!+ c #82A9D2", -"~+ c #77A0CC", -"{+ c #6A94C4", -"]+ c #5F8DBF", -"^+ c #5C89BA", -"/+ c #5C85B4", -"(+ c #3F5E8B", -"_+ c #3B5A86", -":+ c #647C9E", -"<+ c #61799D", -"[+ c #C1D2E4", -"}+ c #BBD5F1", -"|+ c #BCD6F2", -"1+ c #BAD5F1", -"2+ c #B5D1EE", -"3+ c #AECBEA", -"4+ c #A5C4E5", -"5+ c #9BBCE0", -"6+ c #84AAD3", -"7+ c #78A0CC", -"8+ c #6B96C6", -"9+ c #5F8CBF", -"0+ c #5282B8", -"a+ c #4F7FB4", -"b+ c #668CB7", -"c+ c #43618D", -"d+ c #325382", -"e+ c #5E779B", -"f+ c #5F789A", -"g+ c #BACADC", -"h+ c #C9E0F9", -"i+ c #C7DFF8", -"j+ c #C3DCF6", -"k+ c #BCD7F2", -"l+ c #B3CFED", -"m+ c #A8C7E7", -"n+ c #9DBEE1", -"o+ c #6A96C5", -"p+ c #5D8BBE", -"q+ c #5081B7", -"r+ c #497BB2", -"s+ c #698DB7", -"t+ c #45638E", -"u+ c #2E5080", -"v+ c #25487B", -"w+ c #506B93", -"x+ c #647B9E", -"y+ c #9DAFC7", -"z+ c #D6E9FD", -"A+ c #D1E8FE", -"B+ c #CAE2FA", -"C+ c #C1DAF5", -"D+ c #A9C8E8", -"E+ c #6894C4", -"F+ c #5A89BC", -"G+ c #4D7EB5", -"H+ c #4577AF", -"I+ c #6B8DB5", -"J+ c #3B6090", -"K+ c #3D5D8A", -"L+ c #3C5B89", -"M+ c #1D4276", -"N+ c #647C9C", -"O+ c #657D9E", -"P+ c #C2D4E6", -"Q+ c #D3E9FF", -"R+ c #CEE5FC", -"S+ c #C2DBF5", -"T+ c #80A7D1", -"U+ c #729CC9", -"V+ c #6491C2", -"W+ c #5686BA", -"X+ c #497BB3", -"Y+ c #5580B3", -"Z+ c #5B7EAA", -"`+ c #335686", -" @ c #4D6993", -".@ c #26497B", -"+@ c #4C6990", -"@@ c #6B82A2", -"#@ c #7D92B0", -"$@ c #C1D4E9", -"%@ c #C0DAF4", -"&@ c #B2CFED", -"*@ c #7BA3CE", -"=@ c #6F99C7", -"-@ c #6390C0", -";@ c #5886B9", -">@ c #4A7BB2", -",@ c #698CB7", -"'@ c #4C6F9C", -")@ c #284C7F", -"!@ c #577299", -"~@ c #2F517F", -"{@ c #536E93", -"]@ c #7086A5", -"^@ c #7B8FAC", -"/@ c #9FB3CD", -"(@ c #B8D2EE", -"_@ c #91B5DB", -":@ c #85ABD4", -"<@ c #7CA3CD", -"[@ c #729AC8", -"}@ c #6791C1", -"|@ c #5A87BA", -"1@ c #5280B4", -"2@ c #7A97BB", -"3@ c #416290", -"4@ c #2F5080", -"5@ c #4F6B91", -"6@ c #687F9F", -"7@ c #7B8FAB", -"8@ c #8396B0", -"9@ c #8AA1BF", -"0@ c #8CACCE", -"a@ c #8FB2D8", -"b@ c #86AAD2", -"c@ c #7DA3CC", -"d@ c #749BC7", -"e@ c #6993C1", -"f@ c #5B88B9", -"g@ c #7999C0", -"h@ c #587AA5", -"i@ c #21416E", -"j@ c #516D96", -"k@ c #415F8A", -"l@ c #567196", -"m@ c #637B9E", -"n@ c #6F84A3", -"o@ c #778BA7", -"p@ c #758BAA", -"q@ c #7490B3", -"r@ c #749BC5", -"s@ c #6992C0", -"t@ c #799DC4", -"u@ c #7291B6", -"v@ c #46658C", -"w@ c #264878", -"x@ c #4F6C94", -"y@ c #42608C", -"z@ c #294B7D", -"A@ c #4A6790", -"B@ c #567095", -"C@ c #597599", -"D@ c #587398", -"E@ c #536F96", -"F@ c #4F6D95", -"G@ c #7690B4", -"H@ c #7090B7", -"I@ c #4A6991", -"J@ c #2B4871", -"K@ c #41608C", -"L@ c #59749A", -"M@ c #234679", -"N@ c #214578", -"O@ c #3A5A87", -"P@ c #47648F", -"Q@ c #667EA2", -"R@ c #7188A9", -"S@ c #4B6892", -"T@ c #395985", -"U@ c #1C314F", -"V@ c #2E4F7D", -"W@ c #395986", -"X@ c #526E96", -"Y@ c #58739A", -"Z@ c #5B759B", -"`@ c #6A82A5", -" # c #627CA0", -".# c #365887", -"+# c #324B69", -"@# c #344B69", -"## c #34537D", -"$# c #294C7C", -"%# c #315383", -"&# c #40618D", -"*# c #40638F", -"=# c #3B5C87", -"-# c #36537A", -";# c #2E4156", -" ", -" . ", -" + @ # ", -" $ % & * = ", -" - ; > , ' ) ! ", -" ~ { ] ^ / ( _ ", -" : < [ } | 1 2 3 4 ", -" 5 6 7 8 9 0 a b c d e ", -" 7 f g h i j k l m n o p ", -" q r s s s t u v w x y z A B ", -" C D E s F G H I J K L M N O P ", -" Q R S s T U V W X Y Z ` ...+.@.#. ", -" $.%.t &.*.=.r -.;.>.,.0 '.).!.~.{.]. ", -" ^./.F (._.:.<.[.}.|.}.1.2.3.4.5.6.7.8. ", -" 9.v 0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q. ", -" r.v s.t.u.v.w.x.y.z.z.A.B.C.D.E.F.G.H.I.J.K. ", -" L.M.s N.b.O.P.Q.R.S.T.U.V.W.X.|.Y.Z.`. +.+++ ", -" @+#+s $+%+&+*+=+-+;+>+,+'+z.)+!+~+{+]+ +^+/+ ", -" (+S s _+:+<+[+}+|+1+2+3+4+5+B.6+7+8+9+0+a+b+ ", -" c+T s d+e+f+g+h+i+j+k+l+m+n+W.6+~+o+p+q+r+s+ ", -" t+u+s v+w+x+y+z+A+B+C+2+D+n+B.D.Y.E+F+G+H+I+J+ ", -" K+L+s M+N.N+O+P+Q+R+S+2+m+5+)+T+U+V+W+X+Y+Z+ ", -" `+ @s s .@+@@@#@$@R+%@&@4+z.e.*@=@-@;@>@,@'@ ", -" )@!@t s s ~@{@]@^@/@(@=+'+_@:@<@[@}@|@1@2@3@ ", -" S #+s s s 4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@ ", -" i@j@u s s s G k@l@m@n@o@p@q@a r@s@t@u@v@ ", -" w@x@y@s s s s z@_+A@B@C@D@E@F@G@H@I@ ", -" J@K@L@y@M@s s N@z@S O@P@Q@R@S@T@ ", -" U@V@W@X@L@Y@Z@L@c.`@ #v .#+# ", -" @###$#%#&#*#=#-#;# ", -" ", -" "}; diff --git a/deluge/ui/__init__.py b/deluge/ui/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/deluge/ui/gtkui/__init__.py b/deluge/ui/gtkui/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/deluge/src/gtkui.py b/deluge/ui/gtkui/gtkui.py similarity index 100% rename from deluge/src/gtkui.py rename to deluge/ui/gtkui/gtkui.py diff --git a/deluge/src/gtkui_mainwindow.py b/deluge/ui/gtkui/gtkui_mainwindow.py similarity index 100% rename from deluge/src/gtkui_mainwindow.py rename to deluge/ui/gtkui/gtkui_mainwindow.py diff --git a/deluge/src/ui.py b/deluge/ui/ui.py similarity index 90% rename from deluge/src/ui.py rename to deluge/ui/ui.py index 8fb13c189..2b47042e9 100644 --- a/deluge/src/ui.py +++ b/deluge/ui/ui.py @@ -71,11 +71,6 @@ class UI: if self.config["selected_ui"] == "gtk": log.info("Starting GtkUI..") - from deluge.gtkui import GtkUI + from deluge.ui.gtkui.gtkui import GtkUI ui = GtkUI(self.core) - - # Test the interface.. -# self.core.add_torrent_file("/home/andrew/Downloads/test.torrent", None) - # time.sleep(3) - # Shutdown the core thus stopping the daemon process -# self.core.shutdown() + diff --git a/setup.py b/setup.py index dc02e4df1..cf0460170 100644 --- a/setup.py +++ b/setup.py @@ -84,14 +84,7 @@ libtorrent = Extension( ) # Main setup - -_data_files = [ - ('deluge/glade', glob.glob("deluge/glade/*.glade")), - ('deluge/pixmaps', glob.glob('deluge/pixmaps/*.png')), - ('share/applications' , ["deluge/share/applications/deluge.desktop"]), - ('share/pixmaps' , ["deluge/share/pixmaps/deluge.xpm"]) -] - + setup( name = "deluge", fullname = "Deluge Bittorent Client", @@ -104,11 +97,9 @@ setup( license = "GPLv2", include_package_data = True, - data_files = _data_files, ext_package = "deluge", ext_modules = [libtorrent], - packages=['deluge'], - package_dir = {'deluge': 'deluge/src'}, + packages = find_packages(), entry_points = """ [console_scripts] deluge = deluge.main:main