34
37
# Use three-quarters of the screen by default
35
38
screen = self.get_screen()
36
monitor = screen.get_monitor_geometry(0)
37
width = int(monitor.width * 0.75)
38
height = int(monitor.height * 0.75)
39
width = int(screen.get_width() * 0.75)
40
height = int(screen.get_height() * 0.75)
39
41
self.set_default_size(width, height)
42
44
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
43
45
self.set_icon(icon)
45
self.accel_group = gtk.AccelGroup()
46
self.add_accel_group(self.accel_group)
50
49
def construct(self):
51
50
"""Construct the window contents."""
52
vbox = gtk.VBox(spacing=0)
55
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
58
paned.pack1(self.construct_top(), resize=True, shrink=False)
59
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
61
vbox.pack_start(paned, expand=True, fill=True)
62
vbox.set_focus_child(paned)
66
def construct_top(self):
67
"""Construct the top-half of the window."""
68
51
scrollwin = gtk.ScrolledWindow()
69
52
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
70
53
scrollwin.set_shadow_type(gtk.SHADOW_IN)
54
scrollwin.set_border_width(12)
73
58
self.treeview = gtk.TreeView()
74
59
self.treeview.set_rules_hint(True)
75
60
self.treeview.set_search_column(4)
76
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
78
61
scrollwin.add(self.treeview)
79
62
self.treeview.show()
81
64
cell = CellRendererGraph()
82
65
column = gtk.TreeViewColumn()
83
column.set_resizable(True)
66
column.set_resizable(False)
84
67
column.pack_start(cell, expand=False)
85
68
column.add_attribute(cell, "node", 1)
86
69
column.add_attribute(cell, "in-lines", 2)
113
96
column.add_attribute(cell, "text", 6)
114
97
self.treeview.append_column(column)
118
def construct_navigation(self):
119
"""Construct the navigation buttons."""
121
frame.set_shadow_type(gtk.SHADOW_OUT)
124
hbox = gtk.HBox(spacing=12)
128
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
129
self.back_button.set_relief(gtk.RELIEF_NONE)
130
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
132
self.back_button.connect("clicked", self._back_clicked_cb)
133
hbox.pack_start(self.back_button, expand=False, fill=True)
134
self.back_button.show()
136
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
137
self.fwd_button.set_relief(gtk.RELIEF_NONE)
138
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
140
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
141
hbox.pack_start(self.fwd_button, expand=False, fill=True)
142
self.fwd_button.show()
146
def construct_bottom(self):
147
"""Construct the bottom half of the window."""
148
from bzrlib.plugins.gtk.logview import LogView
149
self.logview = LogView()
150
self.logview.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
151
self.logview.set_shadow_type(gtk.SHADOW_NONE)
152
(width, height) = self.get_size()
153
self.logview.set_size_request(width, int(height / 2.5))
155
self.logview.set_show_callback(self._show_clicked_cb)
156
self.logview.set_go_callback(self._go_clicked_cb)
159
def set_branch(self, branch, start, maxnum):
99
def set_branch(self, branch, start):
160
100
"""Set the branch and start position for this window.
162
102
Creates a new TreeModel and populates it with information about
163
103
the new branch before updating the window title and model of the
168
106
# [ revision, node, last_lines, lines, message, committer, timestamp ]
169
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
170
gobject.TYPE_PYOBJECT,
171
gobject.TYPE_PYOBJECT,
172
gobject.TYPE_PYOBJECT,
107
model = gtk.ListStore(gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
108
gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
178
(self.revisions, colours, self.children, self.parent_ids,
179
merge_sorted) = distances(branch, start)
180
for (index, (revision, node, lines)) in enumerate(graph(
181
self.revisions, colours, merge_sorted)):
182
# FIXME: at this point we should be able to show the graph order
183
# and lines with no message or commit data - and then incrementally
184
# fill the timestamp, committer etc data as desired.
112
for revision, node, lines in graph(branch, start):
185
113
message = revision.message.split("\n")[0]
186
114
if revision.committer is not None:
187
115
timestamp = format_date(revision.timestamp, revision.timezone)
190
self.model.append([revision, node, last_lines, lines,
191
message, revision.committer, timestamp])
192
self.index[revision] = index
119
model.append([ revision, node, last_lines, lines,
120
message, revision.committer, timestamp ])
193
121
last_lines = lines
194
if maxnum is not None and index > maxnum:
197
self.set_title(branch.nick + " - bzrk")
198
self.treeview.set_model(self.model)
200
def _treeview_cursor_cb(self, *args):
201
"""Callback for when the treeview cursor changes."""
202
(path, col) = self.treeview.get_cursor()
203
revision = self.model[path][0]
205
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
206
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
207
self.logview.set_revision(revision)
209
def _back_clicked_cb(self, *args):
210
"""Callback for when the back button is clicked."""
211
(path, col) = self.treeview.get_cursor()
212
revision = self.model[path][0]
213
if not len(self.parent_ids[revision]):
216
for parent_id in self.parent_ids[revision]:
217
parent = self.revisions[parent_id]
218
if same_branch(revision, parent):
219
self.treeview.set_cursor(self.index[parent])
222
next = self.revisions[self.parent_ids[revision][0]]
223
self.treeview.set_cursor(self.index[next])
224
self.treeview.grab_focus()
226
def _fwd_clicked_cb(self, *args):
227
"""Callback for when the forward button is clicked."""
228
(path, col) = self.treeview.get_cursor()
229
revision = self.model[path][0]
230
if not len(self.children[revision]):
233
for child in self.children[revision]:
234
if same_branch(child, revision):
235
self.treeview.set_cursor(self.index[child])
238
prev = list(self.children[revision])[0]
239
self.treeview.set_cursor(self.index[prev])
240
self.treeview.grab_focus()
242
def _go_clicked_cb(self, revid):
243
"""Callback for when the go button for a parent is clicked."""
244
self.treeview.set_cursor(self.index[self.revisions[revid]])
245
self.treeview.grab_focus()
247
def show_diff(self, branch, revid, parentid):
248
"""Open a new window to show a diff between the given revisions."""
249
from bzrlib.plugins.gtk.diff import DiffWindow
250
window = DiffWindow()
251
rev_tree = branch.repository.revision_tree(revid)
252
parent_tree = branch.repository.revision_tree(parentid)
253
description = revid + " - " + branch.nick
254
window.set_diff(description, rev_tree, parent_tree)
257
def _show_clicked_cb(self, revid, parentid):
258
"""Callback for when the show button for a parent is clicked."""
259
self.show_diff(self.branch, revid, parentid)
260
self.treeview.grab_focus()
262
def _treeview_row_activated_cb(self, widget, path, col):
263
# TODO: more than one parent
264
"""Callback for when a treeview row gets activated."""
265
revision = self.model[path][0]
266
if len(self.parent_ids[revision]) == 0:
267
# Ignore revisions without parent
269
parent_id = self.parent_ids[revision][0]
270
self.show_diff(self.branch, revision.revision_id, parent_id)
271
self.treeview.grab_focus()
123
self.set_title(os.path.basename(branch.base) + " - bzrk")
124
self.treeview.set_model(model)
added
removed
branchwin.py
