/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to annotate/gannotate.py

  • Committer: Gary van der Merwe
  • Date: 2007-08-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
28
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
29
29
 
30
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
31
 
from logview import LogView
 
31
from bzrlib.plugins.gtk.logview import LogView
32
32
 
33
33
 
34
34
(
55
55
 
56
56
        self._create()
57
57
        self.revisions = {}
 
58
        self.history = []
 
59
        self._no_back = set()
58
60
 
59
61
    def annotate(self, tree, branch, file_id):
60
62
        self.annotations = []
139
141
        current_revision.timestamp = time.time()
140
142
        current_revision.message = '[Not yet committed]'
141
143
        current_revision.parent_ids = tree.get_parent_ids()
 
144
        current_revision.properties['branch-nick'] = self.branch.nick
142
145
        current_revno = '%d?' % (self.branch.revno() + 1)
143
146
        repository = self.branch.repository
144
147
        if self.revision_id == CURRENT_REVISION:
176
179
            return None
177
180
        return self.annomodel[path][REVISION_ID_COL]
178
181
 
179
 
    def _show_log(self, w):
 
182
    def _activate_selected_revision(self, w):
180
183
        rev_id = self._selected_revision()
181
184
        if rev_id is None:
182
185
            return
183
 
        self.logview.set_revision(self.revisions[rev_id])
 
186
        selected = self.revisions[rev_id]
 
187
        self.logview.set_revision(selected)
 
188
        if (len(selected.parent_ids) != 0 and selected.parent_ids[0] not in
 
189
            self._no_back):
 
190
            enable_back = True
 
191
        else:
 
192
            enable_back = False
 
193
        self.back_button.set_sensitive(enable_back)
184
194
 
185
195
    def _create(self):
186
196
        self.logview = self._create_log_view()
187
197
        self.annoview = self._create_annotate_view()
188
198
 
189
 
        vbox = gtk.VBox(False, 12)
190
 
        vbox.set_border_width(12)
 
199
        vbox = gtk.VBox(False)
191
200
        vbox.show()
192
201
 
193
202
        sw = gtk.ScrolledWindow()
196
205
        sw.add(self.annoview)
197
206
        self.annoview.gwindow = self
198
207
        sw.show()
 
208
 
 
209
        swbox = gtk.VBox()
 
210
        swbox.pack_start(sw)
 
211
        swbox.show()
 
212
 
 
213
        hbox = gtk.HBox(False, 6)
 
214
        self.back_button = self._create_back_button()
 
215
        hbox.pack_start(self.back_button, expand=False, fill=True)
 
216
        self.forward_button = self._create_forward_button()
 
217
        hbox.pack_start(self.forward_button, expand=False, fill=True)
 
218
        hbox.show()
 
219
        vbox.pack_start(hbox, expand=False, fill=True)
199
220
        
200
221
        self.pane = pane = gtk.VPaned()
201
 
        pane.add1(sw)
 
222
        pane.add1(swbox)
202
223
        pane.add2(self.logview)
203
224
        pane.show()
204
225
        vbox.pack_start(pane, expand=True, fill=True)
205
226
 
206
227
        self._search = SearchBox()
207
 
        vbox.pack_start(self._search, expand=False, fill=True)
 
228
        swbox.pack_start(self._search, expand=False, fill=True)
208
229
        accels = gtk.AccelGroup()
209
230
        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
210
231
                             gtk.ACCEL_LOCKED,
214
235
                             self._search_by_line)
215
236
        self.add_accel_group(accels)
216
237
 
217
 
        hbox = gtk.HBox(True, 6)
218
 
        hbox.pack_start(self._create_prev_button(), expand=False, fill=True)
219
 
        hbox.pack_end(self._create_button_box(), expand=False, fill=True)
220
 
        hbox.show()
221
 
        vbox.pack_start(hbox, expand=False, fill=True)
222
 
 
223
238
        self.add(vbox)
224
239
 
225
240
    def _search_by_text(self, accel_group, window, key, modifiers):
243
258
                tree2 = repository.revision_tree(revision.parent_ids[0])
244
259
            else:
245
260
                tree2 = repository.revision_tree(NULL_REVISION)
246
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
261
        from bzrlib.plugins.gtk.diff import DiffWindow
247
262
        window = DiffWindow()
248
263
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
249
264
        window.set_file(tree1.id2path(self.file_id))
253
268
    def _create_annotate_view(self):
254
269
        tv = gtk.TreeView()
255
270
        tv.set_rules_hint(False)
256
 
        tv.connect("cursor-changed", self._show_log)
 
271
        tv.connect("cursor-changed", self._activate_selected_revision)
257
272
        tv.show()
258
273
        tv.connect("row-activated", self.row_diff)
259
274
 
311
326
    def _create_log_view(self):
312
327
        lv = LogView()
313
328
        lv.show()
314
 
 
315
329
        return lv
316
330
 
317
 
    def _create_button_box(self):
318
 
        box = gtk.HButtonBox()
319
 
        box.set_layout(gtk.BUTTONBOX_END)
320
 
        box.show()
321
 
 
322
 
        button = gtk.Button()
323
 
        button.set_use_stock(True)
324
 
        button.set_label("gtk-close")
325
 
        button.connect("clicked", lambda w: self.destroy())
326
 
        button.show()
327
 
 
328
 
        box.pack_start(button, expand=False, fill=False)
329
 
 
330
 
        return box
331
 
 
332
 
    def _create_prev_button(self):
333
 
        box = gtk.HButtonBox()
334
 
        box.set_layout(gtk.BUTTONBOX_START)
335
 
        box.show()
336
 
        
 
331
    def _create_back_button(self):
337
332
        button = gtk.Button()
338
333
        button.set_use_stock(True)
339
334
        button.set_label("gtk-go-back")
340
335
        button.connect("clicked", lambda w: self.go_back())
341
 
        button.show()
342
 
        box.pack_start(button, expand=False, fill=False)
343
 
        return box
 
336
        button.set_relief(gtk.RELIEF_NONE)
 
337
        button.show()
 
338
        return button
 
339
 
 
340
    def _create_forward_button(self):
 
341
        button = gtk.Button()
 
342
        button.set_use_stock(True)
 
343
        button.set_label("gtk-go-forward")
 
344
        button.connect("clicked", lambda w: self.go_forward())
 
345
        button.set_relief(gtk.RELIEF_NONE)
 
346
        button.show()
 
347
        button.set_sensitive(False)
 
348
        return button
344
349
 
345
350
    def go_back(self):
 
351
        last_tree = self.tree
346
352
        rev_id = self._selected_revision()
347
353
        parent_id = self.revisions[rev_id].parent_ids[0]
348
 
        tree = self.branch.repository.revision_tree(parent_id)
349
 
        if self.file_id in tree:
350
 
            offset = self.get_scroll_offset(tree)
 
354
        target_tree = self.branch.repository.revision_tree(parent_id)
 
355
        if self._go(target_tree):
 
356
            self.history.append(last_tree)
 
357
            self.forward_button.set_sensitive(True)
 
358
        else:
 
359
            self._no_back.add(parent_id)
 
360
            self.back_button.set_sensitive(False)
 
361
 
 
362
    def go_forward(self):
 
363
        if len(self.history) == 0:
 
364
            return
 
365
        target_tree = self.history.pop()
 
366
        if len(self.history) == 0:
 
367
            self.forward_button.set_sensitive(False)
 
368
        self._go(target_tree)
 
369
 
 
370
    def _go(self, target_tree):
 
371
        rev_id = self._selected_revision()
 
372
        if self.file_id in target_tree:
 
373
            offset = self.get_scroll_offset(target_tree)
351
374
            (row,), col = self.annoview.get_cursor()
352
 
            self.annotate(tree, self.branch, self.file_id)
353
 
            self.annoview.set_cursor(row+offset)
 
375
            self.annotate(target_tree, self.branch, self.file_id)
 
376
            new_row = row+offset
 
377
            if new_row < 0:
 
378
                new_row = 0
 
379
            self.annoview.set_cursor(new_row)
 
380
            return True
 
381
        else:
 
382
            return False
354
383
 
355
384
    def get_scroll_offset(self, tree):
356
385
        old = self.tree.get_file(self.file_id)
370
399
    For when a revision is referenced but not present.
371
400
    """
372
401
 
373
 
    def __init__(self, revision_id, committer='?'):
 
402
    def __init__(self, revision_id, committer='?', nick=None):
374
403
        self.revision_id = revision_id
375
404
        self.parent_ids = []
376
405
        self.committer = committer
377
406
        self.message = "?"
378
407
        self.timestamp = 0.0
379
408
        self.timezone = 0
 
409
        self.properties = {}
380
410
 
381
411
 
382
412
class RevisionCache(object):