/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-03-14 02:13:27 UTC
  • mto: (452.2.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: jelmer@samba.org-20080314021327-q1pabtpneeasz8qv
Fix support for default value in BranchSelectionDialog.

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