/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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