/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: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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
 
28
from errors import show_bzr_error
 
29
 
27
30
from bzrlib.branch import Branch
28
31
from bzrlib.config import GlobalConfig
29
32
 
30
 
from bzrlib.plugins.gtk.dialog import error_dialog
31
 
from bzrlib.plugins.gtk.errors import show_bzr_error
32
 
from bzrlib.plugins.gtk.history import UrlHistory
33
 
from bzrlib.plugins.gtk.i18n import _i18n
 
33
from dialog import error_dialog
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
 
 
39
40
    def __init__(self, path=None, parent=None, remote_path=None):
40
41
        """ Initialize the Checkout dialog. """
41
42
        gtk.Dialog.__init__(self, title="Checkout - Olive",
42
43
                                  parent=parent,
43
44
                                  flags=0,
44
45
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
45
 
 
 
46
        
46
47
        # Get arguments
47
48
        self.path = path
48
 
 
 
49
        
49
50
        # Create the widgets
50
51
        self._button_checkout = gtk.Button(_i18n("Check_out"), use_underline=True)
51
52
        self._button_revision = gtk.Button('')
54
55
        self._combo = gtk.ComboBoxEntry()
55
56
        self._label_location = gtk.Label(_i18n("Branch location:"))
56
57
        self._label_destination = gtk.Label(_i18n("Destination:"))
57
 
        self._label_nick = gtk.Label(_i18n("Branch nick:"))
 
58
        self._label_nick = gtk.Label(_i18n("Branck nick:"))
58
59
        self._label_revision = gtk.Label(_i18n("Revision:"))
59
60
        self._hbox_revision = gtk.HBox()
60
61
        self._entry_revision = gtk.Entry()
61
62
        self._entry_nick = gtk.Entry()
62
63
        self._check_lightweight = gtk.CheckButton(_i18n("_Lightweight checkout"),
63
64
                                                  use_underline=True)
64
 
 
 
65
        
65
66
        # Set callbacks
66
67
        self._button_checkout.connect('clicked', self._on_checkout_clicked)
67
68
        self._button_revision.connect('clicked', self._on_revision_clicked)
68
69
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
69
 
 
 
70
        
70
71
        # Create the table and pack the widgets into it
71
72
        self._table = gtk.Table(rows=3, columns=2)
72
73
        self._table.attach(self._label_location, 0, 1, 0, 1)
78
79
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
79
80
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
80
81
        self._table.attach(self._check_lightweight, 1, 2, 4, 5)
81
 
 
 
82
        
82
83
        # Set properties
83
84
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
84
85
        self._button_revision.set_image(self._image_browse)
95
96
            self._filechooser.set_filename(self.path)
96
97
        if remote_path is not None:
97
98
            self._combo.child.set_text(remote_path)
98
 
 
 
99
        
99
100
        # Pack some widgets
100
101
        self._hbox_revision.pack_start(self._entry_revision, True, True)
101
102
        self._hbox_revision.pack_start(self._button_revision, False, False)
102
103
        self.vbox.add(self._table)
103
104
        self.action_area.pack_end(self._button_checkout)
104
 
 
 
105
        
105
106
        # Show the dialog
106
107
        self.vbox.show_all()
107
 
 
 
108
        
108
109
        # Build checkout history
109
110
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
110
111
        self._build_history()
111
 
 
 
112
    
112
113
    def _build_history(self):
113
114
        """ Build up the checkout history. """
114
115
        self._combo_model = gtk.ListStore(str)
115
 
 
 
116
        
116
117
        for item in self._history.get_entries():
117
118
            self._combo_model.append([ item ])
118
 
 
 
119
        
 
120
        pref = Preferences()
 
121
        for item in pref.get_bookmarks():
 
122
            self._combo_model.append([ item ])
 
123
        
119
124
        self._combo.set_model(self._combo_model)
120
125
        self._combo.set_text_column(0)
121
 
 
 
126
    
122
127
    def _get_last_revno(self):
123
128
        """ Get the revno of the last revision (if any). """
124
129
        location = self._combo.get_child().get_text()
128
133
            return None
129
134
        else:
130
135
            return br.revno()
131
 
 
 
136
    
132
137
    def _on_revision_clicked(self, button):
133
138
        """ Browse for revision button clicked handler. """
134
139
        from revbrowser import RevisionBrowser
135
 
 
 
140
        
136
141
        location = self._combo.get_child().get_text()
137
 
 
 
142
        
138
143
        try:
139
144
            br = Branch.open(location)
140
145
        except:
144
149
            response = revb.run()
145
150
            if response != gtk.RESPONSE_NONE:
146
151
                revb.hide()
147
 
 
 
152
        
148
153
                if response == gtk.RESPONSE_OK:
149
154
                    if revb.selected_revno is not None:
150
155
                        self._entry_revision.set_text(revb.selected_revno)
151
 
 
 
156
            
152
157
                revb.destroy()
153
 
 
 
158
    
154
159
    @show_bzr_error
155
160
    def _on_checkout_clicked(self, button):
156
161
        """ Checkout button clicked handler. """
159
164
            error_dialog(_i18n('Missing branch location'),
160
165
                         _i18n('You must specify a branch location.'))
161
166
            return
162
 
 
 
167
        
163
168
        destination = self._filechooser.get_filename()
164
169
        try:
165
170
            revno = int(self._entry_revision.get_text())
166
171
        except:
167
172
            revno = None
168
 
 
 
173
        
169
174
        nick = self._entry_nick.get_text()
170
175
        if nick is '':
171
176
            nick = os.path.basename(location.rstrip("/\\"))
172
 
 
 
177
        
173
178
        br_from = Branch.open(location)
174
 
 
 
179
        
175
180
        revision_id = br_from.get_rev_id(revno)
176
181
        lightweight = self._check_lightweight.get_active()
177
182
        to_location = destination + os.sep + nick
178
 
 
 
183
        
179
184
        os.mkdir(to_location)
180
 
 
 
185
        
181
186
        br_from.create_checkout(to_location, revision_id, lightweight)
182
 
 
 
187
        
183
188
        self._history.add_entry(location)
184
 
 
 
189
        
185
190
        self.response(gtk.RESPONSE_OK)
186
 
 
 
191
    
187
192
    def _on_combo_changed(self, widget, event):
188
193
        """ We try to get the last revision if focus lost. """
189
194
        rev = self._get_last_revno()