/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: Curtis Hovey
  • Date: 2011-09-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

Show diffs side-by-side

added added

removed removed

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