Module: deluge
Branch: 1.3-stable
Commit: 14c3655ba1bbac19e002d5a3a93f2da384b06643

Author: Andrew Resch <[email protected]>
Date:   Wed May 25 13:27:16 2011 -0700

Properly show the 'Checking Resume Data' state instead of just 7
Show the checking icon for torrents in the 'Checking Resume Data' state

---

 ChangeLog                      |    7 +++++++
 deluge/core/torrent.py         |    5 ++++-
 deluge/ui/gtkui/torrentview.py |    3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4b2a09..37d1766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+=== Deluge 1.3.3 (In Development) ===
+==== Core ====
+       * Properly show the 'Checking Resume Data' state instead of just 7
+
+==== GtkUI ===
+       * Show the checking icon for torrents in the 'Checking Resume Data' 
state
+
 === Deluge 1.3.2 (24 May 2011) ===
 ==== Core ====
        * #1527: Fix Converting unicode to unicode error in move_storage
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index f1dd5e7..2e657a7 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -346,7 +346,10 @@ class Torrent(object):
 
         # Set self.state to the ltstate right away just incase we don't hit 
some
         # of the logic below
-        self.state = str(ltstate)
+        if ltstate in LTSTATE:
+            self.state = LTSTATE[ltstate]
+        else:
+            self.state = str(ltstate)
 
         log.debug("set_state_based_on_ltstate: %s", 
deluge.common.LT_TORRENT_STATE[ltstate])
         log.debug("session.is_paused: %s", 
component.get("Core").session.is_paused())
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 07871c9..9fa47e4 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -75,7 +75,8 @@ ICON_STATE = {
     "Seeding": icon_seeding,
     "Paused": icon_inactive,
     "Error": icon_alert,
-    "Queued": icon_queued
+    "Queued": icon_queued,
+    "Checking Resume Data": icon_checking
 }
 
 def cell_data_statusicon(column, cell, model, row, data):

-- 
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.

Reply via email to