[Pkg-bazaar-commits] ./bzr-gtk/unstable r200: Merge the changes that were not merged by Jelmer.
Szilveszter Farkas (Phanatic)
Szilveszter.Farkas at gmail.com
Fri Apr 10 07:49:06 UTC 2009
------------------------------------------------------------
revno: 200
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.
modified:
NEWS
branch.py
checkout.py
------------------------------------------------------------
revno: 195.7.1
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.
modified:
branch.py
checkout.py
------------------------------------------------------------
revno: 195.7.2
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.
modified:
NEWS
------------------------------------------------------------
revno: 195.1.8
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.
modified:
NEWS
branch.py
checkout.py
-------------- 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)
More information about the Pkg-bazaar-commits
mailing list