/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 checkout.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:
checkout.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
 
26
 
 
27
from bzrlib.plugins.gtk import _i18n
21
28
 
22
29
from bzrlib.branch import Branch
23
30
from bzrlib.config import GlobalConfig
25
32
from bzrlib.plugins.gtk.dialog import error_dialog
26
33
from bzrlib.plugins.gtk.errors import show_bzr_error
27
34
from bzrlib.plugins.gtk.history import UrlHistory
28
 
from bzrlib.plugins.gtk.i18n import _i18n
29
 
 
30
 
 
31
 
class CheckoutDialog(Gtk.Dialog):
 
35
 
 
36
 
 
37
class CheckoutDialog(gtk.Dialog):
32
38
    """ New implementation of the Checkout dialog. """
33
39
 
34
40
    def __init__(self, path=None, parent=None, remote_path=None):
35
41
        """ Initialize the Checkout dialog. """
36
 
        GObject.GObject.__init__(self, title="Checkout - Olive",
 
42
        gtk.Dialog.__init__(self, title="Checkout - Olive",
37
43
                                  parent=parent,
38
44
                                  flags=0,
39
 
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
45
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
40
46
 
41
47
        # Get arguments
42
48
        self.path = path
43
49
 
44
50
        # Create the widgets
45
 
        self._button_checkout = Gtk.Button(_i18n("Check_out"), use_underline=True)
46
 
        self._button_revision = Gtk.Button('')
47
 
        self._image_browse = Gtk.Image()
48
 
        self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
49
 
        self._combo = Gtk.ComboBoxEntry()
50
 
        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
51
 
        self._label_destination = Gtk.Label(label=_i18n("Destination:"))
52
 
        self._label_nick = Gtk.Label(label=_i18n("Branch nick:"))
53
 
        self._label_revision = Gtk.Label(label=_i18n("Revision:"))
54
 
        self._hbox_revision = Gtk.HBox()
55
 
        self._entry_revision = Gtk.Entry()
56
 
        self._entry_nick = Gtk.Entry()
57
 
        self._check_lightweight = Gtk.CheckButton(_i18n("_Lightweight checkout"),
 
51
        self._button_checkout = gtk.Button(_i18n("Check_out"), use_underline=True)
 
52
        self._button_revision = gtk.Button('')
 
53
        self._image_browse = gtk.Image()
 
54
        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
 
55
        self._combo = gtk.ComboBoxEntry()
 
56
        self._label_location = gtk.Label(_i18n("Branch location:"))
 
57
        self._label_destination = gtk.Label(_i18n("Destination:"))
 
58
        self._label_nick = gtk.Label(_i18n("Branch nick:"))
 
59
        self._label_revision = gtk.Label(_i18n("Revision:"))
 
60
        self._hbox_revision = gtk.HBox()
 
61
        self._entry_revision = gtk.Entry()
 
62
        self._entry_nick = gtk.Entry()
 
63
        self._check_lightweight = gtk.CheckButton(_i18n("_Lightweight checkout"),
58
64
                                                  use_underline=True)
59
65
 
60
66
        # Set callbacks
61
67
        self._button_checkout.connect('clicked', self._on_checkout_clicked)
62
68
        self._button_revision.connect('clicked', self._on_revision_clicked)
63
 
        self._combo.get_child().connect('focus-out-event', self._on_combo_changed)
 
69
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
64
70
 
65
71
        # Create the table and pack the widgets into it
66
 
        self._table = Gtk.Table(rows=3, columns=2)
 
72
        self._table = gtk.Table(rows=3, columns=2)
67
73
        self._table.attach(self._label_location, 0, 1, 0, 1)
68
74
        self._table.attach(self._label_destination, 0, 1, 1, 2)
69
75
        self._table.attach(self._label_nick, 0, 1, 2, 3)
75
81
        self._table.attach(self._check_lightweight, 1, 2, 4, 5)
76
82
 
77
83
        # Set properties
78
 
        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
 
84
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
79
85
        self._button_revision.set_image(self._image_browse)
80
86
        self._button_revision.set_sensitive(False)
81
 
        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
 
87
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
82
88
        self._label_location.set_alignment(0, 0.5)
83
89
        self._label_destination.set_alignment(0, 0.5)
84
90
        self._label_nick.set_alignment(0, 0.5)
89
95
        if self.path is not None:
90
96
            self._filechooser.set_filename(self.path)
91
97
        if remote_path is not None:
92
 
            self._combo.get_child().set_text(remote_path)
 
98
            self._combo.child.set_text(remote_path)
93
99
 
94
100
        # Pack some widgets
95
101
        self._hbox_revision.pack_start(self._entry_revision, True, True)
106
112
 
107
113
    def _build_history(self):
108
114
        """ Build up the checkout history. """
109
 
        self._combo_model = Gtk.ListStore(str)
 
115
        self._combo_model = gtk.ListStore(str)
110
116
 
111
117
        for item in self._history.get_entries():
112
118
            self._combo_model.append([ item ])
137
143
        else:
138
144
            revb = RevisionBrowser(br, self)
139
145
            response = revb.run()
140
 
            if response != Gtk.ResponseType.NONE:
 
146
            if response != gtk.RESPONSE_NONE:
141
147
                revb.hide()
142
148
 
143
 
                if response == Gtk.ResponseType.OK:
 
149
                if response == gtk.RESPONSE_OK:
144
150
                    if revb.selected_revno is not None:
145
151
                        self._entry_revision.set_text(revb.selected_revno)
146
152
 
177
183
 
178
184
        self._history.add_entry(location)
179
185
 
180
 
        self.response(Gtk.ResponseType.OK)
 
186
        self.response(gtk.RESPONSE_OK)
181
187
 
182
188
    def _on_combo_changed(self, widget, event):
183
189
        """ We try to get the last revision if focus lost. """