/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: Curtis Hovey
  • Date: 2011-08-27 18:35:08 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827183508-ugqbp58na4mtt1no
Updated the pixbuf calls to gtk3.

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
19
20
from gi.repository import Gtk
20
21
 
21
22
from bzrlib.branch import Branch
36
37
    
37
38
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
38
39
        """ Initialize the Merge dialog. """
39
 
        super(MergeDialog, self).__init__(
40
 
            title="Merge changes", parent=parent, flags=0,
41
 
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
40
        Gtk.Dialog.__init__(self, title="Merge changes",
 
41
                                  parent=parent,
 
42
                                  flags=0,
 
43
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
42
44
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
43
45
        # Get arguments
44
46
        self.wt = wt
54
56
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
55
57
            self._combo_source.append_text(entry)
56
58
        self._combo_source.connect("changed", self._on_combo_changed)
57
 
        self._button_merge = Gtk.Button(_i18n("_Merge"), use_underline=True)
 
59
        self._button_merge = Gtk.Button(_i18n("_Merge"))
58
60
        self._button_merge_icon = Gtk.Image()
59
61
        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
60
62
        self._button_merge.set_image(self._button_merge_icon)
65
67
        self._hbox.add(self._label_merge_from)
66
68
        self._hbox.add(self._combo_source)
67
69
        self._hbox.set_spacing(5)
68
 
        self.action_area.pack_end(self._button_merge, False, False, 0)
 
70
        self.action_area.pack_end(self._button_merge)
69
71
        
70
72
        if self.default_branch_path and os.path.isdir(
71
73
                            self.default_branch_path.partition('file://')[2]):