/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: Jelmer Vernooij
  • Date: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

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
17
18
from bzrlib.plugins.gtk.tags import AddTagDialog
18
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
19
 
from bzrlib.plugins.gtk.branchview import TreeView
20
 
from bzrlib.revision import Revision
 
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
21
from bzrlib.revision import Revision, NULL_REVISION
21
22
from bzrlib.config import BranchConfig
22
23
from bzrlib.config import GlobalConfig
23
24
 
28
29
    for a particular branch.
29
30
    """
30
31
 
31
 
    def __init__(self, branch, start, maxnum, parent=None):
 
32
    def __init__(self, branch, start_revs, maxnum, parent=None):
32
33
        """Create a new BranchWindow.
33
34
 
34
35
        :param branch: Branch object for branch to show.
35
 
        :param start: Revision id of top revision.
 
36
        :param start_revs: Revision ids of top revisions.
36
37
        :param maxnum: Maximum number of revisions to display, 
37
38
                       None for no limit.
38
39
        """
41
42
        self.set_border_width(0)
42
43
 
43
44
        self.branch      = branch
44
 
        self.start       = start
 
45
        self.start_revs  = start_revs
45
46
        self.maxnum      = maxnum
46
47
        self.config      = GlobalConfig()
47
48
 
65
66
 
66
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
67
68
        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)
68
70
 
69
71
        self.accel_group = gtk.AccelGroup()
70
72
        self.add_accel_group(self.accel_group)
83
85
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
84
86
        self.next_rev_action.connect_accelerator()
85
87
 
 
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
 
86
94
        self.construct()
87
95
 
88
96
    def set_revision(self, revid):
143
151
        view_menuitem = gtk.MenuItem("_View")
144
152
        view_menuitem.set_submenu(view_menu)
145
153
 
 
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
 
146
160
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
147
161
        view_menu_toolbar.set_active(True)
148
162
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
155
169
        view_menu.add(view_menu_compact)
156
170
        view_menu.add(gtk.SeparatorMenuItem())
157
171
 
158
 
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
159
 
            col = gtk.CheckMenuItem("Show " + label + " Column")
 
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")]:
160
182
            col.set_active(self.treeview.get_property(name + "-column-visible"))
161
183
            col.connect('toggled', self._col_visibility_changed, name)
162
184
            view_menu.add(col)
169
191
        go_menu_next = self.next_rev_action.create_menu_item()
170
192
        go_menu_prev = self.prev_rev_action.create_menu_item()
171
193
 
172
 
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
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
198
        self._update_tags()
174
199
 
175
200
        go_menu.add(go_menu_next)
183
208
 
184
209
        revision_menu_diff = gtk.MenuItem("View Changes")
185
210
        revision_menu_diff.connect('activate', 
186
 
                lambda w: self.treeview.show_diff())
 
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
216
 
188
217
        revision_menu_tag = gtk.MenuItem("Tag Revision")
189
218
        revision_menu_tag.connect('activate', self._tag_revision_cb)
190
219
 
191
220
        revision_menu.add(revision_menu_tag)
192
221
        revision_menu.add(revision_menu_diff)
 
222
        revision_menu.add(revision_menu_compare)
193
223
 
194
224
        branch_menu = gtk.Menu()
195
225
        branch_menuitem = gtk.MenuItem("_Branch")
222
252
        """Construct the top-half of the window."""
223
253
        # FIXME: Make broken_line_length configurable
224
254
 
225
 
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
255
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
226
256
 
227
257
        self.treeview.connect('revision-selected',
228
258
                self._treeselection_changed_cb)
 
259
        self.treeview.connect('revision-activated',
 
260
                self._tree_revision_activated)
229
261
 
230
262
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
231
263
 
233
265
            option = self.config.get_user_option(col + '-column-visible')
234
266
            if option is not None:
235
267
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
268
            else:
 
269
                self.treeview.set_property(col + '-column-visible', False)
236
270
 
237
271
        self.treeview.show()
238
272
 
285
319
        parents  = self.treeview.get_parents()
286
320
        children = self.treeview.get_children()
287
321
 
288
 
        if revision is not None:
 
322
        if revision and revision != NULL_REVISION:
289
323
            prev_menu = gtk.Menu()
290
324
            if len(parents) > 0:
291
325
                self.prev_rev_action.set_sensitive(True)
292
326
                for parent_id in parents:
293
 
                    parent = self.branch.repository.get_revision(parent_id)
294
 
                    try:
295
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
296
 
                    except KeyError:
297
 
                        str = ""
 
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 = ""
298
333
 
299
 
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
300
 
                    item.connect('activate', self._set_revision_cb, parent_id)
301
 
                    prev_menu.add(item)
 
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)
302
337
                prev_menu.show_all()
303
338
            else:
304
339
                self.prev_rev_action.set_sensitive(False)
328
363
 
329
364
            self.revisionview.set_revision(revision)
330
365
            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)    
331
393
 
332
394
    def _back_clicked_cb(self, *args):
333
395
        """Callback for when the back button is clicked."""
344
406
 
345
407
    def _show_clicked_cb(self, revid, parentid):
346
408
        """Callback for when the show button for a parent is clicked."""
347
 
        self.treeview.show_diff(revid, parentid)
 
409
        self.show_diff(revid, parentid)
348
410
        self.treeview.grab_focus()
349
411
 
 
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
            
350
428
    def _set_revision_cb(self, w, revision_id):
351
429
        self.treeview.set_revision_id(revision_id)
352
430
 
409
487
            tags.sort()
410
488
            tags.reverse()
411
489
            for tag, revid in tags:
412
 
                tag_item = gtk.MenuItem(tag)
 
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)
413
494
                tag_item.connect('activate', self._tag_selected_cb, revid)
414
495
                menu.add(tag_item)
415
496
            self.go_menu_tags.set_submenu(menu)
420
501
 
421
502
        self.go_menu_tags.show_all()
422
503
 
 
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
 
423
519