Rev 201: merge trunk at 200 in file:///v/home/vila/src/plugins/gtk/

[Vincent Ladeuil]

At file:///v/home/vila/src/plugins/gtk/

------------------------------------------------------------
revno: 201
revision-id: v.ladeuil+lp at free.fr-20070608090825-33s95fmwf6099c55
parent: v.ladeuil+lp at free.fr-20070608085548-z7xdi0k7a0k2oo5j
parent: szilveszter.farkas at gmail.com-20070522174644-b3rbgjht2tjhlnyd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: gtk
timestamp: Fri 2007-06-08 11:08:25 +0200
message:
  merge trunk at 200
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  branch.py                      branch.py-20060718221951-cc4ts04p4d84mjth-1
  checkout.py                    checkout.py-20060731181533-e0x1bgv7wum466kj-1
    ------------------------------------------------------------
    revno: 199.1.1
    revision-id: szilveszter.farkas at gmail.com-20070522174644-b3rbgjht2tjhlnyd
    parent: jelmer at samba.org-20070519162110-qw0pkevul1iet036
    parent: szilveszter.farkas at gmail.com-20070516140447-brpuza3ukcpko6q8
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: trunk.new
    timestamp: Tue 2007-05-22 19:46:44 +0200
    message:
      Merge the changes that were not merged by Jelmer.
    ------------------------------------------------------------
    revno: 195.1.8
    revision-id: szilveszter.farkas at gmail.com-20070516140447-brpuza3ukcpko6q8
    parent: szilveszter.farkas at gmail.com-20070516105603-22cy2qb5qxkw8zbc
    parent: szilveszter.farkas at gmail.com-20070516140221-v4871zk3fvnr143o
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: trunk
    timestamp: Wed 2007-05-16 15:04:47 +0100
    message:
      Merged the bookmarks-in-history branch.
      
      Feature suggested by Jelmer.
    ------------------------------------------------------------
    revno: 195.1.7.1.2
    revision-id: szilveszter.farkas at gmail.com-20070516140221-v4871zk3fvnr143o
    parent: szilveszter.farkas at gmail.com-20070516140046-0iqhzmarqln6hop3
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bookmarks-in-history
    timestamp: Wed 2007-05-16 15:02:21 +0100
    message:
      Added NEWS entry.
    ------------------------------------------------------------
    revno: 195.1.7.1.1
    revision-id: szilveszter.farkas at gmail.com-20070516140046-0iqhzmarqln6hop3
    parent: szilveszter.farkas at gmail.com-20070516105603-22cy2qb5qxkw8zbc
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: bookmarks-in-history
    timestamp: Wed 2007-05-16 15:00:46 +0100
    message:
      Add bookmarked locations to the branch history.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-05-19 16:21:10 +0000
+++ b/NEWS	2007-05-22 17:46:44 +0000
@@ -1,10 +1,12 @@
 0.17.0  UNRELEASED
 
  FEATURES
- 
+
+  * Bookmarked locations are now added to branch/checkout history (Szilveszter)
+
   * There are now more columns in the file list, and you can sort by them
   (Szilveszter)
-  
+
   * A location bar was added to the top of the file list. On Windows, the
   drive selector combo was moved here (Szilveszter)
 

=== modified file 'branch.py'
--- a/branch.py	2007-05-15 14:49:49 +0000
+++ b/branch.py	2007-05-16 14:00:46 +0000
@@ -33,6 +33,7 @@
 from dialog import error_dialog, info_dialog
 
 from history import UrlHistory
+from olive import Preferences
 
 class BranchDialog(gtk.Dialog):
     """ New implementation of the Branch dialog. """
@@ -107,8 +108,14 @@
     def _build_history(self):
         """ Build up the branch history. """
         self._combo_model = gtk.ListStore(str)
+        
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
+        
+        pref = Preferences()
+        for item in pref.get_bookmarks():
+            self._combo_model.append([ item ])
+        
         self._combo.set_model(self._combo_model)
         self._combo.set_text_column(0)
     
@@ -199,7 +206,6 @@
     
     def _on_combo_changed(self, widget, event):
         """ We try to get the last revision if focus lost. """
-        print "DEBUG: combo changed."
         rev = self._get_last_revno()
         if rev is None:
             self._entry_revision.set_text(_('N/A'))

=== modified file 'checkout.py'
--- a/checkout.py	2007-05-15 14:49:49 +0000
+++ b/checkout.py	2007-05-16 14:00:46 +0000
@@ -32,6 +32,7 @@
 from dialog import error_dialog
 
 from history import UrlHistory
+from olive import Preferences
 
 class CheckoutDialog(gtk.Dialog):
     """ New implementation of the Checkout dialog. """
@@ -109,8 +110,14 @@
     def _build_history(self):
         """ Build up the checkout history. """
         self._combo_model = gtk.ListStore(str)
+        
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
+        
+        pref = Preferences()
+        for item in pref.get_bookmarks():
+            self._combo_model.append([ item ])
+        
         self._combo.set_model(self._combo_model)
         self._combo.set_text_column(0)