/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 branch.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 16:20:15 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629162015-amhe7xj4cdmup4id
Rename GtkProgressBarStack to GtkWindowProgressBarStack

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
27
27
from errors import show_bzr_error
28
28
 
29
29
from bzrlib.branch import Branch
30
 
from bzrlib.config import GlobalConfig
31
30
import bzrlib.errors as errors
32
31
 
 
32
from bzrlib.plugins.gtk import _i18n
 
33
 
33
34
from dialog import error_dialog, info_dialog
34
35
 
35
 
from history import UrlHistory
36
 
from olive import Preferences
 
36
from branchbox import BranchSelectionBox
37
37
 
38
38
class BranchDialog(gtk.Dialog):
39
39
    """ New implementation of the Branch dialog. """
40
 
    def __init__(self, path=None, parent=None):
 
40
 
 
41
    def __init__(self, path=None, parent=None, remote_path=None):
41
42
        """ Initialize the Branch dialog. """
42
43
        gtk.Dialog.__init__(self, title="Branch - Olive",
43
44
                                  parent=parent,
48
49
        self.path = path
49
50
        
50
51
        # Create the widgets
51
 
        self._button_branch = gtk.Button(_("_Branch"), use_underline=True)
 
52
        self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
 
53
        self._remote_branch = BranchSelectionBox()
52
54
        self._button_revision = gtk.Button('')
53
 
        self._image_browse = gtk.Image()
54
 
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
55
 
        self._combo = gtk.ComboBoxEntry()
56
 
        self._label_location = gtk.Label(_("Branch location:"))
57
 
        self._label_destination = gtk.Label(_("Destination:"))
58
 
        self._label_nick = gtk.Label(_("Branck nick:"))
59
 
        self._label_revision = gtk.Label(_("Revision:"))
 
55
        self._label_location = gtk.Label(_i18n("Branch location:"))
 
56
        self._label_location.set_alignment(0, 0.5)
 
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._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
 
61
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
60
62
        self._hbox_revision = gtk.HBox()
61
63
        self._entry_revision = gtk.Entry()
62
64
        self._entry_nick = gtk.Entry()
64
66
        # Set callbacks
65
67
        self._button_branch.connect('clicked', self._on_branch_clicked)
66
68
        self._button_revision.connect('clicked', self._on_revision_clicked)
67
 
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
68
 
        
 
69
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
 
70
 
69
71
        # Create the table and pack the widgets into it
70
72
        self._table = gtk.Table(rows=3, columns=2)
71
73
        self._table.attach(self._label_location, 0, 1, 0, 1)
 
74
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
72
75
        self._table.attach(self._label_destination, 0, 1, 1, 2)
73
76
        self._table.attach(self._label_nick, 0, 1, 2, 3)
74
77
        self._table.attach(self._label_revision, 0, 1, 3, 4)
75
 
        self._table.attach(self._combo, 1, 2, 0, 1)
76
78
        self._table.attach(self._filechooser, 1, 2, 1, 2)
77
79
        self._table.attach(self._entry_nick, 1, 2, 2, 3)
78
80
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
79
81
        
80
82
        # Set properties
 
83
        self._image_browse = gtk.Image()
81
84
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
82
85
        self._button_revision.set_image(self._image_browse)
83
86
        self._button_revision.set_sensitive(False)
84
 
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
85
 
        self._label_location.set_alignment(0, 0.5)
86
87
        self._label_destination.set_alignment(0, 0.5)
87
88
        self._label_nick.set_alignment(0, 0.5)
88
89
        self._label_revision.set_alignment(0, 0.5)
89
90
        self._table.set_row_spacings(3)
90
91
        self._table.set_col_spacings(3)
91
92
        self.vbox.set_spacing(3)
 
93
        if remote_path is not None:
 
94
            self._remote_branch.set_url(remote_path)
92
95
        if self.path is not None:
93
96
            self._filechooser.set_filename(self.path)
94
97
        
100
103
        
101
104
        # Show the dialog
102
105
        self.vbox.show_all()
103
 
        
104
 
        # Build branch history
105
 
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
106
 
        self._build_history()
107
 
    
108
 
    def _build_history(self):
109
 
        """ Build up the branch history. """
110
 
        self._combo_model = gtk.ListStore(str)
111
 
        
112
 
        for item in self._history.get_entries():
113
 
            self._combo_model.append([ item ])
114
 
        
115
 
        pref = Preferences()
116
 
        for item in pref.get_bookmarks():
117
 
            self._combo_model.append([ item ])
118
 
        
119
 
        self._combo.set_model(self._combo_model)
120
 
        self._combo.set_text_column(0)
121
106
    
122
107
    def _get_last_revno(self):
123
108
        """ Get the revno of the last revision (if any). """
124
 
        location = self._combo.get_child().get_text()
125
109
        try:
126
 
            br = Branch.open(location)
127
 
        except:
128
 
            return None
129
 
        else:
 
110
            br = self._remote_branch.get_branch()
130
111
            return br.revno()
 
112
        except:
 
113
            pass
131
114
    
132
115
    def _on_revision_clicked(self, button):
133
116
        """ Browse for revision button clicked handler. """
134
117
        from revbrowser import RevisionBrowser
135
118
        
136
 
        location = self._combo.get_child().get_text()
137
119
        
138
120
        try:
139
 
            br = Branch.open(location)
 
121
            br = self._remote_branch.get_branch()
140
122
        except:
141
123
            return
142
 
        else:
143
 
            revb = RevisionBrowser(br, self)
144
 
            response = revb.run()
145
 
            if response != gtk.RESPONSE_NONE:
146
 
                revb.hide()
 
124
        revb = RevisionBrowser(br, self)
 
125
        response = revb.run()
 
126
        if response != gtk.RESPONSE_NONE:
 
127
            revb.hide()
 
128
    
 
129
            if response == gtk.RESPONSE_OK:
 
130
                if revb.selected_revno is not None:
 
131
                    self._entry_revision.set_text(revb.selected_revno)
147
132
        
148
 
                if response == gtk.RESPONSE_OK:
149
 
                    if revb.selected_revno is not None:
150
 
                        self._entry_revision.set_text(revb.selected_revno)
151
 
            
152
 
                revb.destroy()
 
133
            revb.destroy()
153
134
    
154
135
    @show_bzr_error
155
136
    def _on_branch_clicked(self, button):
156
137
        """ Branch button clicked handler. """
157
 
        location = self._combo.get_child().get_text()
 
138
        location = self._remote_branch.get_url()
158
139
        if location is '':
159
 
            error_dialog(_('Missing branch location'),
160
 
                         _('You must specify a branch location.'))
 
140
            error_dialog(_i18n('Missing branch location'),
 
141
                         _i18n('You must specify a branch location.'))
161
142
            return
162
143
        
163
144
        destination = self._filechooser.get_filename()
198
179
        finally:
199
180
            br_from.unlock()
200
181
                
201
 
        self._history.add_entry(location)
202
 
        info_dialog(_('Branching successful'),
203
 
                    _('%d revision(s) branched.') % revs)
 
182
        info_dialog(_i18n('Branching successful'),
 
183
                    _i18n('%d revision(s) branched.') % revs)
204
184
        
205
185
        self.response(gtk.RESPONSE_OK)
206
186
    
207
 
    def _on_combo_changed(self, widget, event):
 
187
    def _on_branch_changed(self, widget, event):
208
188
        """ We try to get the last revision if focus lost. """
209
189
        rev = self._get_last_revno()
210
190
        if rev is None:
211
 
            self._entry_revision.set_text(_('N/A'))
 
191
            self._entry_revision.set_text(_i18n('N/A'))
212
192
            self._button_revision.set_sensitive(False)
213
193
        else:
214
194
            self._entry_revision.set_text(str(rev))
215
195
            self._button_revision.set_sensitive(True)
216
196
            if self._entry_nick.get_text() == '':
217
 
                self._entry_nick.set_text(os.path.basename(self._combo.get_child().get_text().rstrip("/\\")))
 
197
                self._entry_nick.set_text(os.path.basename(self._remote_branch.get_url().rstrip("/\\")))