/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 viz/branchwin.py

  • Committer: Daniel Schierbeck
  • Date: 2008-04-03 20:20:39 UTC
  • mto: (450.1.18 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: daniel.schierbeck@gmail.com-20080403202039-22d9vdjo5eoum8q1
Made the signature checking code not try to discover the signature key.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
66
66
 
67
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
68
68
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
69
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
70
69
 
71
70
        self.accel_group = gtk.AccelGroup()
72
71
        self.add_accel_group(self.accel_group)
85
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
86
85
        self.next_rev_action.connect_accelerator()
87
86
 
88
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
89
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
90
 
        self.refresh_action.set_accel_group(self.accel_group)
91
 
        self.refresh_action.connect("activate", self._refresh_clicked)
92
 
        self.refresh_action.connect_accelerator()
93
 
 
94
87
        self.construct()
95
88
 
96
89
    def set_revision(self, revid):
151
144
        view_menuitem = gtk.MenuItem("_View")
152
145
        view_menuitem.set_submenu(view_menu)
153
146
 
154
 
        view_menu_refresh = self.refresh_action.create_menu_item()
155
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
156
 
 
157
 
        view_menu.add(view_menu_refresh)
158
 
        view_menu.add(gtk.SeparatorMenuItem())
159
 
 
160
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
161
148
        view_menu_toolbar.set_active(True)
162
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
208
195
 
209
196
        revision_menu_diff = gtk.MenuItem("View Changes")
210
197
        revision_menu_diff.connect('activate', 
211
 
                self._menu_diff_cb)
212
 
        
213
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
214
 
        revision_menu_compare.connect('activate',
215
 
                self._compare_with_cb)
 
198
                lambda w: self.treeview.show_diff())
216
199
 
217
200
        revision_menu_tag = gtk.MenuItem("Tag Revision")
218
201
        revision_menu_tag.connect('activate', self._tag_revision_cb)
219
202
 
220
203
        revision_menu.add(revision_menu_tag)
221
204
        revision_menu.add(revision_menu_diff)
222
 
        revision_menu.add(revision_menu_compare)
223
205
 
224
206
        branch_menu = gtk.Menu()
225
207
        branch_menuitem = gtk.MenuItem("_Branch")
265
247
            option = self.config.get_user_option(col + '-column-visible')
266
248
            if option is not None:
267
249
                self.treeview.set_property(col + '-column-visible', option == 'True')
268
 
            else:
269
 
                self.treeview.set_property(col + '-column-visible', False)
270
250
 
 
251
        self.treeview.set_property(col + '-column-visible', False)
271
252
        self.treeview.show()
272
253
 
273
254
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
319
300
        parents  = self.treeview.get_parents()
320
301
        children = self.treeview.get_children()
321
302
 
322
 
        if revision and revision != NULL_REVISION:
 
303
        if revision is not None:
323
304
            prev_menu = gtk.Menu()
324
305
            if len(parents) > 0:
325
306
                self.prev_rev_action.set_sensitive(True)
326
307
                for parent_id in parents:
327
 
                    if parent_id and parent_id != NULL_REVISION:
328
 
                        parent = self.branch.repository.get_revision(parent_id)
329
 
                        try:
330
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
331
 
                        except KeyError:
332
 
                            str = ""
 
308
                    parent = self.branch.repository.get_revision(parent_id)
 
309
                    try:
 
310
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
311
                    except KeyError:
 
312
                        str = ""
333
313
 
334
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
335
 
                        item.connect('activate', self._set_revision_cb, parent_id)
336
 
                        prev_menu.add(item)
 
314
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
315
                    item.connect('activate', self._set_revision_cb, parent_id)
 
316
                    prev_menu.add(item)
337
317
                prev_menu.show_all()
338
318
            else:
339
319
                self.prev_rev_action.set_sensitive(False)
377
357
 
378
358
        self.show_diff(revision.revision_id, parent_id)
379
359
        self.treeview.grab_focus()
380
 
        
381
 
    def _menu_diff_cb(self,w):
382
 
        (path, focus) = self.treeview.treeview.get_cursor()
383
 
        revid = self.treeview.model[path][treemodel.REVID]
384
 
        
385
 
        parentids = self.branch.repository.revision_parents(revid)
386
 
 
387
 
        if len(parentids) == 0:
388
 
            parentid = NULL_REVISION
389
 
        else:
390
 
            parentid = parentids[0]
391
 
        
392
 
        self.show_diff(revid,parentid)    
 
360
    
393
361
 
394
362
    def _back_clicked_cb(self, *args):
395
363
        """Callback for when the back button is clicked."""
409
377
        self.show_diff(revid, parentid)
410
378
        self.treeview.grab_focus()
411
379
 
412
 
    def _compare_with_cb(self,w):
413
 
        """Callback for revision 'compare with' menu. Will show a small
414
 
            dialog with branch revisions to compare with selected revision in TreeView"""
415
 
        
416
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
417
 
        
418
 
        rb = RevisionBrowser(self.branch,self)
419
 
        ret = rb.run()
420
 
        
421
 
        if ret == gtk.RESPONSE_OK:          
422
 
            (path, focus) = self.treeview.treeview.get_cursor()
423
 
            revid = self.treeview.model[path][treemodel.REVID]
424
 
            self.show_diff(revid, rb.selected_revid)
425
 
            
426
 
        rb.destroy()
427
 
            
428
380
    def _set_revision_cb(self, w, revision_id):
429
381
        self.treeview.set_revision_id(revision_id)
430
382