/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkout.py
16
16
 
17
17
import os
18
18
 
19
 
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
 
25
 
import gtk
26
 
 
27
 
from errors import show_bzr_error
 
19
from gi.repository import GObject
 
20
from gi.repository import Gtk
28
21
 
29
22
from bzrlib.branch import Branch
30
23
from bzrlib.config import GlobalConfig
31
24
 
32
 
from dialog import error_dialog
33
 
 
34
 
from history import UrlHistory
35
 
 
36
 
class CheckoutDialog(gtk.Dialog):
 
25
from bzrlib.plugins.gtk.dialog import error_dialog
 
26
from bzrlib.plugins.gtk.errors import show_bzr_error
 
27
from bzrlib.plugins.gtk.history import UrlHistory
 
28
from bzrlib.plugins.gtk.i18n import _i18n
 
29
 
 
30
 
 
31
class CheckoutDialog(Gtk.Dialog):
37
32
    """ New implementation of the Checkout dialog. """
38
 
    def __init__(self, path=None, parent=None):
 
33
 
 
34
    def __init__(self, path=None, parent=None, remote_path=None):
39
35
        """ Initialize the Checkout dialog. """
40
 
        gtk.Dialog.__init__(self, title="Checkout - Olive",
41
 
                                  parent=parent,
42
 
                                  flags=0,
43
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
44
 
        
 
36
        super(CheckoutDialog, self).__init__(
 
37
            title="Checkout - Olive", parent=parent, flags=0,
 
38
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
39
 
45
40
        # Get arguments
46
41
        self.path = path
47
 
        
 
42
 
48
43
        # Create the widgets
49
 
        self._button_checkout = gtk.Button(_("Check_out"), use_underline=True)
50
 
        self._button_revision = gtk.Button('')
51
 
        self._image_browse = gtk.Image()
52
 
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
53
 
        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:"))
58
 
        self._hbox_revision = gtk.HBox()
59
 
        self._entry_revision = gtk.Entry()
60
 
        self._entry_nick = gtk.Entry()
61
 
        self._check_lightweight = gtk.CheckButton(_("_Lightweight checkout"),
 
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.ComboBox.new_with_entry()
 
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"),
62
57
                                                  use_underline=True)
63
 
        
 
58
 
64
59
        # Set callbacks
65
60
        self._button_checkout.connect('clicked', self._on_checkout_clicked)
66
61
        self._button_revision.connect('clicked', self._on_revision_clicked)
67
 
        self._combo.connect('changed', self._on_combo_changed)
68
 
        
 
62
        self._combo.get_child().connect('focus-out-event', self._on_combo_changed)
 
63
 
69
64
        # Create the table and pack the widgets into it
70
 
        self._table = gtk.Table(rows=3, columns=2)
 
65
        self._table = Gtk.Table(rows=3, columns=2)
71
66
        self._table.attach(self._label_location, 0, 1, 0, 1)
72
67
        self._table.attach(self._label_destination, 0, 1, 1, 2)
73
68
        self._table.attach(self._label_nick, 0, 1, 2, 3)
77
72
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
78
73
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
79
74
        self._table.attach(self._check_lightweight, 1, 2, 4, 5)
80
 
        
 
75
 
81
76
        # Set properties
82
 
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
 
77
        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
83
78
        self._button_revision.set_image(self._image_browse)
84
79
        self._button_revision.set_sensitive(False)
85
 
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
 
80
        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
86
81
        self._label_location.set_alignment(0, 0.5)
87
82
        self._label_destination.set_alignment(0, 0.5)
88
83
        self._label_nick.set_alignment(0, 0.5)
89
84
        self._label_revision.set_alignment(0, 0.5)
90
85
        self._table.set_row_spacings(3)
91
86
        self._table.set_col_spacings(3)
92
 
        self.vbox.set_spacing(3)
 
87
        self.get_content_area().set_spacing(3)
93
88
        if self.path is not None:
94
89
            self._filechooser.set_filename(self.path)
95
 
        
 
90
        if remote_path is not None:
 
91
            self._combo.get_child().set_text(remote_path)
 
92
 
96
93
        # Pack some widgets
97
 
        self._hbox_revision.pack_start(self._entry_revision, True, True)
98
 
        self._hbox_revision.pack_start(self._button_revision, False, False)
99
 
        self.vbox.add(self._table)
100
 
        self.action_area.pack_end(self._button_checkout)
101
 
        
 
94
        self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
 
95
        self._hbox_revision.pack_start(self._button_revision, False, False, 0)
 
96
        self.get_content_area().add(self._table)
 
97
        self.action_area.pack_end(self._button_checkout, False, False, 0)
 
98
 
102
99
        # Show the dialog
103
 
        self.vbox.show_all()
104
 
        
 
100
        self.get_content_area().show_all()
 
101
 
105
102
        # Build checkout history
106
103
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
107
104
        self._build_history()
108
 
    
 
105
 
109
106
    def _build_history(self):
110
107
        """ Build up the checkout history. """
111
 
        self._combo_model = gtk.ListStore(str)
 
108
        self._combo_model = Gtk.ListStore(str)
 
109
 
112
110
        for item in self._history.get_entries():
113
111
            self._combo_model.append([ item ])
 
112
 
114
113
        self._combo.set_model(self._combo_model)
115
 
        self._combo.set_text_column(0)
116
 
    
 
114
        self._combo.set_entry_text_column(0)
 
115
 
117
116
    def _get_last_revno(self):
118
117
        """ Get the revno of the last revision (if any). """
119
118
        location = self._combo.get_child().get_text()
123
122
            return None
124
123
        else:
125
124
            return br.revno()
126
 
    
 
125
 
127
126
    def _on_revision_clicked(self, button):
128
127
        """ Browse for revision button clicked handler. """
129
128
        from revbrowser import RevisionBrowser
130
 
        
 
129
 
131
130
        location = self._combo.get_child().get_text()
132
 
        
 
131
 
133
132
        try:
134
133
            br = Branch.open(location)
135
134
        except:
137
136
        else:
138
137
            revb = RevisionBrowser(br, self)
139
138
            response = revb.run()
140
 
            if response != gtk.RESPONSE_NONE:
 
139
            if response != Gtk.ResponseType.NONE:
141
140
                revb.hide()
142
 
        
143
 
                if response == gtk.RESPONSE_OK:
 
141
 
 
142
                if response == Gtk.ResponseType.OK:
144
143
                    if revb.selected_revno is not None:
145
144
                        self._entry_revision.set_text(revb.selected_revno)
146
 
            
 
145
 
147
146
                revb.destroy()
148
 
    
 
147
 
149
148
    @show_bzr_error
150
149
    def _on_checkout_clicked(self, button):
151
150
        """ Checkout button clicked handler. """
152
151
        location = self._combo.get_child().get_text()
153
152
        if location is '':
154
 
            error_dialog(_('Missing branch location'),
155
 
                         _('You must specify a branch location.'))
 
153
            error_dialog(_i18n('Missing branch location'),
 
154
                         _i18n('You must specify a branch location.'))
156
155
            return
157
 
        
 
156
 
158
157
        destination = self._filechooser.get_filename()
159
158
        try:
160
159
            revno = int(self._entry_revision.get_text())
161
160
        except:
162
161
            revno = None
163
 
        
 
162
 
164
163
        nick = self._entry_nick.get_text()
165
164
        if nick is '':
166
165
            nick = os.path.basename(location.rstrip("/\\"))
167
 
        
 
166
 
168
167
        br_from = Branch.open(location)
169
 
        
 
168
 
170
169
        revision_id = br_from.get_rev_id(revno)
171
170
        lightweight = self._check_lightweight.get_active()
172
171
        to_location = destination + os.sep + nick
173
 
        
 
172
 
174
173
        os.mkdir(to_location)
175
 
        
 
174
 
176
175
        br_from.create_checkout(to_location, revision_id, lightweight)
177
 
        
 
176
 
178
177
        self._history.add_entry(location)
179
 
        
180
 
        self.response(gtk.RESPONSE_OK)
181
 
    
182
 
    def _on_combo_changed(self, widget):
 
178
 
 
179
        self.response(Gtk.ResponseType.OK)
 
180
 
 
181
    def _on_combo_changed(self, widget, event):
183
182
        """ We try to get the last revision if focus lost. """
184
183
        rev = self._get_last_revno()
185
184
        if rev is None:
186
 
            self._entry_revision.set_text(_('N/A'))
 
185
            self._entry_revision.set_text(_i18n('N/A'))
187
186
            self._button_revision.set_sensitive(False)
188
187
        else:
189
188
            self._entry_revision.set_text(str(rev))