/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 merge.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
16
16
 
17
17
import os
18
18
 
19
 
from gi.repository import GObject
20
19
from gi.repository import Gtk
21
20
 
22
21
from bzrlib.branch import Branch
37
36
    
38
37
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
39
38
        """ Initialize the Merge dialog. """
40
 
        Gtk.Dialog.__init__(self, title="Merge changes",
41
 
                                  parent=parent,
42
 
                                  flags=0,
43
 
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
39
        super(MergeDialog, self).__init__(
 
40
            title="Merge changes", parent=parent, flags=0,
 
41
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
44
42
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
45
43
        # Get arguments
46
44
        self.wt = wt
67
65
        self._hbox.add(self._label_merge_from)
68
66
        self._hbox.add(self._combo_source)
69
67
        self._hbox.set_spacing(5)
70
 
        self.action_area.pack_end(self._button_merge)
 
68
        self.action_area.pack_end(self._button_merge, False, False, 0)
71
69
        
72
70
        if self.default_branch_path and os.path.isdir(
73
71
                            self.default_branch_path.partition('file://')[2]):