Replaced --tray command option with "Start in tray" preference.

scripts/deluge

@@ -34,10 +34,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 gettext
-import locale
 import os
-import os.path
 from optparse import OptionParser
 import re
 import sys
@@ -60,10 +57,8 @@ import deluge.common
 import deluge.core
 import deluge.interface
 
-parser = OptionParser(usage="%prog [options] [actions]", version=deluge.common.PROGRAM_VERSION)
+parser = OptionParser(usage="%prog [options] [torrents to add]", 
-parser.add_option("--tray", dest="tray", help="start Deluge hidden in system tray",
+                      version=deluge.common.PROGRAM_VERSION)
-                        metavar="TRAY", action="store_true")
-
 (options, args) = parser.parse_args()
 
 def upgrade_old_persistent_state():
@@ -126,7 +121,7 @@ def start_deluge():
 
     interface = deluge.interface.DelugeGTK()
 
-    interface.start(options.tray, get_cmd_line_torrents())
+    interface.start(get_cmd_line_torrents())
 
 if dbus_imported:
     bus = dbus.SessionBus()

src/dialogs.py

@@ -82,6 +82,7 @@ class PreferencesDlg:
             self.glade.get_widget("chk_new_releases").set_active(self.preferences.get("new_releases"))
             self.glade.get_widget("chk_use_tray").set_active(self.preferences.get("enable_system_tray"))
             self.glade.get_widget("chk_min_on_close").set_active(self.preferences.get("close_to_tray"))
+            self.glade.get_widget("chk_start_in_tray").set_active(self.preferences.get("start_in_tray"))
             self.glade.get_widget("chk_lock_tray").set_active(self.preferences.get("lock_tray"))
             self.glade.get_widget("txt_tray_passwd").set_text(self.preferences.get("tray_passwd"))
             self.glade.get_widget("txt_peer_proxy_hostname").set_text(self.preferences.get("peer_proxy_hostname"))
@@ -134,22 +135,21 @@ class PreferencesDlg:
                 self.glade.get_widget("radio_ask_save").set_active(True)
                 self.glade.get_widget("chk_move_completed").set_sensitive(False)
                 self.glade.get_widget("finished_path_button").set_sensitive(False)
-            if self.glade.get_widget('chk_use_tray').get_active():
+                
-                self.glade.get_widget('chk_min_on_close').set_sensitive(True)
+            self.glade.get_widget('chk_min_on_close').set_sensitive(
-                self.glade.get_widget('chk_lock_tray').set_sensitive(True)
+                self.glade.get_widget('chk_use_tray').get_active())
-            else:
+            self.glade.get_widget('chk_start_in_tray').set_sensitive(
-                self.glade.get_widget('chk_min_on_close').set_sensitive(False)
+                self.glade.get_widget('chk_use_tray').get_active())
-                self.glade.get_widget('chk_lock_tray').set_sensitive(False)
+            self.glade.get_widget('chk_lock_tray').set_sensitive(
-            if self.glade.get_widget('chk_lock_tray').get_active():
+                self.glade.get_widget('chk_use_tray').get_active())
-                self.glade.get_widget('txt_tray_passwd').set_sensitive(True)
+            self.glade.get_widget('txt_tray_passwd').set_sensitive(
-            else:
+                self.glade.get_widget('chk_use_tray').get_active() and \
-                self.glade.get_widget('txt_tray_passwd').set_sensitive(False)
+                    self.glade.get_widget('chk_lock_tray').get_active())
-            if self.glade.get_widget('chk_random_port').get_active():
+            
-                self.glade.get_widget('spin_port_min').set_sensitive(False)
+            self.glade.get_widget('spin_port_min').set_sensitive(
-                self.glade.get_widget('spin_port_max').set_sensitive(False)                
+                not self.glade.get_widget('chk_random_port').get_active())
-            else:
+            self.glade.get_widget('spin_port_max').set_sensitive(
-                self.glade.get_widget('spin_port_min').set_sensitive(True)
+                not self.glade.get_widget('chk_random_port').get_active())                
-                self.glade.get_widget('spin_port_max').set_sensitive(True)
 
             self.glade.get_widget("ok_button").connect("clicked", 
                                                    self.ok_clicked, interface)
@@ -187,6 +187,7 @@ class PreferencesDlg:
         self.preferences.set("use_utpex", self.glade.get_widget("chk_utpex").get_active())
         self.preferences.set("enable_system_tray", self.glade.get_widget("chk_use_tray").get_active())
         self.preferences.set("close_to_tray", self.glade.get_widget("chk_min_on_close").get_active())
+        self.preferences.set("start_in_tray", self.glade.get_widget("chk_start_in_tray").get_active())
         self.preferences.set("lock_tray", self.glade.get_widget("chk_lock_tray").get_active())
         self.preferences.set("tray_passwd", self.glade.get_widget("txt_tray_passwd").get_text())
         self.preferences.set("tracker_proxy_username", self.glade.get_widget("txt_tracker_proxy_username").get_text())
@@ -277,10 +278,10 @@ class PreferencesDlg:
                     self.glade.get_widget(x).set_sensitive(value)
         elif widget == self.glade.get_widget('chk_use_tray'):
             self.glade.get_widget('chk_min_on_close').set_sensitive(value)
+            self.glade.get_widget('chk_start_in_tray').set_sensitive(value)
             self.glade.get_widget('chk_lock_tray').set_sensitive(value)
-            if not value:
+            self.glade.get_widget('txt_tray_passwd').set_sensitive(value and \
-                self.glade.get_widget('chk_min_on_close').set_active(value)
+                self.glade.get_widget('chk_lock_tray').get_active())
-                self.glade.get_widget('chk_lock_tray').set_active(value)
         elif widget == self.glade.get_widget('chk_lock_tray'):
             self.glade.get_widget('txt_tray_passwd').set_sensitive(value)
         elif widget == self.glade.get_widget('chk_random_port'):

src/interface.py

@@ -816,11 +816,12 @@ class DelugeGTK:
         return rlist
     
     ## Start the timer that updates the interface
-    def start(self, start_in_tray=False, cmd_line_torrents=None):
+    def start(self, cmd_line_torrents=None):
         if cmd_line_torrents is None:
             cmd_line_torrents = []
         
-        if not(start_in_tray and self.config.get("enable_system_tray") and 
+        if not(self.config.get("start_in_tray") and \
+               self.config.get("enable_system_tray") and 
                self.has_tray) and not self.window.get_property("visible"):
             print "Showing window"
             self.window.show()

src/pref.py

@@ -111,6 +111,7 @@ DEFAULT_PREFS = {
     "show_status" : True,
     "show_toolbar" : True,
     "show_ul" : True,
+    "start_in_tray" : False,
     "tray_downloadspeedlist" : [5.0, 10.0, 30.0, 80.0, 300.0],
     "tray_passwd" : "",
     "tray_uploadspeedlist" : [5.0, 10.0, 30.0, 80.0, 300.0],