/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-09-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

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
54
55
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
55
56
            self._combo_source.append_text(entry)
56
57
        self._combo_source.connect("changed", self._on_combo_changed)
57
 
        self._button_merge = Gtk.Button(_i18n("_Merge"), use_underline=True)
 
58
        self._button_merge = Gtk.Button(_i18n("_Merge"))
58
59
        self._button_merge_icon = Gtk.Image()
59
60
        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
60
61
        self._button_merge.set_image(self._button_merge_icon)
65
66
        self._hbox.add(self._label_merge_from)
66
67
        self._hbox.add(self._combo_source)
67
68
        self._hbox.set_spacing(5)
68
 
        self.action_area.pack_end(self._button_merge, False, False, 0)
 
69
        self.action_area.pack_end(self._button_merge)
69
70
        
70
71
        if self.default_branch_path and os.path.isdir(
71
72
                            self.default_branch_path.partition('file://')[2]):