/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
 
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
 
25
 
import gtk
 
19
from gi.repository import Gtk
26
20
 
27
21
from bzrlib.branch import Branch
28
22
import bzrlib.errors as errors
37
31
from bzrlib.plugins.gtk.i18n import _i18n
38
32
 
39
33
 
40
 
class MergeDialog(gtk.Dialog):
 
34
class MergeDialog(Gtk.Dialog):
41
35
    """ Display the Merge dialog and perform the needed actions. """
42
36
    
43
37
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
44
38
        """ Initialize the Merge dialog. """
45
 
        gtk.Dialog.__init__(self, title="Merge changes",
46
 
                                  parent=parent,
47
 
                                  flags=0,
48
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
39
        super(MergeDialog, self).__init__(
 
40
            title="Merge changes", parent=parent, flags=0,
 
41
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
49
42
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
50
43
        # Get arguments
51
44
        self.wt = wt
54
47
        self.parent_window = parent
55
48
        
56
49
        # 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()
 
50
        self._hbox = Gtk.HBox()
 
51
        self._source = Gtk.HBox()
 
52
        self._label_merge_from = Gtk.Label(label=_i18n("Merge from"))
 
53
        self._combo_source = Gtk.ComboBoxText()
61
54
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
62
55
            self._combo_source.append_text(entry)
63
56
        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)
 
57
        self._button_merge = Gtk.Button(_i18n("_Merge"))
 
58
        self._button_merge_icon = Gtk.Image()
 
59
        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
67
60
        self._button_merge.set_image(self._button_merge_icon)
68
61
        self._button_merge.connect('clicked', self._on_merge_clicked)
69
62
        
70
63
        # Add widgets to dialog
71
 
        self.vbox.pack_start(self._hbox, False, False, 0)
 
64
        self.get_content_area().pack_start(self._hbox, False, False, 0)
72
65
        self._hbox.add(self._label_merge_from)
73
66
        self._hbox.add(self._combo_source)
74
67
        self._hbox.set_spacing(5)
75
 
        self.action_area.pack_end(self._button_merge)
 
68
        self.action_area.pack_end(self._button_merge, False, False, 0)
76
69
        
77
70
        if self.default_branch_path and os.path.isdir(
78
71
                            self.default_branch_path.partition('file://')[2]):
83
76
        else:
84
77
            # If no default_branch_path give, default to folder source with current folder
85
78
            self._combo_source.set_active(0)
86
 
        self.vbox.show_all()
 
79
        self.get_content_area().show_all()
87
80
    
88
81
    def _on_folder_source(self):
89
82
        """ 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",
 
83
        self._source = Gtk.HBox()
 
84
        self._filechooser_dialog = Gtk.FileChooserDialog(title="Please select a folder",
92
85
                                    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)
 
86
                                    action=Gtk.FileChooserAction.SELECT_FOLDER,
 
87
                                    buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
 
88
                                             Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
 
89
        self._filechooser_dialog.set_default_response(Gtk.ResponseType.OK)
 
90
        self._filechooser = Gtk.FileChooserButton(self._filechooser_dialog)
98
91
        self._filechooser.show()
99
92
        directory = getattr(self, 'directory', None)
100
93
        if not directory:
101
94
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
102
95
        self._filechooser_dialog.set_current_folder(directory)
103
96
        self._source.pack_start(self._filechooser, True, True, 0)
104
 
        self.vbox.pack_start(self._source, True, True, 5)
 
97
        self.get_content_area().pack_start(self._source, True, True, 5)
105
98
        self._source.show()
106
99
    
107
100
    def _on_custom_source(self):
108
101
        """ Merge from a custom source (can be folder, remote, etc), create entry """
109
 
        self._source = gtk.HBox()
110
 
        self._custom_entry = gtk.Entry()
 
102
        self._source = Gtk.HBox()
 
103
        self._custom_entry = Gtk.Entry()
111
104
        if self.default_branch_path:
112
105
            self._custom_entry.set_text(self.default_branch_path)
113
106
        self._custom_entry.connect("activate", self._on_merge_clicked)
114
107
        self._custom_entry.show()
115
108
        self._source.pack_start(self._custom_entry, True, True, 0)
116
 
        self.vbox.pack_start(self._source, True, True, 5)
 
109
        self.get_content_area().pack_start(self._source, True, True, 5)
117
110
        self._source.show()
118
111
    
119
112
    def _on_combo_changed(self, widget):
155
148
            warning_dialog(_i18n('Conflicts encountered'),
156
149
                           _i18n('Please resolve the conflicts manually before committing.'))
157
150
        
158
 
        self.response(gtk.RESPONSE_OK)
 
151
        self.response(Gtk.ResponseType.OK)