/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: Javier Derderian
  • Date: 2008-04-11 20:34:06 UTC
  • mto: (465.1.1 gtk.patch)
  • mto: This revision was merged to the branch mainline in revision 466.
  • Revision ID: javierder@gmail.com-20080411203406-ftlwyodw9vr87olv
Updated "Compare with..." (#78765) to use revbrowser.RevisionBrowser.
Also needed to fix #215872 to make it work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
18
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
 
 
22
 
from bzrlib.config import BranchConfig, GlobalConfig
23
21
from bzrlib.revision import Revision, NULL_REVISION
24
 
from bzrlib.trace import mutter
 
22
from bzrlib.config import BranchConfig
 
23
from bzrlib.config import GlobalConfig
25
24
 
26
25
class BranchWindow(Window):
27
26
    """Branch window.
67
66
 
68
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
69
68
        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
69
 
72
70
        self.accel_group = gtk.AccelGroup()
73
71
        self.add_accel_group(self.accel_group)
86
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
87
85
        self.next_rev_action.connect_accelerator()
88
86
 
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
87
        self.construct()
96
88
 
97
89
    def set_revision(self, revid):
152
144
        view_menuitem = gtk.MenuItem("_View")
153
145
        view_menuitem.set_submenu(view_menu)
154
146
 
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
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
148
        view_menu_toolbar.set_active(True)
163
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
209
195
 
210
196
        revision_menu_diff = gtk.MenuItem("View Changes")
211
197
        revision_menu_diff.connect('activate', 
212
 
                self._menu_diff_cb)
 
198
                lambda w: self.treeview.show_diff())
213
199
        
214
200
        revision_menu_compare = gtk.MenuItem("Compare with...")
215
201
        revision_menu_compare.connect('activate',
216
202
                self._compare_with_cb)
217
 
 
 
203
        
218
204
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
205
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
206
 
229
215
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
216
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
217
 
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
218
        help_menu = gtk.Menu()
242
219
        help_menuitem = gtk.MenuItem("_Help")
243
220
        help_menuitem.set_submenu(help_menu)
275
252
            option = self.config.get_user_option(col + '-column-visible')
276
253
            if option is not None:
277
254
                self.treeview.set_property(col + '-column-visible', option == 'True')
278
 
            else:
279
 
                self.treeview.set_property(col + '-column-visible', False)
280
255
 
 
256
        self.treeview.set_property(col + '-column-visible', False)
281
257
        self.treeview.show()
282
258
 
283
259
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
329
305
        parents  = self.treeview.get_parents()
330
306
        children = self.treeview.get_children()
331
307
 
332
 
        if revision and revision != NULL_REVISION:
 
308
        if revision is not None:
333
309
            prev_menu = gtk.Menu()
334
310
            if len(parents) > 0:
335
311
                self.prev_rev_action.set_sensitive(True)
336
312
                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 = ""
 
313
                    parent = self.branch.repository.get_revision(parent_id)
 
314
                    try:
 
315
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
316
                    except KeyError:
 
317
                        str = ""
343
318
 
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)
 
319
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
320
                    item.connect('activate', self._set_revision_cb, parent_id)
 
321
                    prev_menu.add(item)
347
322
                prev_menu.show_all()
348
323
            else:
349
324
                self.prev_rev_action.set_sensitive(False)
387
362
 
388
363
        self.show_diff(revision.revision_id, parent_id)
389
364
        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)    
 
365
    
403
366
 
404
367
    def _back_clicked_cb(self, *args):
405
368
        """Callback for when the back button is clicked."""
466
429
        finally:
467
430
            self.treeview.set_sensitive(True)
468
431
 
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
432
    def _about_dialog_cb(self, w):
474
433
        from bzrlib.plugins.gtk.about import AboutDialog
475
434