/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
26
 
import gtk.glade
 
25
from gi.repository import Gtk
27
26
 
28
27
from bzrlib.branch import Branch
29
28
import bzrlib.errors as errors
30
 
from bzrlib.plugins.gtk import _i18n
31
 
 
32
 
from dialog import error_dialog, info_dialog, warning_dialog
33
 
from errors import show_bzr_error
34
 
from olive.guifiles import GLADEFILENAME
35
 
 
36
 
 
37
 
class MergeDialog:
 
29
 
 
30
from bzrlib.plugins.gtk import icon_path
 
31
from bzrlib.plugins.gtk.dialog import (
 
32
    error_dialog,
 
33
    info_dialog,
 
34
    warning_dialog,
 
35
    )
 
36
from bzrlib.plugins.gtk.errors import show_bzr_error
 
37
from bzrlib.plugins.gtk.i18n import _i18n
 
38
 
 
39
 
 
40
class MergeDialog(Gtk.Dialog):
38
41
    """ Display the Merge dialog and perform the needed actions. """
39
 
    def __init__(self, wt, wtpath,default_branch_path=None):
 
42
    
 
43
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
40
44
        """ Initialize the Merge dialog. """
41
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
42
 
        
43
 
        self.window = self.glade.get_widget('window_merge')
44
 
        
45
 
        # Dictionary for signal_autoconnect
46
 
        dic = { "on_button_merge_merge_clicked": self.merge,
47
 
                "on_button_merge_cancel_clicked": self.close,
48
 
                "on_button_merge_open_clicked": self.open }
49
 
        
50
 
        # Connect the signals to the handlers
51
 
        self.glade.signal_autoconnect(dic)
52
 
 
 
45
        GObject.GObject.__init__(self, title="Merge changes",
 
46
                                  parent=parent,
 
47
                                  flags=0,
 
48
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
49
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
 
50
        # Get arguments
53
51
        self.wt = wt
54
52
        self.wtpath = wtpath
55
 
        
56
 
        # Get some widgets
57
 
        self.entry = self.glade.get_widget('entry_merge')
58
 
        if default_branch_path:
59
 
            self.entry.set_text(default_branch_path)
60
 
 
61
 
    def display(self):
62
 
        """ Display the Add file(s) dialog. """
63
 
        self.window.show_all()
64
 
 
 
53
        self.default_branch_path = default_branch_path
 
54
        self.parent_window = parent
 
55
        
 
56
        # Create widgets
 
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
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
 
62
            self._combo_source.append_text(entry)
 
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.IconSize.BUTTON)
 
67
        self._button_merge.set_image(self._button_merge_icon)
 
68
        self._button_merge.connect('clicked', self._on_merge_clicked)
 
69
        
 
70
        # Add widgets to dialog
 
71
        self.vbox.pack_start(self._hbox, False, False, 0)
 
72
        self._hbox.add(self._label_merge_from)
 
73
        self._hbox.add(self._combo_source)
 
74
        self._hbox.set_spacing(5)
 
75
        self.action_area.pack_end(self._button_merge)
 
76
        
 
77
        if self.default_branch_path and os.path.isdir(
 
78
                            self.default_branch_path.partition('file://')[2]):
 
79
            self.directory = self.default_branch_path.partition('file://')[2]
 
80
            self._combo_source.set_active(0)
 
81
        elif self.default_branch_path:
 
82
            self._combo_source.set_active(1)
 
83
        else:
 
84
            # If no default_branch_path give, default to folder source with current folder
 
85
            self._combo_source.set_active(0)
 
86
        self.vbox.show_all()
 
87
    
 
88
    def _on_folder_source(self):
 
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",
 
92
                                    parent=self.parent_window,
 
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
        self._filechooser.show()
 
99
        directory = getattr(self, 'directory', None)
 
100
        if not directory:
 
101
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
 
102
        self._filechooser_dialog.set_current_folder(directory)
 
103
        self._source.pack_start(self._filechooser, True, True, 0)
 
104
        self.vbox.pack_start(self._source, True, True, 5)
 
105
        self._source.show()
 
106
    
 
107
    def _on_custom_source(self):
 
108
        """ Merge from a custom source (can be folder, remote, etc), create entry """
 
109
        self._source = Gtk.HBox()
 
110
        self._custom_entry = Gtk.Entry()
 
111
        if self.default_branch_path:
 
112
            self._custom_entry.set_text(self.default_branch_path)
 
113
        self._custom_entry.connect("activate", self._on_merge_clicked)
 
114
        self._custom_entry.show()
 
115
        self._source.pack_start(self._custom_entry, True, True, 0)
 
116
        self.vbox.pack_start(self._source, True, True, 5)
 
117
        self._source.show()
 
118
    
 
119
    def _on_combo_changed(self, widget):
 
120
        merge_source = self._combo_source.get_active()
 
121
        self._source.destroy()
 
122
        if merge_source == 0:
 
123
            # Merge from folder
 
124
            self._on_folder_source()
 
125
        elif merge_source == 1:
 
126
            # Merge from custom
 
127
            self._on_custom_source()
 
128
    
65
129
    @show_bzr_error
66
 
    def merge(self, widget):
67
 
        branch = self.entry.get_text()
 
130
    def _on_merge_clicked(self, widget):
 
131
        merge_source = self._combo_source.get_active()
 
132
        if merge_source == 0:
 
133
            branch = self._filechooser.get_filename()
 
134
        elif merge_source == 1:
 
135
            branch = self._custom_entry.get_text()
68
136
        if branch == "":
69
137
            error_dialog(_i18n('Branch not given'),
70
138
                         _i18n('Please specify a branch to merge from.'))
78
146
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
79
147
            return
80
148
        
81
 
        self.close()
82
149
        if conflicts == 0:
83
150
            # No conflicts found.
84
151
            info_dialog(_i18n('Merge successful'),
87
154
            # There are conflicts to be resolved.
88
155
            warning_dialog(_i18n('Conflicts encountered'),
89
156
                           _i18n('Please resolve the conflicts manually before committing.'))
90
 
    
91
 
    def open(self, widget):
92
 
        fcd = gtk.FileChooserDialog(title="Please select a folder",
93
 
                                    parent=self.window,
94
 
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
95
 
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
96
 
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
97
 
        fcd.set_default_response(gtk.RESPONSE_OK)
98
 
        
99
 
        if fcd.run() == gtk.RESPONSE_OK:
100
 
            self.entry.set_text(fcd.get_filename())
101
 
        
102
 
        fcd.destroy()
103
 
        
104
 
    def close(self, widget=None):
105
 
        self.window.destroy()
 
157
        
 
158
        self.response(Gtk.ResponseType.OK)