/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-07-31 16:50:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731165029-9gixuqypi3lwapzm
Removed import_pygtk because gi does not impicitly call Main(). Inlined checks for gtk availablility.

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