/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-27 01:13:38 UTC
  • mto: (423.1.11 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080127011338-dksksvbbpbf3jig8
Changed About dialog URL, reverted change to license dialog.

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
 
 
22
 
from bzrlib.config import BranchConfig, GlobalConfig
23
 
from bzrlib.revision import Revision, NULL_REVISION
24
 
from bzrlib.trace import mutter
 
19
from bzrlib.plugins.gtk.branchview import TreeView
 
20
from bzrlib.revision import Revision
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
25
23
 
26
24
class BranchWindow(Window):
27
25
    """Branch window.
30
28
    for a particular branch.
31
29
    """
32
30
 
33
 
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
31
    def __init__(self, branch, start, maxnum, parent=None):
34
32
        """Create a new BranchWindow.
35
33
 
36
34
        :param branch: Branch object for branch to show.
37
 
        :param start_revs: Revision ids of top revisions.
 
35
        :param start: Revision id of top revision.
38
36
        :param maxnum: Maximum number of revisions to display, 
39
37
                       None for no limit.
40
38
        """
43
41
        self.set_border_width(0)
44
42
 
45
43
        self.branch      = branch
46
 
        self.start_revs  = start_revs
 
44
        self.start       = start
47
45
        self.maxnum      = maxnum
48
46
        self.config      = GlobalConfig()
49
47
 
67
65
 
68
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
69
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
70
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
71
68
 
72
69
        self.accel_group = gtk.AccelGroup()
73
70
        self.add_accel_group(self.accel_group)
86
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
87
84
        self.next_rev_action.connect_accelerator()
88
85
 
89
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
90
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
91
 
        self.refresh_action.set_accel_group(self.accel_group)
92
 
        self.refresh_action.connect("activate", self._refresh_clicked)
93
 
        self.refresh_action.connect_accelerator()
94
 
 
95
86
        self.construct()
96
87
 
97
88
    def set_revision(self, revid):
109
100
 
110
101
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
111
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
103
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
112
104
        
113
105
        vbox.pack_start(self.paned, expand=True, fill=True)
114
106
        vbox.set_focus_child(self.paned)
152
144
        view_menuitem = gtk.MenuItem("_View")
153
145
        view_menuitem.set_submenu(view_menu)
154
146
 
155
 
        view_menu_refresh = self.refresh_action.create_menu_item()
156
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
157
 
 
158
 
        view_menu.add(view_menu_refresh)
159
 
        view_menu.add(gtk.SeparatorMenuItem())
160
 
 
161
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
148
        view_menu_toolbar.set_active(True)
163
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
170
156
        view_menu.add(view_menu_compact)
171
157
        view_menu.add(gtk.SeparatorMenuItem())
172
158
 
173
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
174
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
175
 
 
176
 
        # Revision numbers are pointless if there are multiple branches
177
 
        if len(self.start_revs) > 1:
178
 
            self.mnu_show_revno_column.set_sensitive(False)
179
 
            self.treeview.set_property('revno-column-visible', False)
180
 
 
181
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
182
 
                            (self.mnu_show_date_column, "date")]:
 
159
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
160
            col = gtk.CheckMenuItem("Show " + label + " Column")
183
161
            col.set_active(self.treeview.get_property(name + "-column-visible"))
184
162
            col.connect('toggled', self._col_visibility_changed, name)
185
163
            view_menu.add(col)
192
170
        go_menu_next = self.next_rev_action.create_menu_item()
193
171
        go_menu_prev = self.prev_rev_action.create_menu_item()
194
172
 
195
 
        tag_image = gtk.Image()
196
 
        tag_image.set_from_file(icon_path("tag-16.png"))
197
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
198
 
        self.go_menu_tags.set_image(tag_image)
199
 
        self._update_tags()
 
173
        tags_menu = gtk.Menu()
 
174
        go_menu_tags = gtk.MenuItem("_Tags")
 
175
        go_menu_tags.set_submenu(tags_menu)
 
176
 
 
177
        if self.branch.supports_tags():
 
178
            tags = self.branch.tags.get_tag_dict().items()
 
179
            tags.sort()
 
180
            tags.reverse()
 
181
            for tag, revid in tags:
 
182
                tag_item = gtk.MenuItem(tag)
 
183
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
184
                tags_menu.add(tag_item)
 
185
 
 
186
            go_menu_tags.set_sensitive(len(tags) != 0)
 
187
        else:
 
188
            go_menu_tags.set_sensitive(False)
200
189
 
201
190
        go_menu.add(go_menu_next)
202
191
        go_menu.add(go_menu_prev)
203
192
        go_menu.add(gtk.SeparatorMenuItem())
204
 
        go_menu.add(self.go_menu_tags)
 
193
        go_menu.add(go_menu_tags)
205
194
 
206
195
        revision_menu = gtk.Menu()
207
196
        revision_menuitem = gtk.MenuItem("_Revision")
209
198
 
210
199
        revision_menu_diff = gtk.MenuItem("View Changes")
211
200
        revision_menu_diff.connect('activate', 
212
 
                self._menu_diff_cb)
213
 
        
214
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
215
 
        revision_menu_compare.connect('activate',
216
 
                self._compare_with_cb)
 
201
                lambda w: self.treeview.show_diff())
217
202
 
218
203
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
204
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
205
 
221
206
        revision_menu.add(revision_menu_tag)
222
207
        revision_menu.add(revision_menu_diff)
223
 
        revision_menu.add(revision_menu_compare)
224
208
 
225
209
        branch_menu = gtk.Menu()
226
210
        branch_menuitem = gtk.MenuItem("_Branch")
229
213
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
214
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
215
 
232
 
        try:
233
 
            from bzrlib.plugins import search
234
 
        except ImportError:
235
 
            mutter("Didn't find search plugin")
236
 
        else:
237
 
            branch_index_menuitem = gtk.MenuItem("_Index")
238
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
239
 
            branch_menu.add(branch_index_menuitem)
240
 
 
241
216
        help_menu = gtk.Menu()
242
217
        help_menuitem = gtk.MenuItem("_Help")
243
218
        help_menuitem.set_submenu(help_menu)
257
232
        menubar.show_all()
258
233
 
259
234
        return menubar
 
235
    
 
236
    def construct_loading_msg(self):
 
237
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
238
                                                 gtk.ICON_SIZE_BUTTON)
 
239
        image_loading.show()
 
240
        
 
241
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
242
        label_loading.set_alignment(0.0, 0.5)
 
243
        label_loading.show()
 
244
        
 
245
        self.loading_msg_box = gtk.HBox()
 
246
        self.loading_msg_box.set_spacing(5)
 
247
        self.loading_msg_box.set_border_width(5)        
 
248
        self.loading_msg_box.pack_start(image_loading, False, False)
 
249
        self.loading_msg_box.pack_start(label_loading, True, True)
 
250
        self.loading_msg_box.show()
 
251
        
 
252
        return self.loading_msg_box
260
253
 
261
254
    def construct_top(self):
262
255
        """Construct the top-half of the window."""
263
256
        # FIXME: Make broken_line_length configurable
264
257
 
265
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
258
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
266
259
 
267
260
        self.treeview.connect('revision-selected',
268
261
                self._treeselection_changed_cb)
269
 
        self.treeview.connect('revision-activated',
270
 
                self._tree_revision_activated)
271
262
 
272
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
263
        self.treeview.connect('revisions-loaded', 
 
264
                lambda x: self.loading_msg_box.hide())
273
265
 
274
266
        for col in ["revno", "date"]:
275
267
            option = self.config.get_user_option(col + '-column-visible')
276
268
            if option is not None:
277
269
                self.treeview.set_property(col + '-column-visible', option == 'True')
278
 
            else:
279
 
                self.treeview.set_property(col + '-column-visible', False)
280
270
 
281
271
        self.treeview.show()
282
272
 
317
307
        self.revisionview.show()
318
308
        self.revisionview.set_show_callback(self._show_clicked_cb)
319
309
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
320
 
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
321
310
        return self.revisionview
322
311
 
323
312
    def _tag_selected_cb(self, menuitem, revid):
329
318
        parents  = self.treeview.get_parents()
330
319
        children = self.treeview.get_children()
331
320
 
332
 
        if revision and revision != NULL_REVISION:
 
321
        if revision is not None:
333
322
            prev_menu = gtk.Menu()
334
323
            if len(parents) > 0:
335
324
                self.prev_rev_action.set_sensitive(True)
336
325
                for parent_id in parents:
337
 
                    if parent_id and parent_id != NULL_REVISION:
338
 
                        parent = self.branch.repository.get_revision(parent_id)
339
 
                        try:
340
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
341
 
                        except KeyError:
342
 
                            str = ""
 
326
                    parent = self.branch.repository.get_revision(parent_id)
 
327
                    try:
 
328
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
329
                    except KeyError:
 
330
                        str = ""
343
331
 
344
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
345
 
                        item.connect('activate', self._set_revision_cb, parent_id)
346
 
                        prev_menu.add(item)
 
332
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
333
                    item.connect('activate', self._set_revision_cb, parent_id)
 
334
                    prev_menu.add(item)
347
335
                prev_menu.show_all()
348
336
            else:
349
337
                self.prev_rev_action.set_sensitive(False)
373
361
 
374
362
            self.revisionview.set_revision(revision)
375
363
            self.revisionview.set_children(children)
376
 
    
377
 
    def _tree_revision_activated(self, widget, path, col):
378
 
        # TODO: more than one parent
379
 
        """Callback for when a treeview row gets activated."""
380
 
        revision = self.treeview.get_revision()
381
 
        parents  = self.treeview.get_parents()
382
 
 
383
 
        if len(parents) == 0:
384
 
            parent_id = None
385
 
        else:
386
 
            parent_id = parents[0]
387
 
 
388
 
        self.show_diff(revision.revision_id, parent_id)
389
 
        self.treeview.grab_focus()
390
 
        
391
 
    def _menu_diff_cb(self,w):
392
 
        (path, focus) = self.treeview.treeview.get_cursor()
393
 
        revid = self.treeview.model[path][treemodel.REVID]
394
 
        
395
 
        parentids = self.branch.repository.revision_parents(revid)
396
 
 
397
 
        if len(parentids) == 0:
398
 
            parentid = NULL_REVISION
399
 
        else:
400
 
            parentid = parentids[0]
401
 
        
402
 
        self.show_diff(revid,parentid)    
403
364
 
404
365
    def _back_clicked_cb(self, *args):
405
366
        """Callback for when the back button is clicked."""
416
377
 
417
378
    def _show_clicked_cb(self, revid, parentid):
418
379
        """Callback for when the show button for a parent is clicked."""
419
 
        self.show_diff(revid, parentid)
 
380
        self.treeview.show_diff(revid, parentid)
420
381
        self.treeview.grab_focus()
421
382
 
422
 
    def _compare_with_cb(self,w):
423
 
        """Callback for revision 'compare with' menu. Will show a small
424
 
            dialog with branch revisions to compare with selected revision in TreeView"""
425
 
        
426
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
427
 
        
428
 
        rb = RevisionBrowser(self.branch,self)
429
 
        ret = rb.run()
430
 
        
431
 
        if ret == gtk.RESPONSE_OK:          
432
 
            (path, focus) = self.treeview.treeview.get_cursor()
433
 
            revid = self.treeview.model[path][treemodel.REVID]
434
 
            self.show_diff(revid, rb.selected_revid)
435
 
            
436
 
        rb.destroy()
437
 
            
438
383
    def _set_revision_cb(self, w, revision_id):
439
384
        self.treeview.set_revision_id(revision_id)
440
385
 
453
398
    def _tag_revision_cb(self, w):
454
399
        try:
455
400
            self.treeview.set_sensitive(False)
 
401
            self.branch.unlock()
456
402
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
457
403
            response = dialog.run()
458
404
            if response != gtk.RESPONSE_NONE:
459
405
                dialog.hide()
460
406
            
461
407
                if response == gtk.RESPONSE_OK:
462
 
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
408
                    try:
 
409
                        self.branch.lock_write()
 
410
                        self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
411
                    finally:
 
412
                        self.branch.unlock()
463
413
                
464
414
                dialog.destroy()
465
415
 
466
416
        finally:
 
417
            self.branch.lock_read()
 
418
            self.treeview.emit("revision-selected")
467
419
            self.treeview.set_sensitive(True)
468
420
 
469
 
    def _branch_index_cb(self, w):
470
 
        from bzrlib.plugins.search import index as _mod_index
471
 
        _mod_index.index_url(self.branch.base)
472
 
 
473
421
    def _about_dialog_cb(self, w):
474
422
        from bzrlib.plugins.gtk.about import AboutDialog
475
423
 
491
439
        dialog.run()
492
440
 
493
441
    def _refresh_clicked(self, w):
494
 
        self.treeview.refresh()
495
 
 
496
 
    def _update_tags(self):
497
 
        menu = gtk.Menu()
498
 
 
499
 
        if self.branch.supports_tags():
500
 
            tags = self.branch.tags.get_tag_dict().items()
501
 
            tags.sort()
502
 
            tags.reverse()
503
 
            for tag, revid in tags:
504
 
                tag_image = gtk.Image()
505
 
                tag_image.set_from_file(icon_path('tag-16.png'))
506
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
507
 
                tag_item.set_image(tag_image)
508
 
                tag_item.connect('activate', self._tag_selected_cb, revid)
509
 
                menu.add(tag_item)
510
 
            self.go_menu_tags.set_submenu(menu)
511
 
 
512
 
            self.go_menu_tags.set_sensitive(len(tags) != 0)
513
 
        else:
514
 
            self.go_menu_tags.set_sensitive(False)
515
 
 
516
 
        self.go_menu_tags.show_all()
517
 
 
518
 
    def show_diff(self, revid=None, parentid=None):
519
 
        """Open a new window to show a diff between the given revisions."""
520
 
        from bzrlib.plugins.gtk.diff import DiffWindow
521
 
        window = DiffWindow(parent=self)
522
 
 
523
 
        if parentid is None:
524
 
            parentid = NULL_REVISION
525
 
 
526
 
        rev_tree    = self.branch.repository.revision_tree(revid)
527
 
        parent_tree = self.branch.repository.revision_tree(parentid)
528
 
 
529
 
        description = revid + " - " + self.branch.nick
530
 
        window.set_diff(description, rev_tree, parent_tree)
531
 
        window.show()
532
 
 
533
 
 
 
442
        self.treeview.update()