/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

Merged an approved request (single clicking bookmark).

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
14
14
import pango
15
15
 
16
16
from bzrlib.plugins.gtk.window import Window
17
 
from bzrlib.plugins.gtk import icon_path
18
17
from bzrlib.plugins.gtk.tags import AddTagDialog
19
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
19
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
 
 
22
 
from bzrlib.config import BranchConfig, GlobalConfig
23
20
from bzrlib.revision import Revision, NULL_REVISION
24
 
from bzrlib.trace import mutter
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
25
23
 
26
24
class BranchWindow(Window):
27
25
    """Branch window.
67
65
 
68
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
69
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
70
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
71
68
 
72
69
        self.accel_group = gtk.AccelGroup()
73
70
        self.add_accel_group(self.accel_group)
86
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
87
84
        self.next_rev_action.connect_accelerator()
88
85
 
89
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
90
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
91
 
        self.refresh_action.set_accel_group(self.accel_group)
92
 
        self.refresh_action.connect("activate", self._refresh_clicked)
93
 
        self.refresh_action.connect_accelerator()
94
 
 
95
86
        self.construct()
96
87
 
97
88
    def set_revision(self, revid):
152
143
        view_menuitem = gtk.MenuItem("_View")
153
144
        view_menuitem.set_submenu(view_menu)
154
145
 
155
 
        view_menu_refresh = self.refresh_action.create_menu_item()
156
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
157
 
 
158
 
        view_menu.add(view_menu_refresh)
159
 
        view_menu.add(gtk.SeparatorMenuItem())
160
 
 
161
146
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
147
        view_menu_toolbar.set_active(True)
163
148
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
192
177
        go_menu_next = self.next_rev_action.create_menu_item()
193
178
        go_menu_prev = self.prev_rev_action.create_menu_item()
194
179
 
195
 
        tag_image = gtk.Image()
196
 
        tag_image.set_from_file(icon_path("tag-16.png"))
197
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
198
 
        self.go_menu_tags.set_image(tag_image)
 
180
        self.go_menu_tags = gtk.MenuItem("_Tags")
199
181
        self._update_tags()
200
182
 
201
183
        go_menu.add(go_menu_next)
209
191
 
210
192
        revision_menu_diff = gtk.MenuItem("View Changes")
211
193
        revision_menu_diff.connect('activate', 
212
 
                self._menu_diff_cb)
213
 
        
214
 
        revision_menu_compare = gtk.MenuItem("Compare with...")
215
 
        revision_menu_compare.connect('activate',
216
 
                self._compare_with_cb)
 
194
                lambda w: self.treeview.show_diff())
217
195
 
218
196
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
197
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
198
 
221
199
        revision_menu.add(revision_menu_tag)
222
200
        revision_menu.add(revision_menu_diff)
223
 
        revision_menu.add(revision_menu_compare)
224
201
 
225
202
        branch_menu = gtk.Menu()
226
203
        branch_menuitem = gtk.MenuItem("_Branch")
229
206
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
207
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
208
 
232
 
        try:
233
 
            from bzrlib.plugins import search
234
 
        except ImportError:
235
 
            mutter("Didn't find search plugin")
236
 
        else:
237
 
            branch_index_menuitem = gtk.MenuItem("_Index")
238
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
239
 
            branch_menu.add(branch_index_menuitem)
240
 
 
241
209
        help_menu = gtk.Menu()
242
210
        help_menuitem = gtk.MenuItem("_Help")
243
211
        help_menuitem.set_submenu(help_menu)
275
243
            option = self.config.get_user_option(col + '-column-visible')
276
244
            if option is not None:
277
245
                self.treeview.set_property(col + '-column-visible', option == 'True')
278
 
            else:
279
 
                self.treeview.set_property(col + '-column-visible', False)
280
246
 
 
247
        self.treeview.set_property(col + '-column-visible', False)
281
248
        self.treeview.show()
282
249
 
283
250
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
329
296
        parents  = self.treeview.get_parents()
330
297
        children = self.treeview.get_children()
331
298
 
332
 
        if revision and revision != NULL_REVISION:
 
299
        if revision is not None:
333
300
            prev_menu = gtk.Menu()
334
301
            if len(parents) > 0:
335
302
                self.prev_rev_action.set_sensitive(True)
336
303
                for parent_id in parents:
337
 
                    if parent_id and parent_id != NULL_REVISION:
338
 
                        parent = self.branch.repository.get_revision(parent_id)
339
 
                        try:
340
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
341
 
                        except KeyError:
342
 
                            str = ""
 
304
                    parent = self.branch.repository.get_revision(parent_id)
 
305
                    try:
 
306
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
307
                    except KeyError:
 
308
                        str = ""
343
309
 
344
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
345
 
                        item.connect('activate', self._set_revision_cb, parent_id)
346
 
                        prev_menu.add(item)
 
310
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
311
                    item.connect('activate', self._set_revision_cb, parent_id)
 
312
                    prev_menu.add(item)
347
313
                prev_menu.show_all()
348
314
            else:
349
315
                self.prev_rev_action.set_sensitive(False)
387
353
 
388
354
        self.show_diff(revision.revision_id, parent_id)
389
355
        self.treeview.grab_focus()
390
 
        
391
 
    def _menu_diff_cb(self,w):
392
 
        (path, focus) = self.treeview.treeview.get_cursor()
393
 
        revid = self.treeview.model[path][treemodel.REVID]
394
 
        
395
 
        parentids = self.branch.repository.revision_parents(revid)
396
 
 
397
 
        if len(parentids) == 0:
398
 
            parentid = NULL_REVISION
399
 
        else:
400
 
            parentid = parentids[0]
401
 
        
402
 
        self.show_diff(revid,parentid)    
 
356
    
403
357
 
404
358
    def _back_clicked_cb(self, *args):
405
359
        """Callback for when the back button is clicked."""
419
373
        self.show_diff(revid, parentid)
420
374
        self.treeview.grab_focus()
421
375
 
422
 
    def _compare_with_cb(self,w):
423
 
        """Callback for revision 'compare with' menu. Will show a small
424
 
            dialog with branch revisions to compare with selected revision in TreeView"""
425
 
        
426
 
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
427
 
        
428
 
        rb = RevisionBrowser(self.branch,self)
429
 
        ret = rb.run()
430
 
        
431
 
        if ret == gtk.RESPONSE_OK:          
432
 
            (path, focus) = self.treeview.treeview.get_cursor()
433
 
            revid = self.treeview.model[path][treemodel.REVID]
434
 
            self.show_diff(revid, rb.selected_revid)
435
 
            
436
 
        rb.destroy()
437
 
            
438
376
    def _set_revision_cb(self, w, revision_id):
439
377
        self.treeview.set_revision_id(revision_id)
440
378
 
466
404
        finally:
467
405
            self.treeview.set_sensitive(True)
468
406
 
469
 
    def _branch_index_cb(self, w):
470
 
        from bzrlib.plugins.search import index as _mod_index
471
 
        _mod_index.index_url(self.branch.base)
472
 
 
473
407
    def _about_dialog_cb(self, w):
474
408
        from bzrlib.plugins.gtk.about import AboutDialog
475
409
 
501
435
            tags.sort()
502
436
            tags.reverse()
503
437
            for tag, revid in tags:
504
 
                tag_image = gtk.Image()
505
 
                tag_image.set_from_file(icon_path('tag-16.png'))
506
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
507
 
                tag_item.set_image(tag_image)
 
438
                tag_item = gtk.MenuItem(tag, use_underline=False)
508
439
                tag_item.connect('activate', self._tag_selected_cb, revid)
509
440
                menu.add(tag_item)
510
441
            self.go_menu_tags.set_submenu(menu)