/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-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
12
12
import gtk
13
13
import gobject
14
14
import pango
15
 
import treemodel
16
15
 
17
16
from bzrlib.plugins.gtk.window import Window
18
 
from bzrlib.osutils import format_date
19
 
 
20
 
from linegraph import linegraph, same_branch
21
 
from graphcell import CellRendererGraph
22
 
from treemodel import TreeModel
23
 
from treeview  import TreeView
 
17
from bzrlib.plugins.gtk.tags import AddTagDialog
 
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
19
from bzrlib.plugins.gtk.branchview import TreeView
 
20
from bzrlib.revision import Revision
 
21
from bzrlib.config import BranchConfig
 
22
from bzrlib.config import GlobalConfig
24
23
 
25
24
class BranchWindow(Window):
26
25
    """Branch window.
30
29
    """
31
30
 
32
31
    def __init__(self, branch, start, maxnum, parent=None):
 
32
        """Create a new BranchWindow.
 
33
 
 
34
        :param branch: Branch object for branch to show.
 
35
        :param start: Revision id of top revision.
 
36
        :param maxnum: Maximum number of revisions to display, 
 
37
                       None for no limit.
 
38
        """
 
39
 
33
40
        Window.__init__(self, parent=parent)
34
41
        self.set_border_width(0)
35
42
 
36
 
        self.branch = branch
37
 
        self.start  = start
38
 
        self.maxnum = maxnum
 
43
        self.branch      = branch
 
44
        self.start       = start
 
45
        self.maxnum      = maxnum
 
46
        self.config      = GlobalConfig()
 
47
 
 
48
        if self.config.get_user_option('viz-compact-view') == 'yes':
 
49
            self.compact_view = True
 
50
        else:
 
51
            self.compact_view = False
39
52
 
40
53
        self.set_title(branch.nick + " - revision history")
41
54
 
50
63
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
51
64
        self.set_icon(icon)
52
65
 
 
66
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
 
67
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
 
68
 
53
69
        self.accel_group = gtk.AccelGroup()
54
70
        self.add_accel_group(self.accel_group)
55
71
 
 
72
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
 
73
 
 
74
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
 
75
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
 
76
        self.prev_rev_action.set_accel_group(self.accel_group)
 
77
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
 
78
        self.prev_rev_action.connect_accelerator()
 
79
 
 
80
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
 
81
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
 
82
        self.next_rev_action.set_accel_group(self.accel_group)
 
83
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
 
84
        self.next_rev_action.connect_accelerator()
 
85
 
56
86
        self.construct()
57
87
 
 
88
    def set_revision(self, revid):
 
89
        self.treeview.set_revision_id(revid)
 
90
 
58
91
    def construct(self):
59
92
        """Construct the window contents."""
60
93
        vbox = gtk.VBox(spacing=0)
61
94
        self.add(vbox)
62
95
 
 
96
        self.paned = gtk.VPaned()
 
97
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
98
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
99
        self.paned.show()
 
100
 
 
101
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
63
102
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
64
103
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
65
104
        
66
 
        paned = gtk.VPaned()
67
 
        paned.pack1(self.construct_top(), resize=True, shrink=False)
68
 
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
69
 
        paned.show()
70
 
        vbox.pack_start(paned, expand=True, fill=True)
71
 
        vbox.set_focus_child(paned)
 
105
        vbox.pack_start(self.paned, expand=True, fill=True)
 
106
        vbox.set_focus_child(self.paned)
72
107
 
73
108
        vbox.show()
 
109
 
 
110
    def construct_menubar(self):
 
111
        menubar = gtk.MenuBar()
 
112
 
 
113
        file_menu = gtk.Menu()
 
114
        file_menuitem = gtk.MenuItem("_File")
 
115
        file_menuitem.set_submenu(file_menu)
 
116
 
 
117
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
 
118
        file_menu_close.connect('activate', lambda x: self.destroy())
 
119
        
 
120
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
 
121
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
 
122
        
 
123
        if self._parent is not None:
 
124
            file_menu.add(file_menu_close)
 
125
        file_menu.add(file_menu_quit)
 
126
 
 
127
        edit_menu = gtk.Menu()
 
128
        edit_menuitem = gtk.MenuItem("_Edit")
 
129
        edit_menuitem.set_submenu(edit_menu)
 
130
 
 
131
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
132
 
 
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
 
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
 
135
 
 
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
 
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
 
138
 
 
139
        edit_menu.add(edit_menu_find)
 
140
        edit_menu.add(edit_menu_branchopts)
 
141
        edit_menu.add(edit_menu_globopts)
 
142
 
 
143
        view_menu = gtk.Menu()
 
144
        view_menuitem = gtk.MenuItem("_View")
 
145
        view_menuitem.set_submenu(view_menu)
 
146
 
 
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
 
148
        view_menu_toolbar.set_active(True)
 
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
 
150
 
 
151
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
 
152
        view_menu_compact.set_active(self.compact_view)
 
153
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
 
154
 
 
155
        view_menu.add(view_menu_toolbar)
 
156
        view_menu.add(view_menu_compact)
 
157
        view_menu.add(gtk.SeparatorMenuItem())
 
158
 
 
159
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
160
            col = gtk.CheckMenuItem("Show " + label + " Column")
 
161
            col.set_active(self.treeview.get_property(name + "-column-visible"))
 
162
            col.connect('toggled', self._col_visibility_changed, name)
 
163
            view_menu.add(col)
 
164
 
 
165
        go_menu = gtk.Menu()
 
166
        go_menu.set_accel_group(self.accel_group)
 
167
        go_menuitem = gtk.MenuItem("_Go")
 
168
        go_menuitem.set_submenu(go_menu)
 
169
        
 
170
        go_menu_next = self.next_rev_action.create_menu_item()
 
171
        go_menu_prev = self.prev_rev_action.create_menu_item()
 
172
 
 
173
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
174
        self._update_tags()
 
175
 
 
176
        go_menu.add(go_menu_next)
 
177
        go_menu.add(go_menu_prev)
 
178
        go_menu.add(gtk.SeparatorMenuItem())
 
179
        go_menu.add(self.go_menu_tags)
 
180
 
 
181
        revision_menu = gtk.Menu()
 
182
        revision_menuitem = gtk.MenuItem("_Revision")
 
183
        revision_menuitem.set_submenu(revision_menu)
 
184
 
 
185
        revision_menu_diff = gtk.MenuItem("View Changes")
 
186
        revision_menu_diff.connect('activate', 
 
187
                lambda w: self.treeview.show_diff())
 
188
 
 
189
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
190
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
191
 
 
192
        revision_menu.add(revision_menu_tag)
 
193
        revision_menu.add(revision_menu_diff)
 
194
 
 
195
        branch_menu = gtk.Menu()
 
196
        branch_menuitem = gtk.MenuItem("_Branch")
 
197
        branch_menuitem.set_submenu(branch_menu)
 
198
 
 
199
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
 
200
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
 
201
 
 
202
        menubar.add(file_menuitem)
 
203
        menubar.add(edit_menuitem)
 
204
        menubar.add(view_menuitem)
 
205
        menubar.add(go_menuitem)
 
206
        menubar.add(revision_menuitem)
 
207
        menubar.add(branch_menuitem)
 
208
        menubar.show_all()
 
209
 
 
210
        return menubar
74
211
    
75
212
    def construct_loading_msg(self):
76
213
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
78
215
        image_loading.show()
79
216
        
80
217
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
81
 
        label_loading.set_alignment(0.0, 0.5)        
 
218
        label_loading.set_alignment(0.0, 0.5)
82
219
        label_loading.show()
83
220
        
84
221
        self.loading_msg_box = gtk.HBox()
92
229
 
93
230
    def construct_top(self):
94
231
        """Construct the top-half of the window."""
95
 
        self.treeview = TreeView(self.branch, self.start, self.maxnum)
96
 
 
97
 
        self.treeview.connect("revision-selected",
 
232
        # FIXME: Make broken_line_length configurable
 
233
 
 
234
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
235
 
 
236
        self.treeview.connect('revision-selected',
98
237
                self._treeselection_changed_cb)
99
238
 
100
239
        self.treeview.connect('revisions-loaded', 
101
240
                lambda x: self.loading_msg_box.hide())
102
241
 
 
242
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
243
 
 
244
        for col in ["revno", "date"]:
 
245
            option = self.config.get_user_option(col + '-column-visible')
 
246
            if option is not None:
 
247
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
248
 
103
249
        self.treeview.show()
104
250
 
105
 
        return self.treeview
 
251
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
252
        align.set_padding(5, 0, 0, 0)
 
253
        align.add(self.treeview)
 
254
        align.show()
 
255
 
 
256
        return align
106
257
 
107
258
    def construct_navigation(self):
108
259
        """Construct the navigation buttons."""
109
 
        frame = gtk.Frame()
110
 
        frame.set_shadow_type(gtk.SHADOW_OUT)
111
 
        frame.show()
112
 
        
113
 
        hbox = gtk.HBox(spacing=12)
114
 
        frame.add(hbox)
115
 
        hbox.show()
116
 
 
117
 
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
118
 
        self.back_button.set_relief(gtk.RELIEF_NONE)
119
 
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
120
 
                                         0, 0)
121
 
        self.back_button.connect("clicked", self._back_clicked_cb)
122
 
        hbox.pack_start(self.back_button, expand=False, fill=True)
123
 
        self.back_button.show()
124
 
 
125
 
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
126
 
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
127
 
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
128
 
                                        0, 0)
129
 
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
130
 
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
131
 
        self.fwd_button.show()
132
 
 
133
 
        return frame
 
260
        self.toolbar = gtk.Toolbar()
 
261
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
 
262
 
 
263
        self.prev_button = self.prev_rev_action.create_tool_item()
 
264
        self.toolbar.insert(self.prev_button, -1)
 
265
 
 
266
        self.next_button = self.next_rev_action.create_tool_item()
 
267
        self.toolbar.insert(self.next_button, -1)
 
268
 
 
269
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
 
270
 
 
271
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
272
        refresh_button.connect('clicked', self._refresh_clicked)
 
273
        self.toolbar.insert(refresh_button, -1)
 
274
 
 
275
        self.toolbar.show_all()
 
276
 
 
277
        return self.toolbar
134
278
 
135
279
    def construct_bottom(self):
136
280
        """Construct the bottom half of the window."""
137
 
        from bzrlib.plugins.gtk.logview import LogView
138
 
        self.logview = LogView(None, True, [], True)
 
281
        from bzrlib.plugins.gtk.revisionview import RevisionView
 
282
        self.revisionview = RevisionView(branch=self.branch)
139
283
        (width, height) = self.get_size()
140
 
        self.logview.set_size_request(width, int(height / 2.5))
141
 
        self.logview.show()
142
 
        self.logview.set_show_callback(self._show_clicked_cb)
143
 
        self.logview.set_go_callback(self._go_clicked_cb)
144
 
        return self.logview
145
 
    
 
284
        self.revisionview.set_size_request(width, int(height / 2.5))
 
285
        self.revisionview.show()
 
286
        self.revisionview.set_show_callback(self._show_clicked_cb)
 
287
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
 
288
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
 
289
        return self.revisionview
 
290
 
 
291
    def _tag_selected_cb(self, menuitem, revid):
 
292
        self.treeview.set_revision_id(revid)
 
293
 
146
294
    def _treeselection_changed_cb(self, selection, *args):
147
295
        """callback for when the treeview changes."""
148
296
        revision = self.treeview.get_revision()
150
298
        children = self.treeview.get_children()
151
299
 
152
300
        if revision is not None:
153
 
            self.back_button.set_sensitive(len(parents) > 0)
154
 
            self.fwd_button.set_sensitive(len(children) > 0)
155
 
            tags = []
156
 
            if self.branch.supports_tags():
157
 
                tagdict = self.branch.tags.get_reverse_tag_dict()
158
 
                if tagdict.has_key(revision.revision_id):
159
 
                    tags = tagdict[revision.revision_id]
160
 
            self.logview.set_revision(revision, tags, children)
 
301
            prev_menu = gtk.Menu()
 
302
            if len(parents) > 0:
 
303
                self.prev_rev_action.set_sensitive(True)
 
304
                for parent_id in parents:
 
305
                    parent = self.branch.repository.get_revision(parent_id)
 
306
                    try:
 
307
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
308
                    except KeyError:
 
309
                        str = ""
 
310
 
 
311
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
312
                    item.connect('activate', self._set_revision_cb, parent_id)
 
313
                    prev_menu.add(item)
 
314
                prev_menu.show_all()
 
315
            else:
 
316
                self.prev_rev_action.set_sensitive(False)
 
317
                prev_menu.hide()
 
318
 
 
319
            self.prev_button.set_menu(prev_menu)
 
320
 
 
321
            next_menu = gtk.Menu()
 
322
            if len(children) > 0:
 
323
                self.next_rev_action.set_sensitive(True)
 
324
                for child_id in children:
 
325
                    child = self.branch.repository.get_revision(child_id)
 
326
                    try:
 
327
                        str = ' (' + child.properties['branch-nick'] + ')'
 
328
                    except KeyError:
 
329
                        str = ""
 
330
 
 
331
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
 
332
                    item.connect('activate', self._set_revision_cb, child_id)
 
333
                    next_menu.add(item)
 
334
                next_menu.show_all()
 
335
            else:
 
336
                self.next_rev_action.set_sensitive(False)
 
337
                next_menu.hide()
 
338
 
 
339
            self.next_button.set_menu(next_menu)
 
340
 
 
341
            self.revisionview.set_revision(revision)
 
342
            self.revisionview.set_children(children)
161
343
 
162
344
    def _back_clicked_cb(self, *args):
163
345
        """Callback for when the back button is clicked."""
167
349
        """Callback for when the forward button is clicked."""
168
350
        self.treeview.forward()
169
351
 
170
 
    def _go_clicked_cb(self, revid):
 
352
    def _go_clicked_cb(self, w, p):
171
353
        """Callback for when the go button for a parent is clicked."""
172
 
        self.treeview.set_revision(revid)
 
354
        if self.revisionview.get_revision() is not None:
 
355
            self.treeview.set_revision(self.revisionview.get_revision())
173
356
 
174
357
    def _show_clicked_cb(self, revid, parentid):
175
358
        """Callback for when the show button for a parent is clicked."""
176
 
        self.treeview.show_diff(self.branch, revid, parentid)
 
359
        self.treeview.show_diff(revid, parentid)
177
360
        self.treeview.grab_focus()
178
361
 
 
362
    def _set_revision_cb(self, w, revision_id):
 
363
        self.treeview.set_revision_id(revision_id)
 
364
 
 
365
    def _brokenlines_toggled_cb(self, button):
 
366
        self.compact_view = button.get_active()
 
367
 
 
368
        if self.compact_view:
 
369
            option = 'yes'
 
370
        else:
 
371
            option = 'no'
 
372
 
 
373
        self.config.set_user_option('viz-compact-view', option)
 
374
        self.treeview.set_property('compact', self.compact_view)
 
375
        self.treeview.refresh()
 
376
 
 
377
    def _tag_revision_cb(self, w):
 
378
        try:
 
379
            self.treeview.set_sensitive(False)
 
380
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
381
            response = dialog.run()
 
382
            if response != gtk.RESPONSE_NONE:
 
383
                dialog.hide()
 
384
            
 
385
                if response == gtk.RESPONSE_OK:
 
386
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
387
                
 
388
                dialog.destroy()
 
389
 
 
390
        finally:
 
391
            self.treeview.set_sensitive(True)
 
392
 
 
393
    def _col_visibility_changed(self, col, property):
 
394
        self.config.set_user_option(property + '-column-visible', col.get_active())
 
395
        self.treeview.set_property(property + '-column-visible', col.get_active())
 
396
 
 
397
    def _toolbar_visibility_changed(self, col):
 
398
        if col.get_active():
 
399
            self.toolbar.show() 
 
400
        else:
 
401
            self.toolbar.hide()
 
402
 
 
403
    def _show_about_cb(self, w):
 
404
        dialog = AboutDialog()
 
405
        dialog.connect('response', lambda d,r: d.destroy())
 
406
        dialog.run()
 
407
 
 
408
    def _refresh_clicked(self, w):
 
409
        self.treeview.update()
 
410
 
 
411
    def _update_tags(self):
 
412
        menu = gtk.Menu()
 
413
 
 
414
        if self.branch.supports_tags():
 
415
            tags = self.branch.tags.get_tag_dict().items()
 
416
            tags.sort()
 
417
            tags.reverse()
 
418
            for tag, revid in tags:
 
419
                tag_item = gtk.MenuItem(tag)
 
420
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
421
                menu.add(tag_item)
 
422
            self.go_menu_tags.set_submenu(menu)
 
423
 
 
424
            self.go_menu_tags.set_sensitive(len(tags) != 0)
 
425
        else:
 
426
            self.go_menu_tags.set_sensitive(False)
 
427
 
 
428
        self.go_menu_tags.show_all()
 
429
 
 
430