/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-07-18 12:44:12 UTC
  • mfrom: (549.1.1 trunk)
  • Revision ID: jelmer@samba.org-20080718124412-kzwx2807j7nd3mkw
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
import gobject
14
14
import pango
15
15
 
16
 
from bzrlib.plugins.gtk.window import Window
17
16
from bzrlib.plugins.gtk import icon_path
 
17
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
18
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
20
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
 
21
from bzrlib.plugins.gtk.window import Window
 
22
 
 
23
from bzrlib.config import BranchConfig, GlobalConfig
21
24
from bzrlib.revision import Revision, NULL_REVISION
22
 
from bzrlib.config import BranchConfig
23
 
from bzrlib.config import GlobalConfig
 
25
from bzrlib.trace import mutter
24
26
 
25
27
class BranchWindow(Window):
26
28
    """Branch window.
46
48
        self.maxnum      = maxnum
47
49
        self.config      = GlobalConfig()
48
50
 
 
51
        self._sizes      = {} # window and widget sizes
 
52
 
49
53
        if self.config.get_user_option('viz-compact-view') == 'yes':
50
54
            self.compact_view = True
51
55
        else:
58
62
        monitor = screen.get_monitor_geometry(0)
59
63
        width = int(monitor.width * 0.75)
60
64
        height = int(monitor.height * 0.75)
 
65
        # user-configured window size
 
66
        size = self._load_size('viz-window-size')
 
67
        if size:
 
68
            width, height = size
61
69
        self.set_default_size(width, height)
 
70
        self.set_size_request(width/3, height/3)
 
71
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
62
72
 
63
73
        # FIXME AndyFitz!
64
74
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
102
112
        self.add(vbox)
103
113
 
104
114
        self.paned = gtk.VPaned()
105
 
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
106
 
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
115
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
 
116
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
107
117
        self.paned.show()
108
118
 
109
 
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
110
 
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
111
 
        
 
119
        nav = self.construct_navigation()
 
120
        menubar = self.construct_menubar()
 
121
        vbox.pack_start(menubar, expand=False, fill=True)
 
122
        vbox.pack_start(nav, expand=False, fill=True)
 
123
 
112
124
        vbox.pack_start(self.paned, expand=True, fill=True)
113
125
        vbox.set_focus_child(self.paned)
114
126
 
135
147
        edit_menuitem = gtk.MenuItem("_Edit")
136
148
        edit_menuitem.set_submenu(edit_menu)
137
149
 
138
 
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
139
 
 
140
150
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
141
151
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
142
152
 
143
153
        edit_menu_globopts = gtk.MenuItem("Global Settings")
144
154
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
145
155
 
146
 
        edit_menu.add(edit_menu_find)
147
156
        edit_menu.add(edit_menu_branchopts)
148
157
        edit_menu.add(edit_menu_globopts)
149
158
 
159
168
 
160
169
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
170
        view_menu_toolbar.set_active(True)
 
171
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
 
172
            view_menu_toolbar.set_active(False)
 
173
            self.toolbar.hide()
162
174
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
163
175
 
164
176
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
165
177
        view_menu_compact.set_active(self.compact_view)
166
178
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
167
179
 
 
180
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
 
181
        view_menu_diffs.set_active(False)
 
182
        if self.config.get_user_option('viz-show-diffs') == 'True':
 
183
            view_menu_diffs.set_active(True)
 
184
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
 
185
 
 
186
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
 
187
        view_menu_wide_diffs.set_active(False)
 
188
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
189
            view_menu_wide_diffs.set_active(True)
 
190
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
 
191
 
168
192
        view_menu.add(view_menu_toolbar)
169
193
        view_menu.add(view_menu_compact)
 
194
        view_menu.add(view_menu_diffs)
 
195
        view_menu.add(view_menu_wide_diffs)
170
196
        view_menu.add(gtk.SeparatorMenuItem())
171
197
 
172
198
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
202
228
        go_menu.add(gtk.SeparatorMenuItem())
203
229
        go_menu.add(self.go_menu_tags)
204
230
 
205
 
        revision_menu = gtk.Menu()
 
231
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
206
232
        revision_menuitem = gtk.MenuItem("_Revision")
207
 
        revision_menuitem.set_submenu(revision_menu)
208
 
 
209
 
        revision_menu_diff = gtk.MenuItem("View Changes")
210
 
        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)
216
 
 
217
 
        revision_menu_tag = gtk.MenuItem("Tag Revision")
218
 
        revision_menu_tag.connect('activate', self._tag_revision_cb)
219
 
 
220
 
        revision_menu.add(revision_menu_tag)
221
 
        revision_menu.add(revision_menu_diff)
222
 
        revision_menu.add(revision_menu_compare)
 
233
        revision_menuitem.set_submenu(self.revision_menu)
223
234
 
224
235
        branch_menu = gtk.Menu()
225
236
        branch_menuitem = gtk.MenuItem("_Branch")
228
239
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
229
240
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
230
241
 
 
242
        try:
 
243
            from bzrlib.plugins import search
 
244
        except ImportError:
 
245
            mutter("Didn't find search plugin")
 
246
        else:
 
247
            branch_menu.add(gtk.SeparatorMenuItem())
 
248
 
 
249
            branch_index_menuitem = gtk.MenuItem("_Index")
 
250
            branch_index_menuitem.connect('activate', self._branch_index_cb)
 
251
            branch_menu.add(branch_index_menuitem)
 
252
 
 
253
            branch_search_menuitem = gtk.MenuItem("_Search")
 
254
            branch_search_menuitem.connect('activate', self._branch_search_cb)
 
255
            branch_menu.add(branch_search_menuitem)
 
256
 
231
257
        help_menu = gtk.Menu()
232
258
        help_menuitem = gtk.MenuItem("_Help")
233
259
        help_menuitem.set_submenu(help_menu)
273
299
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
274
300
        align.set_padding(5, 0, 0, 0)
275
301
        align.add(self.treeview)
 
302
        # user-configured size
 
303
        size = self._load_size('viz-graph-size')
 
304
        if size:
 
305
            width, height = size
 
306
            align.set_size_request(width, height)
 
307
        else:
 
308
            (width, height) = self.get_size()
 
309
            align.set_size_request(width, int(height / 2.5))
 
310
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
276
311
        align.show()
277
312
 
278
313
        return align
300
335
 
301
336
    def construct_bottom(self):
302
337
        """Construct the bottom half of the window."""
 
338
        if self.config.get_user_option('viz-wide-diffs') == 'True':
 
339
            self.diff_paned = gtk.VPaned()
 
340
        else:
 
341
            self.diff_paned = gtk.HPaned()
 
342
        (width, height) = self.get_size()
 
343
        self.diff_paned.set_size_request(20, 20) # shrinkable
 
344
 
303
345
        from bzrlib.plugins.gtk.revisionview import RevisionView
304
346
        self.revisionview = RevisionView(branch=self.branch)
305
 
        (width, height) = self.get_size()
306
 
        self.revisionview.set_size_request(width, int(height / 2.5))
 
347
        self.revisionview.set_size_request(width/3, int(height / 2.5))
 
348
        # user-configured size
 
349
        size = self._load_size('viz-revisionview-size')
 
350
        if size:
 
351
            width, height = size
 
352
            self.revisionview.set_size_request(width, height)
 
353
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
307
354
        self.revisionview.show()
308
355
        self.revisionview.set_show_callback(self._show_clicked_cb)
309
356
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
310
357
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
311
 
        return self.revisionview
 
358
        self.diff_paned.pack1(self.revisionview)
 
359
 
 
360
        from bzrlib.plugins.gtk.diff import DiffWidget
 
361
        self.diff = DiffWidget()
 
362
        self.diff_paned.pack2(self.diff)
 
363
 
 
364
        self.diff_paned.show_all()
 
365
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
366
            self.diff.hide()
 
367
 
 
368
        return self.diff_paned
312
369
 
313
370
    def _tag_selected_cb(self, menuitem, revid):
314
371
        self.treeview.set_revision_id(revid)
319
376
        parents  = self.treeview.get_parents()
320
377
        children = self.treeview.get_children()
321
378
 
 
379
        self.revision_menu.set_revision_ids([revision.revision_id])
 
380
 
322
381
        if revision and revision != NULL_REVISION:
323
382
            prev_menu = gtk.Menu()
324
383
            if len(parents) > 0:
363
422
 
364
423
            self.revisionview.set_revision(revision)
365
424
            self.revisionview.set_children(children)
366
 
    
 
425
 
 
426
            self.update_diff_panel(revision, parents)
 
427
 
367
428
    def _tree_revision_activated(self, widget, path, col):
368
429
        # TODO: more than one parent
369
430
        """Callback for when a treeview row gets activated."""
378
439
        self.show_diff(revision.revision_id, parent_id)
379
440
        self.treeview.grab_focus()
380
441
        
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
 
 
394
442
    def _back_clicked_cb(self, *args):
395
443
        """Callback for when the back button is clicked."""
396
444
        self.treeview.back()
409
457
        self.show_diff(revid, parentid)
410
458
        self.treeview.grab_focus()
411
459
 
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
460
    def _set_revision_cb(self, w, revision_id):
429
461
        self.treeview.set_revision_id(revision_id)
430
462
 
440
472
        self.treeview.set_property('compact', self.compact_view)
441
473
        self.treeview.refresh()
442
474
 
443
 
    def _tag_revision_cb(self, w):
444
 
        try:
445
 
            self.treeview.set_sensitive(False)
446
 
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
447
 
            response = dialog.run()
448
 
            if response != gtk.RESPONSE_NONE:
449
 
                dialog.hide()
450
 
            
451
 
                if response == gtk.RESPONSE_OK:
452
 
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
453
 
                
454
 
                dialog.destroy()
455
 
 
456
 
        finally:
457
 
            self.treeview.set_sensitive(True)
 
475
    def _branch_index_cb(self, w):
 
476
        from bzrlib.plugins.search import index as _mod_index
 
477
        _mod_index.index_url(self.branch.base)
 
478
 
 
479
    def _branch_search_cb(self, w):
 
480
        from bzrlib.plugins.gtk.search import SearchDialog
 
481
        dialog = SearchDialog(self.branch)
 
482
        
 
483
        if dialog.run() == gtk.RESPONSE_OK:
 
484
            self.set_revision(dialog.get_revision())
 
485
 
 
486
        dialog.destroy()
458
487
 
459
488
    def _about_dialog_cb(self, w):
460
489
        from bzrlib.plugins.gtk.about import AboutDialog
467
496
 
468
497
    def _toolbar_visibility_changed(self, col):
469
498
        if col.get_active():
470
 
            self.toolbar.show() 
 
499
            self.toolbar.show()
471
500
        else:
472
501
            self.toolbar.hide()
 
502
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
 
503
 
 
504
    def _make_diff_nonzero_size(self):
 
505
        """make sure the diff isn't zero-width or zero-height"""
 
506
        alloc = self.diff.get_allocation()
 
507
        if (alloc.width < 10) or (alloc.height < 10):
 
508
            width, height = self.get_size()
 
509
            self.revisionview.set_size_request(width/3, int(height / 2.5))
 
510
 
 
511
    def _diff_visibility_changed(self, col):
 
512
        """Hide or show the diff panel."""
 
513
        if col.get_active():
 
514
            self.diff.show()
 
515
            self._make_diff_nonzero_size()
 
516
        else:
 
517
            self.diff.hide()
 
518
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
 
519
        self.update_diff_panel()
 
520
 
 
521
    def _diff_placement_changed(self, col):
 
522
        """Toggle the diff panel's position."""
 
523
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
 
524
 
 
525
        old = self.paned.get_child2()
 
526
        self.paned.remove(old)
 
527
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
528
        self._make_diff_nonzero_size()
 
529
 
 
530
        self.treeview.emit('revision-selected')
473
531
 
474
532
    def _show_about_cb(self, w):
475
533
        dialog = AboutDialog()
501
559
 
502
560
        self.go_menu_tags.show_all()
503
561
 
 
562
    def _load_size(self, name):
 
563
        """Read and parse 'name' from self.config.
 
564
        The value is a string, formatted as WIDTHxHEIGHT
 
565
        Returns None, or (width, height)
 
566
        """
 
567
        size = self.config.get_user_option(name)
 
568
        if size:
 
569
            width, height = [int(num) for num in size.split('x')]
 
570
            # avoid writing config every time we start
 
571
            self._sizes[name] = (width, height)
 
572
            return width, height
 
573
        return None
 
574
 
 
575
    def _on_size_allocate(self, widget, allocation, name):
 
576
        """When window has been resized, save the new size."""
 
577
        width, height = 0, 0
 
578
        if name in self._sizes:
 
579
            width, height = self._sizes[name]
 
580
 
 
581
        size_changed = (width != allocation.width) or \
 
582
                (height != allocation.height)
 
583
 
 
584
        if size_changed:
 
585
            width, height = allocation.width, allocation.height
 
586
            self._sizes[name] = (width, height)
 
587
            value = '%sx%s' % (width, height)
 
588
            self.config.set_user_option(name, value)
 
589
 
504
590
    def show_diff(self, revid=None, parentid=None):
505
591
        """Open a new window to show a diff between the given revisions."""
506
592
        from bzrlib.plugins.gtk.diff import DiffWindow
516
602
        window.set_diff(description, rev_tree, parent_tree)
517
603
        window.show()
518
604
 
519
 
 
 
605
    def update_diff_panel(self, revision=None, parents=None):
 
606
        """Show the current revision in the diff panel."""
 
607
        if self.config.get_user_option('viz-show-diffs') != 'True':
 
608
            return
 
609
 
 
610
        if not revision: # default to selected row
 
611
            revision = self.treeview.get_revision()
 
612
        if (not revision) or (revision == NULL_REVISION):
 
613
            return
 
614
 
 
615
        if not parents: # default to selected row's parents
 
616
            parents  = self.treeview.get_parents()
 
617
        if len(parents) == 0:
 
618
            parent_id = None
 
619
        else:
 
620
            parent_id = parents[0]
 
621
 
 
622
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
 
623
        parent_tree = self.branch.repository.revision_tree(parent_id)
 
624
 
 
625
        self.diff.set_diff(rev_tree, parent_tree)
 
626
        self.diff.show_all()