Rev 552: Merge trunk. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 552
revision-id: jelmer at samba.org-20080718124412-kzwx2807j7nd3mkw
parent: jelmer at samba.org-20080718124000-wlz62eeu7z3hjer0
parent: colbrac at xs4all.nl-20080718123547-k5hpa6ulzxg8gv62
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 14:44:12 +0200
message:
  Merge trunk.
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
    ------------------------------------------------------------
    revno: 549.1.1
    revision-id: colbrac at xs4all.nl-20080718123547-k5hpa6ulzxg8gv62
    parent: jelmer at samba.org-20080718122956-27468cxu2b613ib8
    parent: colbrac at xs4all.nl-20080710115704-qcml4fx2dqn00mat
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: trunk
    timestamp: Fri 2008-07-18 14:35:47 +0200
    message:
      Merge sort bookmarks by title
    modified:
      NEWS                           news-20070325173539-3va57o99cz3o57xe-1
      olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
    ------------------------------------------------------------
    revno: 531.8.2
    revision-id: colbrac at xs4all.nl-20080710115704-qcml4fx2dqn00mat
    parent: colbrac at xs4all.nl-20080710114416-onk4y90cr3l5mwyq
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: sort-bookmarks
    timestamp: Thu 2008-07-10 13:57:04 +0200
    message:
      And also for refresh_left method
    modified:
      olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
    ------------------------------------------------------------
    revno: 531.8.1
    revision-id: colbrac at xs4all.nl-20080710114416-onk4y90cr3l5mwyq
    parent: jelmer at samba.org-20080701215625-udvespwg6srjo252
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: sort-bookmarks
    timestamp: Thu 2008-07-10 13:44:16 +0200
    message:
      Olive: Sort bookmarks by title
    modified:
      olive/__init__.py              __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
=== modified file 'NEWS'
--- a/NEWS	2008-07-18 12:29:56 +0000
+++ b/NEWS	2008-07-18 12:35:47 +0000
@@ -19,6 +19,8 @@
 
   * Made bzr vis remember window and panel sizes.  (Scott Scriven)
 
+  * Sort Olive bookmarks by title (Jasper Groenewegen)
+
  BUG FIXES
 
   * Replace _() calls by _i18n() calls. (Vincent Ladeuil, #187283)

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-07-18 11:06:07 +0000
+++ b/olive/__init__.py	2008-07-18 12:35:47 +0000
@@ -966,9 +966,12 @@
         
         # Add them to the TreeStore
         titer = treestore.append(None, [_i18n('Bookmarks'), None])
-        for item in bookmarks:
-            title = self.pref.get_bookmark_title(item)
-            treestore.append(titer, [title, item])
+
+        # Get titles and sort by title
+        bookmarks = [[self.pref.get_bookmark_title(item), item] for item in bookmarks]
+        bookmarks.sort()
+        for title_item in bookmarks:
+            treestore.append(titer, title_item)
         
         # Create the column and add it to the TreeView
         self.treeview_left.set_model(treestore)
@@ -1264,10 +1267,13 @@
 
         # Add them to the TreeStore
         titer = treestore.append(None, [_i18n('Bookmarks'), None])
-        for item in bookmarks:
-            title = self.pref.get_bookmark_title(item)
-            treestore.append(titer, [title, item])
 
+        # Get titles and sort by title
+        bookmarks = [[self.pref.get_bookmark_title(item), item] for item in bookmarks]
+        bookmarks.sort()
+        for title_item in bookmarks:
+            treestore.append(titer, title_item)
+        
         # Add the TreeStore to the TreeView
         self.treeview_left.set_model(treestore)