/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: Jasper Groenewegen
  • Date: 2008-07-20 13:23:29 UTC
  • mto: This revision was merged to the branch mainline in revision 560.
  • Revision ID: colbrac@xs4all.nl-20080720132329-srxnl5lf1k3z43jz
Better way to return response

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
48
48
        self.maxnum      = maxnum
49
49
        self.config      = GlobalConfig()
50
50
 
 
51
        self._sizes      = {} # window and widget sizes
 
52
 
51
53
        if self.config.get_user_option('viz-compact-view') == 'yes':
52
54
            self.compact_view = True
53
55
        else:
54
56
            self.compact_view = False
55
57
 
56
 
        self.set_title(branch._get_nick(local=True) + " - revision history")
 
58
        self.set_title(branch.nick + " - revision history")
57
59
 
 
60
        # Use three-quarters of the screen by default
 
61
        screen = self.get_screen()
 
62
        monitor = screen.get_monitor_geometry(0)
 
63
        width = int(monitor.width * 0.75)
 
64
        height = int(monitor.height * 0.75)
58
65
        # user-configured window size
59
66
        size = self._load_size('viz-window-size')
60
67
        if size:
61
68
            width, height = size
62
 
        else:
63
 
            # Use three-quarters of the screen by default
64
 
            screen = self.get_screen()
65
 
            monitor = screen.get_monitor_geometry(0)
66
 
            width = int(monitor.width * 0.75)
67
 
            height = int(monitor.height * 0.75)
68
69
        self.set_default_size(width, height)
69
70
        self.set_size_request(width/3, height/3)
70
 
        self._save_size_on_destroy(self, 'viz-window-size')
 
71
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
71
72
 
72
73
        # FIXME AndyFitz!
73
74
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
102
103
 
103
104
        self.construct()
104
105
 
105
 
    def _save_size_on_destroy(self, widget, config_name):
106
 
        """Creates a hook that saves the size of widget to config option 
107
 
           config_name when the window is destroyed/closed."""
108
 
        def save_size(src):
109
 
            width, height = widget.allocation.width, widget.allocation.height
110
 
            value = '%sx%s' % (width, height)
111
 
            self.config.set_user_option(config_name, value)
112
 
        self.connect("destroy", save_size)
113
 
 
114
106
    def set_revision(self, revid):
115
107
        self.treeview.set_revision_id(revid)
116
108
 
132
124
        vbox.pack_start(self.paned, expand=True, fill=True)
133
125
        vbox.set_focus_child(self.paned)
134
126
 
135
 
        self.treeview.connect('revision-selected',
136
 
                self._treeselection_changed_cb)
137
 
        self.treeview.connect('revision-activated',
138
 
                self._tree_revision_activated)
139
 
 
140
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
141
127
        vbox.show()
142
 
    
 
128
 
143
129
    def construct_menubar(self):
144
130
        menubar = gtk.MenuBar()
145
131
 
190
176
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
191
177
        view_menu_compact.set_active(self.compact_view)
192
178
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
193
 
        
 
179
 
194
180
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
195
181
        view_menu_diffs.set_active(False)
196
182
        if self.config.get_user_option('viz-show-diffs') == 'True':
197
183
            view_menu_diffs.set_active(True)
198
184
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
199
 
        
 
185
 
200
186
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
201
187
        view_menu_wide_diffs.set_active(False)
202
188
        if self.config.get_user_option('viz-wide-diffs') == 'True':
203
189
            view_menu_wide_diffs.set_active(True)
204
190
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
205
 
        
206
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
207
 
        view_menu_wrap_diffs.set_active(False)
208
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
209
 
            view_menu_wrap_diffs.set_active(True)
210
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
211
 
                
 
191
 
212
192
        view_menu.add(view_menu_toolbar)
213
193
        view_menu.add(view_menu_compact)
214
 
        view_menu.add(gtk.SeparatorMenuItem())
215
194
        view_menu.add(view_menu_diffs)
216
195
        view_menu.add(view_menu_wide_diffs)
217
 
        view_menu.add(view_menu_wrap_diffs)
218
196
        view_menu.add(gtk.SeparatorMenuItem())
219
197
 
220
198
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
243
221
        tag_image.set_from_file(icon_path("tag-16.png"))
244
222
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
245
223
        self.go_menu_tags.set_image(tag_image)
246
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
 
224
        self._update_tags()
247
225
 
248
226
        go_menu.add(go_menu_next)
249
227
        go_menu.add(go_menu_prev)
302
280
 
303
281
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
304
282
 
 
283
        self.treeview.connect('revision-selected',
 
284
                self._treeselection_changed_cb)
 
285
        self.treeview.connect('revision-activated',
 
286
                self._tree_revision_activated)
 
287
 
 
288
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
289
 
305
290
        for col in ["revno", "date"]:
306
291
            option = self.config.get_user_option(col + '-column-visible')
307
292
            if option is not None:
322
307
        else:
323
308
            (width, height) = self.get_size()
324
309
            align.set_size_request(width, int(height / 2.5))
325
 
        self._save_size_on_destroy(align, 'viz-graph-size')
 
310
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
326
311
        align.show()
327
312
 
328
313
        return align
365
350
        if size:
366
351
            width, height = size
367
352
            self.revisionview.set_size_request(width, height)
368
 
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
 
353
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
369
354
        self.revisionview.show()
370
355
        self.revisionview.set_show_callback(self._show_clicked_cb)
371
356
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
437
422
 
438
423
            self.revisionview.set_revision(revision)
439
424
            self.revisionview.set_children(children)
 
425
 
440
426
            self.update_diff_panel(revision, parents)
441
427
 
442
428
    def _tree_revision_activated(self, widget, path, col):
446
432
        parents  = self.treeview.get_parents()
447
433
 
448
434
        if len(parents) == 0:
449
 
            parent_id = NULL_REVISION
 
435
            parent_id = None
450
436
        else:
451
437
            parent_id = parents[0]
452
438
 
559
545
        self._make_diff_nonzero_size()
560
546
 
561
547
        self.treeview.emit('revision-selected')
562
 
    
563
 
    def _diff_wrap_changed(self, widget):
564
 
        """Toggle word wrap in the diff widget."""
565
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
566
 
        self.diff._on_wraplines_toggled(widget)
567
 
    
 
548
 
568
549
    def _show_about_cb(self, w):
569
550
        dialog = AboutDialog()
570
551
        dialog.connect('response', lambda d,r: d.destroy())
578
559
 
579
560
        if self.branch.supports_tags():
580
561
            tags = self.branch.tags.get_tag_dict().items()
581
 
            tags.sort(reverse=True)
 
562
            tags.sort()
 
563
            tags.reverse()
582
564
            for tag, revid in tags:
583
565
                tag_image = gtk.Image()
584
566
                tag_image.set_from_file(icon_path('tag-16.png'))
585
567
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
586
568
                tag_item.set_image(tag_image)
587
569
                tag_item.connect('activate', self._tag_selected_cb, revid)
588
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
589
570
                menu.add(tag_item)
590
571
            self.go_menu_tags.set_submenu(menu)
591
572
 
604
585
        if size:
605
586
            width, height = [int(num) for num in size.split('x')]
606
587
            # avoid writing config every time we start
 
588
            self._sizes[name] = (width, height)
607
589
            return width, height
608
590
        return None
609
591
 
610
 
    def show_diff(self, revid=None, parentid=NULL_REVISION):
 
592
    def _on_size_allocate(self, widget, allocation, name):
 
593
        """When window has been resized, save the new size."""
 
594
        width, height = 0, 0
 
595
        if name in self._sizes:
 
596
            width, height = self._sizes[name]
 
597
 
 
598
        size_changed = (width != allocation.width) or \
 
599
                (height != allocation.height)
 
600
 
 
601
        if size_changed:
 
602
            width, height = allocation.width, allocation.height
 
603
            self._sizes[name] = (width, height)
 
604
            value = '%sx%s' % (width, height)
 
605
            self.config.set_user_option(name, value)
 
606
 
 
607
    def show_diff(self, revid=None, parentid=None):
611
608
        """Open a new window to show a diff between the given revisions."""
612
609
        from bzrlib.plugins.gtk.diff import DiffWindow
613
610
        window = DiffWindow(parent=self)
614
611
 
 
612
        if parentid is None:
 
613
            parentid = NULL_REVISION
 
614
 
615
615
        rev_tree    = self.branch.repository.revision_tree(revid)
616
616
        parent_tree = self.branch.repository.revision_tree(parentid)
617
617
 
618
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
618
        description = revid + " - " + self.branch.nick
619
619
        window.set_diff(description, rev_tree, parent_tree)
620
620
        window.show()
621
621
 
626
626
 
627
627
        if not revision: # default to selected row
628
628
            revision = self.treeview.get_revision()
629
 
        if revision == NULL_REVISION:
 
629
        if (not revision) or (revision == NULL_REVISION):
630
630
            return
631
631
 
632
632
        if not parents: # default to selected row's parents
633
633
            parents  = self.treeview.get_parents()
634
634
        if len(parents) == 0:
635
 
            parent_id = NULL_REVISION
 
635
            parent_id = None
636
636
        else:
637
637
            parent_id = parents[0]
638
638
 
640
640
        parent_tree = self.branch.repository.revision_tree(parent_id)
641
641
 
642
642
        self.diff.set_diff(rev_tree, parent_tree)
643
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
644
 
            self.diff._on_wraplines_toggled(wrap=True)
645
643
        self.diff.show_all()