/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: Jelmer Vernooij
  • Date: 2008-06-29 19:34:29 UTC
  • mto: This revision was merged to the branch mainline in revision 520.
  • Revision ID: jelmer@samba.org-20080629193429-ir2ilmbko6qkubg5
Add Branch/Index option if bzr-search is available.

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
17
18
from bzrlib.plugins.gtk.tags import AddTagDialog
18
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
19
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
21
 
 
22
from bzrlib.config import BranchConfig, GlobalConfig
20
23
from bzrlib.revision import Revision, NULL_REVISION
21
 
from bzrlib.config import BranchConfig
22
 
from bzrlib.config import GlobalConfig
 
24
from bzrlib.trace import mutter
23
25
 
24
26
class BranchWindow(Window):
25
27
    """Branch window.
65
67
 
66
68
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
67
69
        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)
68
71
 
69
72
        self.accel_group = gtk.AccelGroup()
70
73
        self.add_accel_group(self.accel_group)
83
86
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
84
87
        self.next_rev_action.connect_accelerator()
85
88
 
 
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
 
86
95
        self.construct()
87
96
 
88
97
    def set_revision(self, revid):
143
152
        view_menuitem = gtk.MenuItem("_View")
144
153
        view_menuitem.set_submenu(view_menu)
145
154
 
 
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
 
146
161
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
147
162
        view_menu_toolbar.set_active(True)
148
163
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
177
192
        go_menu_next = self.next_rev_action.create_menu_item()
178
193
        go_menu_prev = self.prev_rev_action.create_menu_item()
179
194
 
180
 
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
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)
181
199
        self._update_tags()
182
200
 
183
201
        go_menu.add(go_menu_next)
191
209
 
192
210
        revision_menu_diff = gtk.MenuItem("View Changes")
193
211
        revision_menu_diff.connect('activate', 
194
 
                lambda w: self.treeview.show_diff())
 
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)
195
217
 
196
218
        revision_menu_tag = gtk.MenuItem("Tag Revision")
197
219
        revision_menu_tag.connect('activate', self._tag_revision_cb)
198
220
 
199
221
        revision_menu.add(revision_menu_tag)
200
222
        revision_menu.add(revision_menu_diff)
 
223
        revision_menu.add(revision_menu_compare)
201
224
 
202
225
        branch_menu = gtk.Menu()
203
226
        branch_menuitem = gtk.MenuItem("_Branch")
206
229
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
207
230
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
208
231
 
 
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
 
209
241
        help_menu = gtk.Menu()
210
242
        help_menuitem = gtk.MenuItem("_Help")
211
243
        help_menuitem.set_submenu(help_menu)
243
275
            option = self.config.get_user_option(col + '-column-visible')
244
276
            if option is not None:
245
277
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
278
            else:
 
279
                self.treeview.set_property(col + '-column-visible', False)
246
280
 
247
 
        self.treeview.set_property(col + '-column-visible', False)
248
281
        self.treeview.show()
249
282
 
250
283
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
296
329
        parents  = self.treeview.get_parents()
297
330
        children = self.treeview.get_children()
298
331
 
299
 
        if revision is not None:
 
332
        if revision and revision != NULL_REVISION:
300
333
            prev_menu = gtk.Menu()
301
334
            if len(parents) > 0:
302
335
                self.prev_rev_action.set_sensitive(True)
303
336
                for parent_id in parents:
304
 
                    parent = self.branch.repository.get_revision(parent_id)
305
 
                    try:
306
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
307
 
                    except KeyError:
308
 
                        str = ""
 
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 = ""
309
343
 
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)
 
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)
313
347
                prev_menu.show_all()
314
348
            else:
315
349
                self.prev_rev_action.set_sensitive(False)
353
387
 
354
388
        self.show_diff(revision.revision_id, parent_id)
355
389
        self.treeview.grab_focus()
356
 
    
 
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)    
357
403
 
358
404
    def _back_clicked_cb(self, *args):
359
405
        """Callback for when the back button is clicked."""
373
419
        self.show_diff(revid, parentid)
374
420
        self.treeview.grab_focus()
375
421
 
 
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
            
376
438
    def _set_revision_cb(self, w, revision_id):
377
439
        self.treeview.set_revision_id(revision_id)
378
440
 
404
466
        finally:
405
467
            self.treeview.set_sensitive(True)
406
468
 
 
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
 
407
473
    def _about_dialog_cb(self, w):
408
474
        from bzrlib.plugins.gtk.about import AboutDialog
409
475
 
435
501
            tags.sort()
436
502
            tags.reverse()
437
503
            for tag, revid in tags:
438
 
                tag_item = gtk.MenuItem(tag, use_underline=False)
 
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)
439
508
                tag_item.connect('activate', self._tag_selected_cb, revid)
440
509
                menu.add(tag_item)
441
510
            self.go_menu_tags.set_submenu(menu)