/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-03-23 09:49:44 UTC
  • mfrom: (723.1.1 isearch)
  • Revision ID: jelmer@samba.org-20110323094944-7n5h1vif3xpbze3p
Merge support for interactive substring search in bzr viz and annotate.

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
 
from gi.repository import Gtk
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
 
 
25
import gtk
21
26
 
22
27
from bzrlib.branch import Branch
23
28
import bzrlib.errors as errors
24
29
 
25
 
from bzrlib.plugins.gtk import icon_path
 
30
from bzrlib.plugins.gtk import _i18n, icon_path
26
31
from bzrlib.plugins.gtk.dialog import (
27
32
    error_dialog,
28
33
    info_dialog,
29
34
    warning_dialog,
30
35
    )
31
36
from bzrlib.plugins.gtk.errors import show_bzr_error
32
 
from bzrlib.plugins.gtk.i18n import _i18n
33
 
 
34
 
 
35
 
class MergeDialog(Gtk.Dialog):
 
37
 
 
38
 
 
39
class MergeDialog(gtk.Dialog):
36
40
    """ Display the Merge dialog and perform the needed actions. """
37
41
    
38
42
    def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
39
43
        """ Initialize the Merge dialog. """
40
 
        GObject.GObject.__init__(self, title="Merge changes",
 
44
        gtk.Dialog.__init__(self, title="Merge changes",
41
45
                                  parent=parent,
42
46
                                  flags=0,
43
 
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
47
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
44
48
        self.set_icon_from_file(icon_path("bzr-icon-64.png"))
45
49
        # Get arguments
46
50
        self.wt = wt
49
53
        self.parent_window = parent
50
54
        
51
55
        # Create widgets
52
 
        self._hbox = Gtk.HBox()
53
 
        self._source = Gtk.HBox()
54
 
        self._label_merge_from = Gtk.Label(label=_i18n("Merge from"))
55
 
        self._combo_source = Gtk.ComboBoxText()
 
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()
56
60
        for entry in [_i18n("Folder"),_i18n("Custom Location")]:
57
61
            self._combo_source.append_text(entry)
58
62
        self._combo_source.connect("changed", self._on_combo_changed)
59
 
        self._button_merge = Gtk.Button(_i18n("_Merge"))
60
 
        self._button_merge_icon = Gtk.Image()
61
 
        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
 
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)
62
66
        self._button_merge.set_image(self._button_merge_icon)
63
67
        self._button_merge.connect('clicked', self._on_merge_clicked)
64
68
        
82
86
    
83
87
    def _on_folder_source(self):
84
88
        """ Merge from folder, create a filechooser dialog and button """
85
 
        self._source = Gtk.HBox()
86
 
        self._filechooser_dialog = Gtk.FileChooserDialog(title="Please select a folder",
 
89
        self._source = gtk.HBox()
 
90
        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
87
91
                                    parent=self.parent_window,
88
 
                                    action=Gtk.FileChooserAction.SELECT_FOLDER,
89
 
                                    buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
90
 
                                             Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
91
 
        self._filechooser_dialog.set_default_response(Gtk.ResponseType.OK)
92
 
        self._filechooser = Gtk.FileChooserButton(self._filechooser_dialog)
 
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)
93
97
        self._filechooser.show()
94
98
        directory = getattr(self, 'directory', None)
95
99
        if not directory:
101
105
    
102
106
    def _on_custom_source(self):
103
107
        """ Merge from a custom source (can be folder, remote, etc), create entry """
104
 
        self._source = Gtk.HBox()
105
 
        self._custom_entry = Gtk.Entry()
 
108
        self._source = gtk.HBox()
 
109
        self._custom_entry = gtk.Entry()
106
110
        if self.default_branch_path:
107
111
            self._custom_entry.set_text(self.default_branch_path)
108
112
        self._custom_entry.connect("activate", self._on_merge_clicked)
150
154
            warning_dialog(_i18n('Conflicts encountered'),
151
155
                           _i18n('Please resolve the conflicts manually before committing.'))
152
156
        
153
 
        self.response(Gtk.ResponseType.OK)
 
157
        self.response(gtk.RESPONSE_OK)