/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-08-27 18:35:08 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827183508-ugqbp58na4mtt1no
Updated the pixbuf calls to gtk3.

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