diff --git a/dcommon.py b/dcommon.py index 6c479fec1..30ff9a7a0 100644 --- a/dcommon.py +++ b/dcommon.py @@ -6,7 +6,7 @@ import sys, os, webbrowser -PROGRAM_NAME = "Deluge Torrent" +PROGRAM_NAME = "Deluge" PROGRAM_VERSION = "0.5" DELUGE_DIR = os.path.abspath(os.path.dirname(sys.argv[0])) GLADE_DIR = DELUGE_DIR + "/glade" diff --git a/delugegtk.py b/delugegtk.py index 54eb5beca..712acc4bb 100755 --- a/delugegtk.py +++ b/delugegtk.py @@ -27,6 +27,9 @@ class DelugeGTK: "new_torrent": self.new_torrent, "add_torrent": self.add_torrent, "pref_clicked": self.show_preferences_dialog, + "plugins_clicked": self.show_plugins_dialog, + ## Torrent Menu + "show_info": self.show_info_pane, ## Help Menu "show_about_dialog": self.show_about_dialog, } @@ -43,6 +46,7 @@ class DelugeGTK: dcommon.get_pixmap("deluge256.png"))) ## Create the preferences dialog self.prf = self.wtree.get_widget("pref_dialog") + self.prf.set_icon_from_file(dcommon.get_pixmap("deluge32.png")) @@ -52,15 +56,31 @@ class DelugeGTK: def add_torrent(self, obj): pass + def show_preferences_dialog(self, obj): + self.prf.show_all() + self.wtree.get_widget("pref_notebook").set_current_page(0) + self.prf.run() + self.prf.hide_all() + + def show_plugins_dialog(self, obj): + self.prf.show_all() + self.wtree.get_widget("pref_notebook").set_current_page(2) + self.prf.run() + self.prf.hide_all() + + def show_info_pane(self, obj): + if(obj.get_active()): + self.wtree.get_widget("torrent_info").show() + else: + self.wtree.get_widget("torrent_info").hide() + + + def show_about_dialog(self, obj): self.abt.show_all() self.abt.run() self.abt.hide_all() - - def show_preferences_dialog(self, obj): - self.prf.show_all() - self.prf.run() - self.prf.hide_all() + if __name__ == "__main__": diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade index 44890240f..ad555ab58 100644 --- a/glade/delugegtk.glade +++ b/glade/delugegtk.glade @@ -5,6 +5,8 @@ True Deluge + 640 + 480 @@ -14,110 +16,506 @@ 4 3 - + True - GTK_TOOLBAR_BOTH_HORIZ - 1 - 2 - 1 - 2 - GTK_FILL + 3 + 3 + 4 + - + True - GTK_TOOLBAR_BOTH_HORIZ - False - + True - Add Torrent - True - gtk-add - Add Torrent - + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + True + False + + + + + False + - + True - Remove Torrent - True - gtk-remove - Remove Torrent - - - - - - True - - - - - True - Update Tracker - True - gtk-refresh - Update Tracker - - - - - - True - Clear Finished - True - gtk-clear - Clear Finished Torrents - - - - - - True - - - - - True - Force Pause/Resume Torrent - True - gtk-media-pause - Force Pause/Resume Torrent - - - - - - True - - - - - True - Move Up - True - gtk-go-up - Queue Torrent Up - - - - - - True - Move Down - True - gtk-go-down - Queue Torrent Down - + True + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + + + True + 10 + 9 + 4 + + + + + + + + + True + 0 + True + + + 1 + 4 + + + + + True + 0 + <b>Total Size:</b> + True + + + 1 + 2 + + + + + True + 0 + <b>Total Downloaded:</b> + True + + + 2 + 3 + + + + + True + 0 + <b>Percentage Done:</b> + True + + + 3 + 4 + + + + + True + 0 + <b>Downloaded this session:</b> + True + + + 4 + 5 + + + + + True + 0 + + + 1 + 2 + 1 + 2 + + + + + True + 0 + + + 1 + 2 + 2 + 3 + + + + + True + 0 + + + 1 + 2 + 3 + 4 + + + + + True + 0 + + + 1 + 2 + 4 + 5 + + + + + True + 0 + <b>Tracker:</b> + True + + + 5 + 6 + + + + + True + 0 + <b>Tracker Response:</b> + True + + + 6 + 7 + + + + + True + 0 + <b>Tracker Status:</b> + True + + + 7 + 8 + + + + + True + 0 + + + 1 + 2 + 7 + 8 + + + + + True + 0 + <b>Next Announce:</b> + True + + + 2 + 3 + 7 + 8 + + + + + True + 0 + + + 3 + 4 + 7 + 8 + + + + + True + 0 + <b>Pieces:</b> + True + + + 2 + 3 + 1 + 2 + + + + + True + 0 + <b>Total Uploaded:</b> + True + + + 2 + 3 + 2 + 3 + + + + + True + 0 + + + 3 + 4 + 1 + 2 + + + + + True + 0 + + + 3 + 4 + 2 + 3 + + + + + True + 0 + <b>Share Ratio:</b> + True + + + 2 + 3 + 3 + 4 + + + + + True + 0 + <b>Uploaded This Session:</b> + True + + + 2 + 3 + 4 + 5 + + + + + True + 0 + + + 3 + 4 + 3 + 4 + + + + + True + 0 + + + 3 + 4 + 4 + 5 + + + + + True + 0 + + + 1 + 4 + 5 + 6 + + + + + True + 0 + + + 1 + 4 + 6 + 7 + + + + + True + 0 + <b>Name:</b> + True + + + + + True + 0 + <b>Use compact storage allocation:</b> + True + + + 8 + 9 + + + + + True + 0 + + + 1 + 2 + 8 + 9 + + + + + + + + + False + + + + + True + Information + + + tab + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + + + + + 1 + False + + + + + True + Files + + + tab + 1 + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + + + + + 2 + False + + + + + True + Peers + + + tab + 2 + False + False + + + + False + + 3 + 2 + 3 + + + + + True + GTK_TOOLBAR_BOTH_HORIZ + False + + + 2 + 3 1 2 @@ -199,7 +597,7 @@ True _Manage Plugins True - + True @@ -236,12 +634,12 @@ True - + True True Show Info Pane True - + @@ -367,14 +765,97 @@ - + True GTK_TOOLBAR_BOTH_HORIZ False + + + True + Add Torrent + True + gtk-add + Add Torrent + + + + + + True + Remove Torrent + True + gtk-remove + Remove Torrent + + + + + + True + + + + + True + Update Tracker + True + gtk-refresh + Update Tracker + + + + + + True + Clear Finished + True + gtk-clear + Clear Finished Torrents + + + + + + True + + + + + True + Force Pause/Resume Torrent + True + gtk-media-pause + Force Pause/Resume Torrent + + + + + + True + + + + + True + Move Up + True + gtk-go-up + Queue Torrent Up + + + + + + True + Move Down + True + gtk-go-down + Queue Torrent Down + + + - 2 - 3 1 2 @@ -382,502 +863,25 @@ - + True - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - True - False - - - - - - False - - - - - True - True - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - True - 10 - 9 - 4 - - - - - - - - - True - 0 - - - 1 - 2 - 8 - 9 - - - - - True - 0 - <b>Use compact storage allocation:</b> - True - - - 8 - 9 - - - - - True - 0 - <b>Name:</b> - True - - - - - True - 0 - - - 1 - 4 - 6 - 7 - - - - - True - 0 - - - 1 - 4 - 5 - 6 - - - - - True - 0 - - - 3 - 4 - 4 - 5 - - - - - True - 0 - - - 3 - 4 - 3 - 4 - - - - - True - 0 - <b>Uploaded This Session:</b> - True - - - 2 - 3 - 4 - 5 - - - - - True - 0 - <b>Share Ratio:</b> - True - - - 2 - 3 - 3 - 4 - - - - - True - 0 - - - 3 - 4 - 2 - 3 - - - - - True - 0 - - - 3 - 4 - 1 - 2 - - - - - True - 0 - <b>Total Uploaded:</b> - True - - - 2 - 3 - 2 - 3 - - - - - True - 0 - <b>Pieces:</b> - True - - - 2 - 3 - 1 - 2 - - - - - True - 0 - - - 3 - 4 - 7 - 8 - - - - - True - 0 - <b>Next Announce:</b> - True - - - 2 - 3 - 7 - 8 - - - - - True - 0 - - - 1 - 2 - 7 - 8 - - - - - True - 0 - <b>Tracker Status:</b> - True - - - 7 - 8 - - - - - True - 0 - <b>Tracker Response:</b> - True - - - 6 - 7 - - - - - True - 0 - <b>Tracker:</b> - True - - - 5 - 6 - - - - - True - 0 - - - 1 - 2 - 4 - 5 - - - - - True - 0 - - - 1 - 2 - 3 - 4 - - - - - True - 0 - - - 1 - 2 - 2 - 3 - - - - - True - 0 - - - 1 - 2 - 1 - 2 - - - - - True - 0 - <b>Downloaded this session:</b> - True - - - 4 - 5 - - - - - True - 0 - <b>Percentage Done:</b> - True - - - 3 - 4 - - - - - True - 0 - <b>Total Downloaded:</b> - True - - - 2 - 3 - - - - - True - 0 - <b>Total Size:</b> - True - - - 1 - 2 - - - - - True - 0 - True - - - 1 - 4 - - - - - - - - - False - - - - - True - Information - - - tab - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - - - 1 - False - - - - - True - Files - - - tab - 1 - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - - - - - 2 - False - - - - - True - Peers - - - tab - 2 - False - False - - - - - False - - + GTK_TOOLBAR_BOTH_HORIZ - 3 - 2 - 3 - - - - - True - - - 3 - 3 - 4 - + 1 + 2 + 1 + 2 + GTK_FILL + 480 5 + Preferences Dialog False @@ -885,10 +889,10 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK 2 - + True - + True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC @@ -898,6 +902,53 @@ True + GTK_RESIZE_IMMEDIATE + + + True + + + True + 3 + 2 + + + + + + + + + + + + + + + True + Minimize to tray on close + True + + + 2 + + + + + + + True + Options + + + label_item + + + + + False + + True @@ -906,27 +957,6 @@ True 2 2 - - - True - Ask me where to save each download - True - - - 2 - - - - - True - Save all downloads to: - True - - - 1 - 2 - - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER @@ -939,6 +969,28 @@ 2 + + + True + Save all downloads to: + True + radio_ask_save + + + 1 + 2 + + + + + True + Ask me where to save each download + True + + + 2 + + @@ -953,23 +1005,18 @@ False + 1 True + True True 1 2 - - - True - Stop seeding torrents when their share ratio reaches: - True - - True @@ -984,6 +1031,14 @@ 2 + + + True + Stop seeding torrents when +their share ratio reaches: + True + + @@ -998,16 +1053,17 @@ False - 1 + 2 True + True True - Use compact storage allocation (Saves space) + Use compact storage allocation True @@ -1023,9 +1079,15 @@ False - 2 + 3 + + + + + + @@ -1047,198 +1109,210 @@ - + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC - + True - + True - 2 - 4 - + True - Test Port + + + True + 2 + 4 + + + + + + True + Try from: + + + + + True + to: + + + 2 + 3 + + + + + True + True + 0 0 100 1 10 10 + + + 1 + 2 + + + + + True + True + 0 0 100 1 10 10 + + + 3 + 4 + + + + + True + Active port: + + + 1 + 2 + 1 + 2 + + + + + True + label + + + 2 + 3 + 1 + 2 + + + + + True + Test Port + + + 3 + 4 + 1 + 2 + + + + + + + True + TCP Port + + + label_item + + - 3 - 4 - 1 - 2 + False - + True - label + + + True + 4 + 2 + + + + + + + + + + + + + + + True + True + 0 0 100 1 10 10 + + + 1 + 2 + 3 + 4 + + + + + True + True + 0 0 100 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + True + True + 0 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + True + True + 0 0 100 1 10 10 + + + 1 + 2 + + + + + + + True + Bandwidth + + + label_item + + - 2 - 3 - 1 - 2 + False + 1 - - - True - Active port: - - - 1 - 2 - 1 - 2 - - - - - True - True - 0 0 100 1 10 10 - - - 3 - 4 - - - - - True - True - 0 0 100 1 10 10 - - - 1 - 2 - - - - - True - to: - - - 2 - 3 - - - - - True - Try from: - - - - - True - TCP Port - - - label_item - - - - False - - - - - True - - - True - 4 - 2 - - - - - - - - - - - - - - - True - True - 0 0 100 1 10 10 - - - 1 - 2 - - - - - True - True - 0 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - True - True - 0 0 100 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - True - True - 0 0 100 1 10 10 - - - 1 - 2 - 3 - 4 - - - - - - - True - Bandwidth - - - label_item - - - - - False - 1 - - - - @@ -1259,22 +1333,16 @@ - + True 2 2 - + True - - - True - - - 1 - 2 + 2 @@ -1316,11 +1384,16 @@ - + True + False + GTK_WRAP_WORD - 2 + 1 + 2 + 10 + 10