[Pkg-bazaar-commits] ./bzr-gtk/unstable r39: [merge] jaq titlebar improvements

[David Allouche]

------------------------------------------------------------
revno: 39
committer: David Allouche <david.allouche at canonical.com>
branch nick: ddaa
timestamp: Mon 2006-05-08 14:37:19 +0200
message:
  [merge] jaq titlebar improvements
modified:
  branchwin.py
  diffwin.py
    ------------------------------------------------------------
    revno: 36.1.1
    committer: Jamie Wilkinson <jaq at spacepants.org>
    branch nick: bzrk.jaq
    timestamp: Thu 2006-03-30 14:25:49 +1100
    message:
      merge from Rob Collins
    modified:
      __init__.py
      branchwin.py
      bzrkapp.py
      graph.py
    ------------------------------------------------------------
    revno: 36.1.2
    committer: Jamie Wilkinson <jaq at spacepants.org>
    branch nick: bzrk.jaq
    timestamp: Thu 2006-03-30 19:08:12 +1100
    message:
      put the branch nick in the titlebar instead of the path basename (which didn't work anyway)
    modified:
      branchwin.py
    ------------------------------------------------------------
    revno: 36.1.3
    committer: Jamie Wilkinson <jaq at spacepants.org>
    branch nick: bzrk.jaq
    timestamp: Thu 2006-03-30 20:20:32 +1100
    message:
      put the revid and branch nick in the diff window title
    modified:
      diffwin.py
    ------------------------------------------------------------
    revno: 36.1.4
    committer: Jamie Wilkinson <jaq at spacepants.org>
    branch nick: bzrk.jaq
    timestamp: Wed 2006-04-05 18:38:53 +1000
    message:
      merge from robc's branch
    modified:
      branchwin.py
      graph.py
-------------- next part --------------
=== modified file 'branchwin.py'
--- a/branchwin.py	2006-04-03 02:31:25 +0000
+++ b/branchwin.py	2006-04-05 08:38:53 +0000
@@ -276,7 +276,7 @@
 
             last_lines = lines
 
-        self.set_title(os.path.basename(branch.base) + " - bzrk")
+        self.set_title(branch.nick + " - bzrk")
         self.treeview.set_model(self.model)
 
     def _treeview_cursor_cb(self, *args):

=== modified file 'diffwin.py'
--- a/diffwin.py	2006-02-20 21:44:46 +0000
+++ b/diffwin.py	2006-03-30 09:20:32 +0000
@@ -139,7 +139,7 @@
                 self.model.append(titer, [ path, path ])
 
         self.treeview.expand_all()
-        self.set_title(os.path.basename(branch.base) + " - bzrk diff")
+        self.set_title(revid + " - " + branch.nick + " - bzrk diff")
 
     def _treeview_cursor_cb(self, *args):
         """Callback for when the treeview cursor changes."""