/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 viz/branchwin.py

  • Committer: Daniel Schierbeck
  • Date: 2008-01-23 16:24:25 UTC
  • mfrom: (423.1.7 trunk)
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123162425-qd1zpohg46qmxbuy
Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
14
14
import pango
15
15
 
16
16
from bzrlib.plugins.gtk.window import Window
17
 
from bzrlib.plugins.gtk import icon_path
18
17
from bzrlib.plugins.gtk.tags import AddTagDialog
19
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
 
from bzrlib.revision import Revision, NULL_REVISION
 
19
from bzrlib.plugins.gtk.branchview import TreeView
 
20
from bzrlib.revision import Revision
22
21
from bzrlib.config import BranchConfig
23
22
from bzrlib.config import GlobalConfig
24
23
 
29
28
    for a particular branch.
30
29
    """
31
30
 
32
 
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
31
    def __init__(self, branch, start, maxnum, parent=None):
33
32
        """Create a new BranchWindow.
34
33
 
35
34
        :param branch: Branch object for branch to show.
36
 
        :param start_revs: Revision ids of top revisions.
 
35
        :param start: Revision id of top revision.
37
36
        :param maxnum: Maximum number of revisions to display, 
38
37
                       None for no limit.
39
38
        """
42
41
        self.set_border_width(0)
43
42
 
44
43
        self.branch      = branch
45
 
        self.start_revs  = start_revs
 
44
        self.start       = start
46
45
        self.maxnum      = maxnum
47
46
        self.config      = GlobalConfig()
48
47
 
66
65
 
67
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
68
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
69
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
70
68
 
71
69
        self.accel_group = gtk.AccelGroup()
72
70
        self.add_accel_group(self.accel_group)
85
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
86
84
        self.next_rev_action.connect_accelerator()
87
85
 
88
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
89
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
90
 
        self.refresh_action.set_accel_group(self.accel_group)
91
 
        self.refresh_action.connect("activate", self._refresh_clicked)
92
 
        self.refresh_action.connect_accelerator()
93
 
 
94
86
        self.construct()
95
87
 
96
88
    def set_revision(self, revid):
108
100
 
109
101
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
103
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
111
104
        
112
105
        vbox.pack_start(self.paned, expand=True, fill=True)
113
106
        vbox.set_focus_child(self.paned)
151
144
        view_menuitem = gtk.MenuItem("_View")
152
145
        view_menuitem.set_submenu(view_menu)
153
146
 
154
 
        view_menu_refresh = self.refresh_action.create_menu_item()
155
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
156
 
 
157
 
        view_menu.add(view_menu_refresh)
158
 
        view_menu.add(gtk.SeparatorMenuItem())
159
 
 
160
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
148
        view_menu_toolbar.set_active(True)
162
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
169
156
        view_menu.add(view_menu_compact)
170
157
        view_menu.add(gtk.SeparatorMenuItem())
171
158
 
172
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
173
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
174
 
 
175
 
        # Revision numbers are pointless if there are multiple branches
176
 
        if len(self.start_revs) > 1:
177
 
            self.mnu_show_revno_column.set_sensitive(False)
178
 
            self.treeview.set_property('revno-column-visible', False)
179
 
 
180
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
181
 
                            (self.mnu_show_date_column, "date")]:
 
159
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
160
            col = gtk.CheckMenuItem("Show " + label + " Column")
182
161
            col.set_active(self.treeview.get_property(name + "-column-visible"))
183
162
            col.connect('toggled', self._col_visibility_changed, name)
184
163
            view_menu.add(col)
191
170
        go_menu_next = self.next_rev_action.create_menu_item()
192
171
        go_menu_prev = self.prev_rev_action.create_menu_item()
193
172
 
194
 
        tag_image = gtk.Image()
195
 
        tag_image.set_from_file(icon_path("tag-16.png"))
196
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
197
 
        self.go_menu_tags.set_image(tag_image)
 
173
        self.go_menu_tags = gtk.MenuItem("_Tags")
198
174
        self._update_tags()
199
175
 
200
176
        go_menu.add(go_menu_next)
208
184
 
209
185
        revision_menu_diff = gtk.MenuItem("View Changes")
210
186
        revision_menu_diff.connect('activate', 
211
 
                self._menu_diff_cb)
212
 
        
213
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
214
 
        revision_menu_compare.connect('activate',
215
 
                self._compare_with_cb)
 
187
                lambda w: self.treeview.show_diff())
216
188
 
217
189
        revision_menu_tag = gtk.MenuItem("Tag Revision")
218
190
        revision_menu_tag.connect('activate', self._tag_revision_cb)
219
191
 
220
192
        revision_menu.add(revision_menu_tag)
221
193
        revision_menu.add(revision_menu_diff)
222
 
        revision_menu.add(revision_menu_compare)
223
194
 
224
195
        branch_menu = gtk.Menu()
225
196
        branch_menuitem = gtk.MenuItem("_Branch")
228
199
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
200
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
201
 
231
 
        help_menu = gtk.Menu()
232
 
        help_menuitem = gtk.MenuItem("_Help")
233
 
        help_menuitem.set_submenu(help_menu)
234
 
 
235
 
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
236
 
        help_about_menuitem.connect('activate', self._about_dialog_cb)
237
 
 
238
 
        help_menu.add(help_about_menuitem)
239
 
 
240
202
        menubar.add(file_menuitem)
241
203
        menubar.add(edit_menuitem)
242
204
        menubar.add(view_menuitem)
243
205
        menubar.add(go_menuitem)
244
206
        menubar.add(revision_menuitem)
245
207
        menubar.add(branch_menuitem)
246
 
        menubar.add(help_menuitem)
247
208
        menubar.show_all()
248
209
 
249
210
        return menubar
 
211
    
 
212
    def construct_loading_msg(self):
 
213
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
214
                                                 gtk.ICON_SIZE_BUTTON)
 
215
        image_loading.show()
 
216
        
 
217
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
218
        label_loading.set_alignment(0.0, 0.5)
 
219
        label_loading.show()
 
220
        
 
221
        self.loading_msg_box = gtk.HBox()
 
222
        self.loading_msg_box.set_spacing(5)
 
223
        self.loading_msg_box.set_border_width(5)        
 
224
        self.loading_msg_box.pack_start(image_loading, False, False)
 
225
        self.loading_msg_box.pack_start(label_loading, True, True)
 
226
        self.loading_msg_box.show()
 
227
        
 
228
        return self.loading_msg_box
250
229
 
251
230
    def construct_top(self):
252
231
        """Construct the top-half of the window."""
253
232
        # FIXME: Make broken_line_length configurable
254
233
 
255
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
234
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
256
235
 
257
236
        self.treeview.connect('revision-selected',
258
237
                self._treeselection_changed_cb)
259
 
        self.treeview.connect('revision-activated',
260
 
                self._tree_revision_activated)
 
238
 
 
239
        self.treeview.connect('revisions-loaded', 
 
240
                lambda x: self.loading_msg_box.hide())
261
241
 
262
242
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
263
243
 
265
245
            option = self.config.get_user_option(col + '-column-visible')
266
246
            if option is not None:
267
247
                self.treeview.set_property(col + '-column-visible', option == 'True')
268
 
            else:
269
 
                self.treeview.set_property(col + '-column-visible', False)
270
248
 
271
249
        self.treeview.show()
272
250
 
319
297
        parents  = self.treeview.get_parents()
320
298
        children = self.treeview.get_children()
321
299
 
322
 
        if revision and revision != NULL_REVISION:
 
300
        if revision is not None:
323
301
            prev_menu = gtk.Menu()
324
302
            if len(parents) > 0:
325
303
                self.prev_rev_action.set_sensitive(True)
326
304
                for parent_id in parents:
327
 
                    if parent_id and parent_id != NULL_REVISION:
328
 
                        parent = self.branch.repository.get_revision(parent_id)
329
 
                        try:
330
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
331
 
                        except KeyError:
332
 
                            str = ""
 
305
                    parent = self.branch.repository.get_revision(parent_id)
 
306
                    try:
 
307
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
308
                    except KeyError:
 
309
                        str = ""
333
310
 
334
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
335
 
                        item.connect('activate', self._set_revision_cb, parent_id)
336
 
                        prev_menu.add(item)
 
311
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
312
                    item.connect('activate', self._set_revision_cb, parent_id)
 
313
                    prev_menu.add(item)
337
314
                prev_menu.show_all()
338
315
            else:
339
316
                self.prev_rev_action.set_sensitive(False)
363
340
 
364
341
            self.revisionview.set_revision(revision)
365
342
            self.revisionview.set_children(children)
366
 
    
367
 
    def _tree_revision_activated(self, widget, path, col):
368
 
        # TODO: more than one parent
369
 
        """Callback for when a treeview row gets activated."""
370
 
        revision = self.treeview.get_revision()
371
 
        parents  = self.treeview.get_parents()
372
 
 
373
 
        if len(parents) == 0:
374
 
            parent_id = None
375
 
        else:
376
 
            parent_id = parents[0]
377
 
 
378
 
        self.show_diff(revision.revision_id, parent_id)
379
 
        self.treeview.grab_focus()
380
 
        
381
 
    def _menu_diff_cb(self,w):
382
 
        (path, focus) = self.treeview.treeview.get_cursor()
383
 
        revid = self.treeview.model[path][treemodel.REVID]
384
 
        
385
 
        parentids = self.branch.repository.revision_parents(revid)
386
 
 
387
 
        if len(parentids) == 0:
388
 
            parentid = NULL_REVISION
389
 
        else:
390
 
            parentid = parentids[0]
391
 
        
392
 
        self.show_diff(revid,parentid)    
393
343
 
394
344
    def _back_clicked_cb(self, *args):
395
345
        """Callback for when the back button is clicked."""
406
356
 
407
357
    def _show_clicked_cb(self, revid, parentid):
408
358
        """Callback for when the show button for a parent is clicked."""
409
 
        self.show_diff(revid, parentid)
 
359
        self.treeview.show_diff(revid, parentid)
410
360
        self.treeview.grab_focus()
411
361
 
412
 
    def _compare_with_cb(self,w):
413
 
        """Callback for revision 'compare with' menu. Will show a small
414
 
            dialog with branch revisions to compare with selected revision in TreeView"""
415
 
        
416
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
417
 
        
418
 
        rb = RevisionBrowser(self.branch,self)
419
 
        ret = rb.run()
420
 
        
421
 
        if ret == gtk.RESPONSE_OK:          
422
 
            (path, focus) = self.treeview.treeview.get_cursor()
423
 
            revid = self.treeview.model[path][treemodel.REVID]
424
 
            self.show_diff(revid, rb.selected_revid)
425
 
            
426
 
        rb.destroy()
427
 
            
428
362
    def _set_revision_cb(self, w, revision_id):
429
363
        self.treeview.set_revision_id(revision_id)
430
364
 
443
377
    def _tag_revision_cb(self, w):
444
378
        try:
445
379
            self.treeview.set_sensitive(False)
 
380
            self.branch.unlock()
446
381
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
447
382
            response = dialog.run()
448
383
            if response != gtk.RESPONSE_NONE:
449
384
                dialog.hide()
450
385
            
451
386
                if response == gtk.RESPONSE_OK:
452
 
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
387
                    try:
 
388
                        self.branch.lock_write()
 
389
                        self.treeview.add_tag(dialog.tagname, dialog._revid)
 
390
                    finally:
 
391
                        self.branch.unlock()
453
392
                
454
393
                dialog.destroy()
455
394
 
456
395
        finally:
 
396
            self.branch.lock_read()
 
397
            self.treeview.emit("revision-selected")
457
398
            self.treeview.set_sensitive(True)
458
399
 
459
 
    def _about_dialog_cb(self, w):
460
 
        from bzrlib.plugins.gtk.about import AboutDialog
461
 
 
462
 
        AboutDialog().run()
463
 
 
464
400
    def _col_visibility_changed(self, col, property):
465
401
        self.config.set_user_option(property + '-column-visible', col.get_active())
466
402
        self.treeview.set_property(property + '-column-visible', col.get_active())
477
413
        dialog.run()
478
414
 
479
415
    def _refresh_clicked(self, w):
480
 
        self.treeview.refresh()
 
416
        self.treeview.update()
481
417
 
482
418
    def _update_tags(self):
483
419
        menu = gtk.Menu()
487
423
            tags.sort()
488
424
            tags.reverse()
489
425
            for tag, revid in tags:
490
 
                tag_image = gtk.Image()
491
 
                tag_image.set_from_file(icon_path('tag-16.png'))
492
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
493
 
                tag_item.set_image(tag_image)
 
426
                tag_item = gtk.MenuItem(tag)
494
427
                tag_item.connect('activate', self._tag_selected_cb, revid)
495
428
                menu.add(tag_item)
496
429
            self.go_menu_tags.set_submenu(menu)
501
434
 
502
435
        self.go_menu_tags.show_all()
503
436
 
504
 
    def show_diff(self, revid=None, parentid=None):
505
 
        """Open a new window to show a diff between the given revisions."""
506
 
        from bzrlib.plugins.gtk.diff import DiffWindow
507
 
        window = DiffWindow(parent=self)
508
 
 
509
 
        if parentid is None:
510
 
            parentid = NULL_REVISION
511
 
 
512
 
        rev_tree    = self.branch.repository.revision_tree(revid)
513
 
        parent_tree = self.branch.repository.revision_tree(parentid)
514
 
 
515
 
        description = revid + " - " + self.branch.nick
516
 
        window.set_diff(description, rev_tree, parent_tree)
517
 
        window.show()
518
 
 
519
437