/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: Jelmer Vernooij
  • Date: 2007-03-17 23:58:03 UTC
  • mfrom: (170.1.5 bzr-gtk-meld)
  • Revision ID: jelmer@samba.org-20070317235803-fyaw65t8ika939s1
Merge upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
55
55
 
56
56
        self._create()
57
57
        self.revisions = {}
 
58
        self.history = []
58
59
 
59
60
    def annotate(self, tree, branch, file_id):
60
61
        self.annotations = []
177
178
            return None
178
179
        return self.annomodel[path][REVISION_ID_COL]
179
180
 
180
 
    def _show_log(self, w):
 
181
    def _activate_selected_revision(self, w):
181
182
        rev_id = self._selected_revision()
182
183
        if rev_id is None:
183
184
            return
184
 
        self.logview.set_revision(self.revisions[rev_id])
 
185
        selected = self.revisions[rev_id]
 
186
        self.logview.set_revision(selected)
 
187
        self.back_button.set_sensitive(len(selected.parent_ids) != 0)
185
188
 
186
189
    def _create(self):
187
190
        self.logview = self._create_log_view()
197
200
        sw.add(self.annoview)
198
201
        self.annoview.gwindow = self
199
202
        sw.show()
 
203
 
 
204
        swbox = gtk.VBox()
 
205
        swbox.pack_start(sw)
 
206
        swbox.show()
200
207
        
201
208
        self.pane = pane = gtk.VPaned()
202
 
        pane.add1(sw)
 
209
        pane.add1(swbox)
203
210
        pane.add2(self.logview)
204
211
        pane.show()
205
212
        vbox.pack_start(pane, expand=True, fill=True)
206
213
 
207
214
        self._search = SearchBox()
208
 
        vbox.pack_start(self._search, expand=False, fill=True)
 
215
        swbox.pack_start(self._search, expand=False, fill=True)
209
216
        accels = gtk.AccelGroup()
210
217
        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
211
218
                             gtk.ACCEL_LOCKED,
215
222
                             self._search_by_line)
216
223
        self.add_accel_group(accels)
217
224
 
218
 
        hbox = gtk.HBox(True, 6)
219
 
        hbox.pack_start(self._create_prev_button(), expand=False, fill=True)
 
225
        hbox = gtk.HBox(False, 6)
 
226
        self.back_button = self._create_back_button()
 
227
        hbox.pack_start(self.back_button, expand=False, fill=True)
 
228
        self.forward_button = self._create_forward_button()
 
229
        hbox.pack_start(self.forward_button, expand=False, fill=True)
220
230
        hbox.pack_end(self._create_button_box(), expand=False, fill=True)
221
231
        hbox.show()
222
232
        vbox.pack_start(hbox, expand=False, fill=True)
254
264
    def _create_annotate_view(self):
255
265
        tv = gtk.TreeView()
256
266
        tv.set_rules_hint(False)
257
 
        tv.connect("cursor-changed", self._show_log)
 
267
        tv.connect("cursor-changed", self._activate_selected_revision)
258
268
        tv.show()
259
269
        tv.connect("row-activated", self.row_diff)
260
270
 
315
325
        return lv
316
326
 
317
327
    def _create_button_box(self):
318
 
        box = gtk.HButtonBox()
319
 
        box.set_layout(gtk.BUTTONBOX_END)
320
 
        box.show()
321
 
 
322
328
        button = gtk.Button()
323
329
        button.set_use_stock(True)
324
330
        button.set_label("gtk-close")
325
331
        button.connect("clicked", lambda w: self.destroy())
326
332
        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
 
        
 
333
        return button
 
334
 
 
335
    def _create_back_button(self):
337
336
        button = gtk.Button()
338
337
        button.set_use_stock(True)
339
338
        button.set_label("gtk-go-back")
340
339
        button.connect("clicked", lambda w: self.go_back())
341
340
        button.show()
342
 
        box.pack_start(button, expand=False, fill=False)
343
 
        return box
 
341
        return button
 
342
 
 
343
    def _create_forward_button(self):
 
344
        button = gtk.Button()
 
345
        button.set_use_stock(True)
 
346
        button.set_label("gtk-go-forward")
 
347
        button.connect("clicked", lambda w: self.go_forward())
 
348
        button.show()
 
349
        button.set_sensitive(False)
 
350
        return button
344
351
 
345
352
    def go_back(self):
 
353
        self.history.append(self.tree)
 
354
        self.forward_button.set_sensitive(True)
346
355
        rev_id = self._selected_revision()
347
356
        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)
 
357
        target_tree = self.branch.repository.revision_tree(parent_id)
 
358
        self._go(target_tree)
 
359
 
 
360
    def go_forward(self):
 
361
        if len(self.history) == 0:
 
362
            return
 
363
        target_tree = self.history.pop()
 
364
        if len(self.history) == 0:
 
365
            self.forward_button.set_sensitive(False)
 
366
        self._go(target_tree)
 
367
 
 
368
    def _go(self, target_tree):
 
369
        rev_id = self._selected_revision()
 
370
        if self.file_id in target_tree:
 
371
            offset = self.get_scroll_offset(target_tree)
351
372
            (row,), col = self.annoview.get_cursor()
352
 
            self.annotate(tree, self.branch, self.file_id)
353
 
            self.annoview.set_cursor(row+offset)
 
373
            self.annotate(target_tree, self.branch, self.file_id)
 
374
            new_row = row+offset
 
375
            if new_row < 0:
 
376
                new_row = 0
 
377
            self.annoview.set_cursor(new_row)
354
378
 
355
379
    def get_scroll_offset(self, tree):
356
380
        old = self.tree.get_file(self.file_id)