/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-27 11:20:34 UTC
  • mto: (577.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727112034-x3c07o6b5gk1drn5
Merge dialog: Add ability to choose between folder and custom location as merge source

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
 
58
60
        # user-configured window size
59
61
        size = self._load_size('viz-window-size')
67
69
            height = int(monitor.height * 0.75)
68
70
        self.set_default_size(width, height)
69
71
        self.set_size_request(width/3, height/3)
70
 
        self._save_size_on_destroy(self, 'viz-window-size')
 
72
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
71
73
 
72
74
        # FIXME AndyFitz!
73
75
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
102
104
 
103
105
        self.construct()
104
106
 
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
107
    def set_revision(self, revid):
115
108
        self.treeview.set_revision_id(revid)
116
109
 
132
125
        vbox.pack_start(self.paned, expand=True, fill=True)
133
126
        vbox.set_focus_child(self.paned)
134
127
 
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
128
        vbox.show()
142
129
    
143
130
    def construct_menubar(self):
243
230
        tag_image.set_from_file(icon_path("tag-16.png"))
244
231
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
245
232
        self.go_menu_tags.set_image(tag_image)
246
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
 
233
        self._update_tags()
247
234
 
248
235
        go_menu.add(go_menu_next)
249
236
        go_menu.add(go_menu_prev)
302
289
 
303
290
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
304
291
 
 
292
        self.treeview.connect('revision-selected',
 
293
                self._treeselection_changed_cb)
 
294
        self.treeview.connect('revision-activated',
 
295
                self._tree_revision_activated)
 
296
 
 
297
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
298
 
305
299
        for col in ["revno", "date"]:
306
300
            option = self.config.get_user_option(col + '-column-visible')
307
301
            if option is not None:
322
316
        else:
323
317
            (width, height) = self.get_size()
324
318
            align.set_size_request(width, int(height / 2.5))
325
 
        self._save_size_on_destroy(align, 'viz-graph-size')
 
319
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
326
320
        align.show()
327
321
 
328
322
        return align
365
359
        if size:
366
360
            width, height = size
367
361
            self.revisionview.set_size_request(width, height)
368
 
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
 
362
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
369
363
        self.revisionview.show()
370
364
        self.revisionview.set_show_callback(self._show_clicked_cb)
371
365
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
446
440
        parents  = self.treeview.get_parents()
447
441
 
448
442
        if len(parents) == 0:
449
 
            parent_id = NULL_REVISION
 
443
            parent_id = None
450
444
        else:
451
445
            parent_id = parents[0]
452
446
 
578
572
 
579
573
        if self.branch.supports_tags():
580
574
            tags = self.branch.tags.get_tag_dict().items()
581
 
            tags.sort(reverse=True)
 
575
            tags.sort()
 
576
            tags.reverse()
582
577
            for tag, revid in tags:
583
578
                tag_image = gtk.Image()
584
579
                tag_image.set_from_file(icon_path('tag-16.png'))
585
580
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
586
581
                tag_item.set_image(tag_image)
587
582
                tag_item.connect('activate', self._tag_selected_cb, revid)
588
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
589
583
                menu.add(tag_item)
590
584
            self.go_menu_tags.set_submenu(menu)
591
585
 
604
598
        if size:
605
599
            width, height = [int(num) for num in size.split('x')]
606
600
            # avoid writing config every time we start
 
601
            self._sizes[name] = (width, height)
607
602
            return width, height
608
603
        return None
609
604
 
610
 
    def show_diff(self, revid=None, parentid=NULL_REVISION):
 
605
    def _on_size_allocate(self, widget, allocation, name):
 
606
        """When window has been resized, save the new size."""
 
607
        width, height = 0, 0
 
608
        if name in self._sizes:
 
609
            width, height = self._sizes[name]
 
610
 
 
611
        size_changed = (width != allocation.width) or \
 
612
                (height != allocation.height)
 
613
 
 
614
        if size_changed:
 
615
            width, height = allocation.width, allocation.height
 
616
            self._sizes[name] = (width, height)
 
617
            value = '%sx%s' % (width, height)
 
618
            self.config.set_user_option(name, value)
 
619
 
 
620
    def show_diff(self, revid=None, parentid=None):
611
621
        """Open a new window to show a diff between the given revisions."""
612
622
        from bzrlib.plugins.gtk.diff import DiffWindow
613
623
        window = DiffWindow(parent=self)
614
624
 
 
625
        if parentid is None:
 
626
            parentid = NULL_REVISION
 
627
 
615
628
        rev_tree    = self.branch.repository.revision_tree(revid)
616
629
        parent_tree = self.branch.repository.revision_tree(parentid)
617
630
 
618
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
631
        description = revid + " - " + self.branch.nick
619
632
        window.set_diff(description, rev_tree, parent_tree)
620
633
        window.show()
621
634
 
626
639
 
627
640
        if not revision: # default to selected row
628
641
            revision = self.treeview.get_revision()
629
 
        if revision == NULL_REVISION:
 
642
        if (not revision) or (revision == NULL_REVISION):
630
643
            return
631
644
 
632
645
        if not parents: # default to selected row's parents
633
646
            parents  = self.treeview.get_parents()
634
647
        if len(parents) == 0:
635
 
            parent_id = NULL_REVISION
 
648
            parent_id = None
636
649
        else:
637
650
            parent_id = parents[0]
638
651