/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
  • Author(s): Fabio Zanini
  • Date: 2011-04-04 17:52:28 UTC
  • Revision ID: jelmer@samba.org-20110404175228-wz8eczzurrowmxju
Fix import of open_display in bzr-handle-patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
23
23
    pass
24
24
 
25
25
import gtk
26
 
import gtk.glade
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 _i18n, 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
 
 
38
 
 
39
class MergeDialog(gtk.Dialog):
38
40
    """ Display the Merge dialog and perform the needed actions. """
39
 
    def __init__(self, wt, wtpath,default_branch_path=None):
 
41
    
 
42
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
40
43
        """ 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
 
 
 
44
        gtk.Dialog.__init__(self, title="Merge changes",
 
45
                                  parent=parent,
 
46
                                  flags=0,
 
47
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
48
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
 
49
        # Get arguments
53
50
        self.wt = wt
54
51
        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
 
 
 
52
        self.default_branch_path = default_branch_path
 
53
        self.parent_window = parent
 
54
        
 
55
        # Create widgets
 
56
        self._hbox = gtk.HBox()
 
57
        self._source = gtk.HBox()
 
58
        self._label_merge_from = gtk.Label(_i18n("Merge from"))
 
59
        self._combo_source = gtk.combo_box_new_text()
 
60
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
 
61
            self._combo_source.append_text(entry)
 
62
        self._combo_source.connect("changed", self._on_combo_changed)
 
63
        self._button_merge = gtk.Button(_i18n("_Merge"))
 
64
        self._button_merge_icon = gtk.Image()
 
65
        self._button_merge_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
 
66
        self._button_merge.set_image(self._button_merge_icon)
 
67
        self._button_merge.connect('clicked', self._on_merge_clicked)
 
68
        
 
69
        # Add widgets to dialog
 
70
        self.vbox.pack_start(self._hbox, False, False, 0)
 
71
        self._hbox.add(self._label_merge_from)
 
72
        self._hbox.add(self._combo_source)
 
73
        self._hbox.set_spacing(5)
 
74
        self.action_area.pack_end(self._button_merge)
 
75
        
 
76
        if self.default_branch_path and os.path.isdir(
 
77
                            self.default_branch_path.partition('file://')[2]):
 
78
            self.directory = self.default_branch_path.partition('file://')[2]
 
79
            self._combo_source.set_active(0)
 
80
        elif self.default_branch_path:
 
81
            self._combo_source.set_active(1)
 
82
        else:
 
83
            # If no default_branch_path give, default to folder source with current folder
 
84
            self._combo_source.set_active(0)
 
85
        self.vbox.show_all()
 
86
    
 
87
    def _on_folder_source(self):
 
88
        """ Merge from folder, create a filechooser dialog and button """
 
89
        self._source = gtk.HBox()
 
90
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
 
91
                                    parent=self.parent_window,
 
92
                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
93
                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
 
94
                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
 
95
        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
 
96
        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
 
97
        self._filechooser.show()
 
98
        directory = getattr(self, 'directory', None)
 
99
        if not directory:
 
100
            directory = os.path.dirname(self.wt.abspath(self.wtpath))
 
101
        self._filechooser_dialog.set_current_folder(directory)
 
102
        self._source.pack_start(self._filechooser, True, True, 0)
 
103
        self.vbox.pack_start(self._source, True, True, 5)
 
104
        self._source.show()
 
105
    
 
106
    def _on_custom_source(self):
 
107
        """ Merge from a custom source (can be folder, remote, etc), create entry """
 
108
        self._source = gtk.HBox()
 
109
        self._custom_entry = gtk.Entry()
 
110
        if self.default_branch_path:
 
111
            self._custom_entry.set_text(self.default_branch_path)
 
112
        self._custom_entry.connect("activate", self._on_merge_clicked)
 
113
        self._custom_entry.show()
 
114
        self._source.pack_start(self._custom_entry, True, True, 0)
 
115
        self.vbox.pack_start(self._source, True, True, 5)
 
116
        self._source.show()
 
117
    
 
118
    def _on_combo_changed(self, widget):
 
119
        merge_source = self._combo_source.get_active()
 
120
        self._source.destroy()
 
121
        if merge_source == 0:
 
122
            # Merge from folder
 
123
            self._on_folder_source()
 
124
        elif merge_source == 1:
 
125
            # Merge from custom
 
126
            self._on_custom_source()
 
127
    
65
128
    @show_bzr_error
66
 
    def merge(self, widget):
67
 
        branch = self.entry.get_text()
 
129
    def _on_merge_clicked(self, widget):
 
130
        merge_source = self._combo_source.get_active()
 
131
        if merge_source == 0:
 
132
            branch = self._filechooser.get_filename()
 
133
        elif merge_source == 1:
 
134
            branch = self._custom_entry.get_text()
68
135
        if branch == "":
69
136
            error_dialog(_i18n('Branch not given'),
70
137
                         _i18n('Please specify a branch to merge from.'))
78
145
            error_dialog(_i18n('Bazaar command error'), str(errmsg))
79
146
            return
80
147
        
81
 
        self.close()
82
148
        if conflicts == 0:
83
149
            # No conflicts found.
84
150
            info_dialog(_i18n('Merge successful'),
87
153
            # There are conflicts to be resolved.
88
154
            warning_dialog(_i18n('Conflicts encountered'),
89
155
                           _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()
 
156
        
 
157
        self.response(gtk.RESPONSE_OK)