/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: 2010-05-25 17:09:02 UTC
  • mto: This revision was merged to the branch mainline in revision 691.
  • Revision ID: jelmer@samba.org-20100525170902-3to8g5iw7ovw79kh
Split out olive into a separate directory.

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