This patch fixes a typo and some confusing naming.
Cheers, Daniel
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# wilneunrdq3or9gm
# target_branch: file:///home/daniel/Projects/bzr-gtk/trunk/
# testament_sha1: caf3305d80af084f1a7902fc35717585bc84d7bc
# timestamp: 2008-01-20 20:55:32 +0100
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'viz/treemodel.py'
--- viz/treemodel.py 2007-12-20 23:43:57 +0000
+++ viz/treemodel.py 2008-01-20 19:55:06 +0000
@@ -15,17 +15,18 @@
from time import (strftime, localtime)
-REVID = 0
-NODE = 1
-LINES = 2
-LAST_LINES = 3
-REVNO = 4
-MESSAGE = 5
-COMMITER = 6
-TIMESTAMP = 7
-REVISION = 8
-PARENTS = 9
-CHILDREN = 10
+REVID = 0
+NODE = 1
+LINES = 2
+LAST_LINES = 3
+REVNO = 4
+SUMMARY = 5
+MESSAGE = 6
+COMMITTER = 7
+TIMESTAMP = 8
+REVISION = 9
+PARENTS = 10
+CHILDREN = 11
class TreeModel(gtk.GenericTreeModel):
@@ -40,20 +41,21 @@
return gtk.TREE_MODEL_LIST_ONLY
def on_get_n_columns(self):
- return 11
+ return 12
def on_get_column_type(self, index):
- if index == REVID: return gobject.TYPE_STRING
- if index == NODE: return gobject.TYPE_PYOBJECT
- if index == LINES: return gobject.TYPE_PYOBJECT
+ if index == REVID: return gobject.TYPE_STRING
+ if index == NODE: return gobject.TYPE_PYOBJECT
+ if index == LINES: return gobject.TYPE_PYOBJECT
if index == LAST_LINES: return gobject.TYPE_PYOBJECT
- if index == REVNO: return gobject.TYPE_STRING
- if index == MESSAGE: return gobject.TYPE_STRING
- if index == COMMITER: return gobject.TYPE_STRING
- if index == TIMESTAMP: return gobject.TYPE_STRING
- if index == REVISION: return gobject.TYPE_PYOBJECT
- if index == PARENTS: return gobject.TYPE_PYOBJECT
- if index == CHILDREN: return gobject.TYPE_PYOBJECT
+ if index == REVNO: return gobject.TYPE_STRING
+ if index == SUMMARY: return gobject.TYPE_STRING
+ if index == MESSAGE: return gobject.TYPE_STRING
+ if index == COMMITTER: return gobject.TYPE_STRING
+ if index == TIMESTAMP: return gobject.TYPE_STRING
+ if index == REVISION: return gobject.TYPE_PYOBJECT
+ if index == PARENTS: return gobject.TYPE_PYOBJECT
+ if index == CHILDREN: return gobject.TYPE_PYOBJECT
def on_get_iter(self, path):
return path[0]
@@ -90,8 +92,9 @@
revision = self.revisions[revid]
if column == REVISION: return revision
- if column == MESSAGE: return escape(revision.get_summary())
- if column == COMMITER: return re.sub('<[EMAIL PROTECTED]>', '',
+ if column == SUMMARY: return escape(revision.get_summary())
+ if column == MESSAGE: return escape(revision.message)
+ if column == COMMITTER: return re.sub('<[EMAIL PROTECTED]>', '',
revision.committer).strip(' ')
if column == TIMESTAMP:
return strftime("%Y-%m-%d %H:%M", localtime(revision.timestamp))
=== modified file 'viz/treeview.py'
--- viz/treeview.py 2007-12-02 17:04:48 +0000
+++ viz/treeview.py 2008-01-20 19:55:06 +0000
@@ -324,13 +324,13 @@
cell = gtk.CellRendererText()
cell.set_property("width-chars", 65)
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
- self.msg_column = gtk.TreeViewColumn("Message")
- self.msg_column.set_resizable(True)
- self.msg_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
- self.msg_column.set_fixed_width(cell.get_size(self.treeview)[2])
- self.msg_column.pack_start(cell, expand=True)
- self.msg_column.add_attribute(cell, "markup", treemodel.MESSAGE)
- self.treeview.append_column(self.msg_column)
+ self.summary_column = gtk.TreeViewColumn("Summary")
+ self.summary_column.set_resizable(True)
+ self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+ self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
+ self.summary_column.pack_start(cell, expand=True)
+ self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
+ self.treeview.append_column(self.summary_column)
cell = gtk.CellRendererText()
cell.set_property("width-chars", 15)
@@ -340,7 +340,7 @@
self.committer_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
self.committer_column.set_fixed_width(cell.get_size(self.treeview)[2])
self.committer_column.pack_start(cell, expand=True)
- self.committer_column.add_attribute(cell, "text", treemodel.COMMITER)
+ self.committer_column.add_attribute(cell, "text", treemodel.COMMITTER)
self.treeview.append_column(self.committer_column)
cell = gtk.CellRendererText()
# Begin bundle
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
signature.asc
Description: This is a digitally signed message part
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
