/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-04-10 18:44:39 UTC
  • mto: This revision was merged to the branch mainline in revision 730.
  • Revision ID: jelmer@samba.org-20110410184439-g7hqaacexqtviq13
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.

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