/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: Gary van der Merwe
  • Date: 2008-02-13 08:53:14 UTC
  • mto: (423.1.14 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: garyvdm@garyvdm-desktop-20080213085314-1hqguvfy113qb70b
Add branchview dir to setup.py

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)
 
173
        self.go_menu_tags = gtk.MenuItem("_Tags")
199
174
        self._update_tags()
200
175
 
201
176
        go_menu.add(go_menu_next)
209
184
 
210
185
        revision_menu_diff = gtk.MenuItem("View Changes")
211
186
        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)
 
187
                lambda w: self.treeview.show_diff())
217
188
 
218
189
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
190
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
191
 
221
192
        revision_menu.add(revision_menu_tag)
222
193
        revision_menu.add(revision_menu_diff)
223
 
        revision_menu.add(revision_menu_compare)
224
194
 
225
195
        branch_menu = gtk.Menu()
226
196
        branch_menuitem = gtk.MenuItem("_Branch")
229
199
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
200
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
201
 
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
202
        help_menu = gtk.Menu()
242
203
        help_menuitem = gtk.MenuItem("_Help")
243
204
        help_menuitem.set_submenu(help_menu)
257
218
        menubar.show_all()
258
219
 
259
220
        return menubar
 
221
    
 
222
    def construct_loading_msg(self):
 
223
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
224
                                                 gtk.ICON_SIZE_BUTTON)
 
225
        image_loading.show()
 
226
        
 
227
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
228
        label_loading.set_alignment(0.0, 0.5)
 
229
        label_loading.show()
 
230
        
 
231
        self.loading_msg_box = gtk.HBox()
 
232
        self.loading_msg_box.set_spacing(5)
 
233
        self.loading_msg_box.set_border_width(5)        
 
234
        self.loading_msg_box.pack_start(image_loading, False, False)
 
235
        self.loading_msg_box.pack_start(label_loading, True, True)
 
236
        self.loading_msg_box.show()
 
237
        
 
238
        return self.loading_msg_box
260
239
 
261
240
    def construct_top(self):
262
241
        """Construct the top-half of the window."""
263
242
        # FIXME: Make broken_line_length configurable
264
243
 
265
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
244
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
266
245
 
267
246
        self.treeview.connect('revision-selected',
268
247
                self._treeselection_changed_cb)
269
 
        self.treeview.connect('revision-activated',
270
 
                self._tree_revision_activated)
 
248
 
 
249
        self.treeview.connect('revisions-loaded', 
 
250
                lambda x: self.loading_msg_box.hide())
271
251
 
272
252
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
273
253
 
275
255
            option = self.config.get_user_option(col + '-column-visible')
276
256
            if option is not None:
277
257
                self.treeview.set_property(col + '-column-visible', option == 'True')
278
 
            else:
279
 
                self.treeview.set_property(col + '-column-visible', False)
280
258
 
281
259
        self.treeview.show()
282
260
 
329
307
        parents  = self.treeview.get_parents()
330
308
        children = self.treeview.get_children()
331
309
 
332
 
        if revision and revision != NULL_REVISION:
 
310
        if revision is not None:
333
311
            prev_menu = gtk.Menu()
334
312
            if len(parents) > 0:
335
313
                self.prev_rev_action.set_sensitive(True)
336
314
                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 = ""
 
315
                    parent = self.branch.repository.get_revision(parent_id)
 
316
                    try:
 
317
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
318
                    except KeyError:
 
319
                        str = ""
343
320
 
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)
 
321
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
322
                    item.connect('activate', self._set_revision_cb, parent_id)
 
323
                    prev_menu.add(item)
347
324
                prev_menu.show_all()
348
325
            else:
349
326
                self.prev_rev_action.set_sensitive(False)
373
350
 
374
351
            self.revisionview.set_revision(revision)
375
352
            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
353
 
404
354
    def _back_clicked_cb(self, *args):
405
355
        """Callback for when the back button is clicked."""
416
366
 
417
367
    def _show_clicked_cb(self, revid, parentid):
418
368
        """Callback for when the show button for a parent is clicked."""
419
 
        self.show_diff(revid, parentid)
 
369
        self.treeview.show_diff(revid, parentid)
420
370
        self.treeview.grab_focus()
421
371
 
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
372
    def _set_revision_cb(self, w, revision_id):
439
373
        self.treeview.set_revision_id(revision_id)
440
374
 
466
400
        finally:
467
401
            self.treeview.set_sensitive(True)
468
402
 
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
403
    def _about_dialog_cb(self, w):
474
404
        from bzrlib.plugins.gtk.about import AboutDialog
475
405
 
491
421
        dialog.run()
492
422
 
493
423
    def _refresh_clicked(self, w):
494
 
        self.treeview.refresh()
 
424
        self.treeview.update()
495
425
 
496
426
    def _update_tags(self):
497
427
        menu = gtk.Menu()
501
431
            tags.sort()
502
432
            tags.reverse()
503
433
            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)
 
434
                tag_item = gtk.MenuItem(tag)
508
435
                tag_item.connect('activate', self._tag_selected_cb, revid)
509
436
                menu.add(tag_item)
510
437
            self.go_menu_tags.set_submenu(menu)
515
442
 
516
443
        self.go_menu_tags.show_all()
517
444
 
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
445