/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkout.py
24
24
 
25
25
import gtk
26
26
 
 
27
from bzrlib.plugins.gtk import _i18n
27
28
from errors import show_bzr_error
28
29
 
29
30
from bzrlib.branch import Branch
32
33
from dialog import error_dialog
33
34
 
34
35
from history import UrlHistory
 
36
from olive import Preferences
35
37
 
36
38
class CheckoutDialog(gtk.Dialog):
37
39
    """ New implementation of the Checkout dialog. """
38
 
    def __init__(self, path=None, parent=None):
 
40
    def __init__(self, path=None, parent=None, remote_path=None):
39
41
        """ Initialize the Checkout dialog. """
40
42
        gtk.Dialog.__init__(self, title="Checkout - Olive",
41
43
                                  parent=parent,
46
48
        self.path = path
47
49
        
48
50
        # Create the widgets
49
 
        self._button_checkout = gtk.Button(_("Check_out"), use_underline=True)
 
51
        self._button_checkout = gtk.Button(_i18n("Check_out"), use_underline=True)
50
52
        self._button_revision = gtk.Button('')
51
53
        self._image_browse = gtk.Image()
52
 
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
 
54
        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
53
55
        self._combo = gtk.ComboBoxEntry()
54
 
        self._label_location = gtk.Label(_("Branch location:"))
55
 
        self._label_destination = gtk.Label(_("Destination:"))
56
 
        self._label_nick = gtk.Label(_("Branck nick:"))
57
 
        self._label_revision = gtk.Label(_("Revision:"))
 
56
        self._label_location = gtk.Label(_i18n("Branch location:"))
 
57
        self._label_destination = gtk.Label(_i18n("Destination:"))
 
58
        self._label_nick = gtk.Label(_i18n("Branck nick:"))
 
59
        self._label_revision = gtk.Label(_i18n("Revision:"))
58
60
        self._hbox_revision = gtk.HBox()
59
61
        self._entry_revision = gtk.Entry()
60
62
        self._entry_nick = gtk.Entry()
61
 
        self._check_lightweight = gtk.CheckButton(_("_Lightweight checkout"),
 
63
        self._check_lightweight = gtk.CheckButton(_i18n("_Lightweight checkout"),
62
64
                                                  use_underline=True)
63
65
        
64
66
        # Set callbacks
65
67
        self._button_checkout.connect('clicked', self._on_checkout_clicked)
66
68
        self._button_revision.connect('clicked', self._on_revision_clicked)
67
 
        self._combo.connect('changed', self._on_combo_changed)
 
69
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
68
70
        
69
71
        # Create the table and pack the widgets into it
70
72
        self._table = gtk.Table(rows=3, columns=2)
92
94
        self.vbox.set_spacing(3)
93
95
        if self.path is not None:
94
96
            self._filechooser.set_filename(self.path)
 
97
        if remote_path is not None:
 
98
            self._combo.child.set_text(remote_path)
95
99
        
96
100
        # Pack some widgets
97
101
        self._hbox_revision.pack_start(self._entry_revision, True, True)
109
113
    def _build_history(self):
110
114
        """ Build up the checkout history. """
111
115
        self._combo_model = gtk.ListStore(str)
 
116
        
112
117
        for item in self._history.get_entries():
113
118
            self._combo_model.append([ item ])
 
119
        
 
120
        pref = Preferences()
 
121
        for item in pref.get_bookmarks():
 
122
            self._combo_model.append([ item ])
 
123
        
114
124
        self._combo.set_model(self._combo_model)
115
125
        self._combo.set_text_column(0)
116
126
    
151
161
        """ Checkout button clicked handler. """
152
162
        location = self._combo.get_child().get_text()
153
163
        if location is '':
154
 
            error_dialog(_('Missing branch location'),
155
 
                         _('You must specify a branch location.'))
 
164
            error_dialog(_i18n('Missing branch location'),
 
165
                         _i18n('You must specify a branch location.'))
156
166
            return
157
167
        
158
168
        destination = self._filechooser.get_filename()
179
189
        
180
190
        self.response(gtk.RESPONSE_OK)
181
191
    
182
 
    def _on_combo_changed(self, widget):
 
192
    def _on_combo_changed(self, widget, event):
183
193
        """ We try to get the last revision if focus lost. """
184
194
        rev = self._get_last_revno()
185
195
        if rev is None:
186
 
            self._entry_revision.set_text(_('N/A'))
 
196
            self._entry_revision.set_text(_i18n('N/A'))
187
197
            self._button_revision.set_sensitive(False)
188
198
        else:
189
199
            self._entry_revision.set_text(str(rev))