/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-07-31 15:52:43 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731155243-ln8istmxbryhb4pz
Mechanical changes made by pygi.convert.sh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
22
22
except:
23
23
    pass
24
24
 
25
 
import gtk
 
25
from gi.repository import Gtk
26
26
 
27
27
from bzrlib.branch import Branch
28
28
import bzrlib.errors as errors
37
37
from bzrlib.plugins.gtk.i18n import _i18n
38
38
 
39
39
 
40
 
class MergeDialog(gtk.Dialog):
 
40
class MergeDialog(Gtk.Dialog):
41
41
    """ Display the Merge dialog and perform the needed actions. """
42
42
    
43
43
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
44
44
        """ Initialize the Merge dialog. """
45
 
        gtk.Dialog.__init__(self, title="Merge changes",
 
45
        GObject.GObject.__init__(self, title="Merge changes",
46
46
                                  parent=parent,
47
47
                                  flags=0,
48
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
48
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
49
49
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
50
50
        # Get arguments
51
51
        self.wt = wt
54
54
        self.parent_window = parent
55
55
        
56
56
        # Create widgets
57
 
        self._hbox = gtk.HBox()
58
 
        self._source = gtk.HBox()
59
 
        self._label_merge_from = gtk.Label(_i18n("Merge from"))
60
 
        self._combo_source = gtk.combo_box_new_text()
 
57
        self._hbox = Gtk.HBox()
 
58
        self._source = Gtk.HBox()
 
59
        self._label_merge_from = Gtk.Label(label=_i18n("Merge from"))
 
60
        self._combo_source = Gtk.ComboBoxText()
61
61
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
62
62
            self._combo_source.append_text(entry)
63
63
        self._combo_source.connect("changed", self._on_combo_changed)
64
 
        self._button_merge = gtk.Button(_i18n("_Merge"))
65
 
        self._button_merge_icon = gtk.Image()
66
 
        self._button_merge_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
 
64
        self._button_merge = Gtk.Button(_i18n("_Merge"))
 
65
        self._button_merge_icon = Gtk.Image()
 
66
        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
67
67
        self._button_merge.set_image(self._button_merge_icon)
68
68
        self._button_merge.connect('clicked', self._on_merge_clicked)
69
69
        
87
87
    
88
88
    def _on_folder_source(self):
89
89
        """ Merge from folder, create a filechooser dialog and button """
90
 
        self._source = gtk.HBox()
91
 
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
 
90
        self._source = Gtk.HBox()
 
91
        self._filechooser_dialog = Gtk.FileChooserDialog(title="Please select a folder",
92
92
                                    parent=self.parent_window,
93
 
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
94
 
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
95
 
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
96
 
        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
97
 
        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
 
93
                                    action=Gtk.FileChooserAction.SELECT_FOLDER,
 
94
                                    buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
 
95
                                             Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
 
96
        self._filechooser_dialog.set_default_response(Gtk.ResponseType.OK)
 
97
        self._filechooser = Gtk.FileChooserButton(self._filechooser_dialog)
98
98
        self._filechooser.show()
99
99
        directory = getattr(self, 'directory', None)
100
100
        if not directory:
106
106
    
107
107
    def _on_custom_source(self):
108
108
        """ Merge from a custom source (can be folder, remote, etc), create entry """
109
 
        self._source = gtk.HBox()
110
 
        self._custom_entry = gtk.Entry()
 
109
        self._source = Gtk.HBox()
 
110
        self._custom_entry = Gtk.Entry()
111
111
        if self.default_branch_path:
112
112
            self._custom_entry.set_text(self.default_branch_path)
113
113
        self._custom_entry.connect("activate", self._on_merge_clicked)
155
155
            warning_dialog(_i18n('Conflicts encountered'),
156
156
                           _i18n('Please resolve the conflicts manually before committing.'))
157
157
        
158
 
        self.response(gtk.RESPONSE_OK)
 
158
        self.response(Gtk.ResponseType.OK)