/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:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629190723-l8mzg9x4oec0lhsl
Return cleartext from seahorse module

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
 
 
 
17
from bzrlib.plugins.gtk import icon_path
 
18
from bzrlib.plugins.gtk.tags import AddTagDialog
 
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
 
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
21
from bzrlib.revision import Revision, NULL_REVISION
 
22
from bzrlib.config import BranchConfig
 
23
from bzrlib.config import GlobalConfig
24
24
 
25
25
class BranchWindow(Window):
26
26
    """Branch window.
29
29
    for a particular branch.
30
30
    """
31
31
 
32
 
    def __init__(self, parent=None):
 
32
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
33
        """Create a new BranchWindow.
 
34
 
 
35
        :param branch: Branch object for branch to show.
 
36
        :param start_revs: Revision ids of top revisions.
 
37
        :param maxnum: Maximum number of revisions to display, 
 
38
                       None for no limit.
 
39
        """
 
40
 
33
41
        Window.__init__(self, parent=parent)
34
42
        self.set_border_width(0)
35
 
        self.set_title("Revision history")
 
43
 
 
44
        self.branch      = branch
 
45
        self.start_revs  = start_revs
 
46
        self.maxnum      = maxnum
 
47
        self.config      = GlobalConfig()
 
48
 
 
49
        if self.config.get_user_option('viz-compact-view') == 'yes':
 
50
            self.compact_view = True
 
51
        else:
 
52
            self.compact_view = False
 
53
 
 
54
        self.set_title(branch.nick + " - revision history")
36
55
 
37
56
        # Use three-quarters of the screen by default
38
57
        screen = self.get_screen()
45
64
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
46
65
        self.set_icon(icon)
47
66
 
 
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
 
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
 
48
71
        self.accel_group = gtk.AccelGroup()
49
72
        self.add_accel_group(self.accel_group)
50
73
 
 
74
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
 
75
 
 
76
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
 
77
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
 
78
        self.prev_rev_action.set_accel_group(self.accel_group)
 
79
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
 
80
        self.prev_rev_action.connect_accelerator()
 
81
 
 
82
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
 
83
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
 
84
        self.next_rev_action.set_accel_group(self.accel_group)
 
85
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
 
86
        self.next_rev_action.connect_accelerator()
 
87
 
 
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
 
51
94
        self.construct()
52
95
 
 
96
    def set_revision(self, revid):
 
97
        self.treeview.set_revision_id(revid)
 
98
 
53
99
    def construct(self):
54
100
        """Construct the window contents."""
55
101
        vbox = gtk.VBox(spacing=0)
56
102
        self.add(vbox)
57
103
 
 
104
        self.paned = gtk.VPaned()
 
105
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
106
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
107
        self.paned.show()
 
108
 
 
109
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
58
110
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
59
 
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
60
111
        
61
 
        paned = gtk.VPaned()
62
 
        paned.pack1(self.construct_top(), resize=True, shrink=False)
63
 
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
64
 
        paned.show()
65
 
        vbox.pack_start(paned, expand=True, fill=True)
66
 
        vbox.set_focus_child(paned)
 
112
        vbox.pack_start(self.paned, expand=True, fill=True)
 
113
        vbox.set_focus_child(self.paned)
67
114
 
68
115
        vbox.show()
69
 
    
70
 
    def construct_loading_msg(self):
71
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
72
 
                                                 gtk.ICON_SIZE_BUTTON)
73
 
        image_loading.show()
74
 
        
75
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
76
 
        label_loading.set_alignment(0.0, 0.5)        
77
 
        label_loading.show()
78
 
        
79
 
        self.loading_msg_box = gtk.HBox()
80
 
        self.loading_msg_box.set_spacing(5)
81
 
        self.loading_msg_box.set_border_width(5)        
82
 
        self.loading_msg_box.pack_start(image_loading, False, False)
83
 
        self.loading_msg_box.pack_start(label_loading, True, True)
84
 
        self.loading_msg_box.show()
85
 
        
86
 
        return self.loading_msg_box
 
116
 
 
117
    def construct_menubar(self):
 
118
        menubar = gtk.MenuBar()
 
119
 
 
120
        file_menu = gtk.Menu()
 
121
        file_menuitem = gtk.MenuItem("_File")
 
122
        file_menuitem.set_submenu(file_menu)
 
123
 
 
124
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
 
125
        file_menu_close.connect('activate', lambda x: self.destroy())
 
126
        
 
127
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
 
128
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
 
129
        
 
130
        if self._parent is not None:
 
131
            file_menu.add(file_menu_close)
 
132
        file_menu.add(file_menu_quit)
 
133
 
 
134
        edit_menu = gtk.Menu()
 
135
        edit_menuitem = gtk.MenuItem("_Edit")
 
136
        edit_menuitem.set_submenu(edit_menu)
 
137
 
 
138
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
139
 
 
140
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
 
141
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
 
142
 
 
143
        edit_menu_globopts = gtk.MenuItem("Global Settings")
 
144
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
 
145
 
 
146
        edit_menu.add(edit_menu_find)
 
147
        edit_menu.add(edit_menu_branchopts)
 
148
        edit_menu.add(edit_menu_globopts)
 
149
 
 
150
        view_menu = gtk.Menu()
 
151
        view_menuitem = gtk.MenuItem("_View")
 
152
        view_menuitem.set_submenu(view_menu)
 
153
 
 
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
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
 
161
        view_menu_toolbar.set_active(True)
 
162
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
 
163
 
 
164
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
 
165
        view_menu_compact.set_active(self.compact_view)
 
166
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
 
167
 
 
168
        view_menu.add(view_menu_toolbar)
 
169
        view_menu.add(view_menu_compact)
 
170
        view_menu.add(gtk.SeparatorMenuItem())
 
171
 
 
172
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
 
173
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
 
174
 
 
175
        # Revision numbers are pointless if there are multiple branches
 
176
        if len(self.start_revs) > 1:
 
177
            self.mnu_show_revno_column.set_sensitive(False)
 
178
            self.treeview.set_property('revno-column-visible', False)
 
179
 
 
180
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
 
181
                            (self.mnu_show_date_column, "date")]:
 
182
            col.set_active(self.treeview.get_property(name + "-column-visible"))
 
183
            col.connect('toggled', self._col_visibility_changed, name)
 
184
            view_menu.add(col)
 
185
 
 
186
        go_menu = gtk.Menu()
 
187
        go_menu.set_accel_group(self.accel_group)
 
188
        go_menuitem = gtk.MenuItem("_Go")
 
189
        go_menuitem.set_submenu(go_menu)
 
190
        
 
191
        go_menu_next = self.next_rev_action.create_menu_item()
 
192
        go_menu_prev = self.prev_rev_action.create_menu_item()
 
193
 
 
194
        tag_image = gtk.Image()
 
195
        tag_image.set_from_file(icon_path("tag-16.png"))
 
196
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
 
197
        self.go_menu_tags.set_image(tag_image)
 
198
        self._update_tags()
 
199
 
 
200
        go_menu.add(go_menu_next)
 
201
        go_menu.add(go_menu_prev)
 
202
        go_menu.add(gtk.SeparatorMenuItem())
 
203
        go_menu.add(self.go_menu_tags)
 
204
 
 
205
        revision_menu = gtk.Menu()
 
206
        revision_menuitem = gtk.MenuItem("_Revision")
 
207
        revision_menuitem.set_submenu(revision_menu)
 
208
 
 
209
        revision_menu_diff = gtk.MenuItem("View Changes")
 
210
        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)
 
216
 
 
217
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
218
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
219
 
 
220
        revision_menu.add(revision_menu_tag)
 
221
        revision_menu.add(revision_menu_diff)
 
222
        revision_menu.add(revision_menu_compare)
 
223
 
 
224
        branch_menu = gtk.Menu()
 
225
        branch_menuitem = gtk.MenuItem("_Branch")
 
226
        branch_menuitem.set_submenu(branch_menu)
 
227
 
 
228
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
 
229
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
 
230
 
 
231
        help_menu = gtk.Menu()
 
232
        help_menuitem = gtk.MenuItem("_Help")
 
233
        help_menuitem.set_submenu(help_menu)
 
234
 
 
235
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
 
236
        help_about_menuitem.connect('activate', self._about_dialog_cb)
 
237
 
 
238
        help_menu.add(help_about_menuitem)
 
239
 
 
240
        menubar.add(file_menuitem)
 
241
        menubar.add(edit_menuitem)
 
242
        menubar.add(view_menuitem)
 
243
        menubar.add(go_menuitem)
 
244
        menubar.add(revision_menuitem)
 
245
        menubar.add(branch_menuitem)
 
246
        menubar.add(help_menuitem)
 
247
        menubar.show_all()
 
248
 
 
249
        return menubar
87
250
 
88
251
    def construct_top(self):
89
252
        """Construct the top-half of the window."""
90
 
        scrollwin = gtk.ScrolledWindow()
91
 
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
92
 
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
93
 
        scrollwin.show()
94
 
 
95
 
        self.treeview = gtk.TreeView()
96
 
        self.treeview.set_rules_hint(True)
97
 
        self.treeview.set_search_column(4)
98
 
        self.treeview.get_selection().connect("changed", self._treeselection_changed_cb)
99
 
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
100
 
        self.treeview.connect("button-release-event", 
101
 
                self._treeview_row_mouseclick)
102
 
        self.treeview.set_property('fixed-height-mode', True)
103
 
        scrollwin.add(self.treeview)
 
253
        # FIXME: Make broken_line_length configurable
 
254
 
 
255
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
 
256
 
 
257
        self.treeview.connect('revision-selected',
 
258
                self._treeselection_changed_cb)
 
259
        self.treeview.connect('revision-activated',
 
260
                self._tree_revision_activated)
 
261
 
 
262
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
263
 
 
264
        for col in ["revno", "date"]:
 
265
            option = self.config.get_user_option(col + '-column-visible')
 
266
            if option is not None:
 
267
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
268
            else:
 
269
                self.treeview.set_property(col + '-column-visible', False)
 
270
 
104
271
        self.treeview.show()
105
272
 
106
 
        cell = gtk.CellRendererText()
107
 
        cell.set_property("width-chars", 15)
108
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
109
 
        column = gtk.TreeViewColumn("Revision No")
110
 
        column.set_resizable(True)
111
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
112
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
113
 
        column.pack_start(cell, expand=True)
114
 
        column.add_attribute(cell, "text", treemodel.REVNO)
115
 
        self.treeview.append_column(column)
116
 
 
117
 
        self.graph_cell = CellRendererGraph()
118
 
        self.graph_column = gtk.TreeViewColumn()
119
 
        self.graph_column.set_resizable(True)
120
 
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
121
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
122
 
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
123
 
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
124
 
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
125
 
        self.treeview.append_column(self.graph_column)
126
 
 
127
 
        cell = gtk.CellRendererText()
128
 
        cell.set_property("width-chars", 65)
129
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
130
 
        column = gtk.TreeViewColumn("Message")
131
 
        column.set_resizable(True)
132
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
133
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
134
 
        column.pack_start(cell, expand=True)
135
 
        column.add_attribute(cell, "text", treemodel.MESSAGE)
136
 
        self.treeview.append_column(column)
137
 
 
138
 
        cell = gtk.CellRendererText()
139
 
        cell.set_property("width-chars", 15)
140
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
141
 
        column = gtk.TreeViewColumn("Committer")
142
 
        column.set_resizable(True)
143
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
144
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
145
 
        column.pack_start(cell, expand=True)
146
 
        column.add_attribute(cell, "text", treemodel.COMMITER)
147
 
        self.treeview.append_column(column)
148
 
 
149
 
        return scrollwin
 
273
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
 
274
        align.set_padding(5, 0, 0, 0)
 
275
        align.add(self.treeview)
 
276
        align.show()
 
277
 
 
278
        return align
150
279
 
151
280
    def construct_navigation(self):
152
281
        """Construct the navigation buttons."""
153
 
        frame = gtk.Frame()
154
 
        frame.set_shadow_type(gtk.SHADOW_OUT)
155
 
        frame.show()
156
 
        
157
 
        hbox = gtk.HBox(spacing=12)
158
 
        frame.add(hbox)
159
 
        hbox.show()
160
 
 
161
 
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
162
 
        self.back_button.set_relief(gtk.RELIEF_NONE)
163
 
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
164
 
                                         0, 0)
165
 
        self.back_button.connect("clicked", self._back_clicked_cb)
166
 
        hbox.pack_start(self.back_button, expand=False, fill=True)
167
 
        self.back_button.show()
168
 
 
169
 
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
170
 
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
171
 
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
172
 
                                        0, 0)
173
 
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
174
 
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
175
 
        self.fwd_button.show()
176
 
 
177
 
        return frame
 
282
        self.toolbar = gtk.Toolbar()
 
283
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
 
284
 
 
285
        self.prev_button = self.prev_rev_action.create_tool_item()
 
286
        self.toolbar.insert(self.prev_button, -1)
 
287
 
 
288
        self.next_button = self.next_rev_action.create_tool_item()
 
289
        self.toolbar.insert(self.next_button, -1)
 
290
 
 
291
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
 
292
 
 
293
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
 
294
        refresh_button.connect('clicked', self._refresh_clicked)
 
295
        self.toolbar.insert(refresh_button, -1)
 
296
 
 
297
        self.toolbar.show_all()
 
298
 
 
299
        return self.toolbar
178
300
 
179
301
    def construct_bottom(self):
180
302
        """Construct the bottom half of the window."""
181
 
        from bzrlib.plugins.gtk.logview import LogView
182
 
        self.logview = LogView(None, True, [], True)
 
303
        from bzrlib.plugins.gtk.revisionview import RevisionView
 
304
        self.revisionview = RevisionView(branch=self.branch)
183
305
        (width, height) = self.get_size()
184
 
        self.logview.set_size_request(width, int(height / 2.5))
185
 
        self.logview.show()
186
 
        self.logview.set_show_callback(self._show_clicked_cb)
187
 
        self.logview.set_go_callback(self._go_clicked_cb)
188
 
        return self.logview
189
 
 
190
 
    def set_branch(self, branch, start, maxnum):
191
 
        """Set the branch and start position for this window.
192
 
 
193
 
        Creates a new TreeModel and populates it with information about
194
 
        the new branch before updating the window title and model of the
195
 
        treeview itself.
196
 
        """
197
 
        self.branch = branch
198
 
        self.set_title(branch.nick + " - revision history")
199
 
        gobject.idle_add(self.populate_model, start, maxnum)
200
 
 
201
 
    def populate_model(self, start, maxnum):
202
 
        (linegraphdata, index, columns_len) = linegraph(self.branch,
203
 
                                                        start,
204
 
                                                        maxnum)
205
 
        self.model = TreeModel(self.branch, linegraphdata)
206
 
        self.graph_cell.columns_len = columns_len
207
 
        width = self.graph_cell.get_size(self.treeview)[2]
208
 
        self.graph_column.set_fixed_width(width)
209
 
        self.graph_column.set_max_width(width)
210
 
        self.index = index
211
 
        self.treeview.set_model(self.model)
212
 
        self.treeview.get_selection().select_path(0)
213
 
        self.loading_msg_box.hide()
214
 
        return False
215
 
    
 
306
        self.revisionview.set_size_request(width, int(height / 2.5))
 
307
        self.revisionview.show()
 
308
        self.revisionview.set_show_callback(self._show_clicked_cb)
 
309
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
 
310
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
 
311
        return self.revisionview
 
312
 
 
313
    def _tag_selected_cb(self, menuitem, revid):
 
314
        self.treeview.set_revision_id(revid)
 
315
 
216
316
    def _treeselection_changed_cb(self, selection, *args):
217
 
        """Callback for when the treeview changes."""
218
 
        (model, selected_rows) = selection.get_selected_rows()
219
 
        if len(selected_rows) > 0:
220
 
            iter = self.model.get_iter(selected_rows[0])
221
 
            revision = self.model.get_value(iter, treemodel.REVISION)
222
 
            parents = self.model.get_value(iter, treemodel.PARENTS)
223
 
            children = self.model.get_value(iter, treemodel.CHILDREN)
224
 
            
225
 
            self.back_button.set_sensitive(len(parents) > 0)
226
 
            self.fwd_button.set_sensitive(len(children) > 0)
227
 
            tags = []
228
 
            if self.branch.supports_tags():
229
 
                tagdict = self.branch.tags.get_reverse_tag_dict()
230
 
                if tagdict.has_key(revision.revision_id):
231
 
                    tags = tagdict[revision.revision_id]
232
 
            self.logview.set_revision(revision, tags, children)
 
317
        """callback for when the treeview changes."""
 
318
        revision = self.treeview.get_revision()
 
319
        parents  = self.treeview.get_parents()
 
320
        children = self.treeview.get_children()
 
321
 
 
322
        if revision and revision != NULL_REVISION:
 
323
            prev_menu = gtk.Menu()
 
324
            if len(parents) > 0:
 
325
                self.prev_rev_action.set_sensitive(True)
 
326
                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 = ""
 
333
 
 
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)
 
337
                prev_menu.show_all()
 
338
            else:
 
339
                self.prev_rev_action.set_sensitive(False)
 
340
                prev_menu.hide()
 
341
 
 
342
            self.prev_button.set_menu(prev_menu)
 
343
 
 
344
            next_menu = gtk.Menu()
 
345
            if len(children) > 0:
 
346
                self.next_rev_action.set_sensitive(True)
 
347
                for child_id in children:
 
348
                    child = self.branch.repository.get_revision(child_id)
 
349
                    try:
 
350
                        str = ' (' + child.properties['branch-nick'] + ')'
 
351
                    except KeyError:
 
352
                        str = ""
 
353
 
 
354
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
 
355
                    item.connect('activate', self._set_revision_cb, child_id)
 
356
                    next_menu.add(item)
 
357
                next_menu.show_all()
 
358
            else:
 
359
                self.next_rev_action.set_sensitive(False)
 
360
                next_menu.hide()
 
361
 
 
362
            self.next_button.set_menu(next_menu)
 
363
 
 
364
            self.revisionview.set_revision(revision)
 
365
            self.revisionview.set_children(children)
 
366
    
 
367
    def _tree_revision_activated(self, widget, path, col):
 
368
        # TODO: more than one parent
 
369
        """Callback for when a treeview row gets activated."""
 
370
        revision = self.treeview.get_revision()
 
371
        parents  = self.treeview.get_parents()
 
372
 
 
373
        if len(parents) == 0:
 
374
            parent_id = None
 
375
        else:
 
376
            parent_id = parents[0]
 
377
 
 
378
        self.show_diff(revision.revision_id, parent_id)
 
379
        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)    
233
393
 
234
394
    def _back_clicked_cb(self, *args):
235
395
        """Callback for when the back button is clicked."""
236
 
        (path, col) = self.treeview.get_cursor()
237
 
        revision = self.model[path][0]
238
 
        parents = self.model[path][4]
239
 
        if not len(parents):
240
 
            return
241
 
 
242
 
        for parent_id in parents:
243
 
            parent = self.revisions[self.index[parent_id]]
244
 
            if same_branch(revision, parent):
245
 
                self.treeview.set_cursor(self.index[parent_id])
246
 
                break
247
 
        else:
248
 
            self.treeview.set_cursor(self.index[parents[0]])
249
 
        self.treeview.grab_focus()
250
 
 
 
396
        self.treeview.back()
 
397
        
251
398
    def _fwd_clicked_cb(self, *args):
252
399
        """Callback for when the forward button is clicked."""
253
 
        (path, col) = self.treeview.get_cursor()
254
 
        revision = self.model[path][0]
255
 
        children = self.model[path][5]
256
 
        if not len(children):
257
 
            return
258
 
 
259
 
        for child_id in children:
260
 
            child = self.revisions[self.index[child_id]]
261
 
            if same_branch(child, revision):
262
 
                self.treeview.set_cursor(self.index[child_id])
263
 
                break
264
 
        else:
265
 
            self.treeview.set_cursor(self.index[children[0]])
266
 
        self.treeview.grab_focus()
267
 
 
268
 
    def _go_clicked_cb(self, revid):
 
400
        self.treeview.forward()
 
401
 
 
402
    def _go_clicked_cb(self, w, p):
269
403
        """Callback for when the go button for a parent is clicked."""
270
 
        self.treeview.set_cursor(self.index[revid])
 
404
        if self.revisionview.get_revision() is not None:
 
405
            self.treeview.set_revision(self.revisionview.get_revision())
 
406
 
 
407
    def _show_clicked_cb(self, revid, parentid):
 
408
        """Callback for when the show button for a parent is clicked."""
 
409
        self.show_diff(revid, parentid)
271
410
        self.treeview.grab_focus()
272
411
 
273
 
    def show_diff(self, branch, revid, parentid):
 
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
    def _set_revision_cb(self, w, revision_id):
 
429
        self.treeview.set_revision_id(revision_id)
 
430
 
 
431
    def _brokenlines_toggled_cb(self, button):
 
432
        self.compact_view = button.get_active()
 
433
 
 
434
        if self.compact_view:
 
435
            option = 'yes'
 
436
        else:
 
437
            option = 'no'
 
438
 
 
439
        self.config.set_user_option('viz-compact-view', option)
 
440
        self.treeview.set_property('compact', self.compact_view)
 
441
        self.treeview.refresh()
 
442
 
 
443
    def _tag_revision_cb(self, w):
 
444
        try:
 
445
            self.treeview.set_sensitive(False)
 
446
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
447
            response = dialog.run()
 
448
            if response != gtk.RESPONSE_NONE:
 
449
                dialog.hide()
 
450
            
 
451
                if response == gtk.RESPONSE_OK:
 
452
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
453
                
 
454
                dialog.destroy()
 
455
 
 
456
        finally:
 
457
            self.treeview.set_sensitive(True)
 
458
 
 
459
    def _about_dialog_cb(self, w):
 
460
        from bzrlib.plugins.gtk.about import AboutDialog
 
461
 
 
462
        AboutDialog().run()
 
463
 
 
464
    def _col_visibility_changed(self, col, property):
 
465
        self.config.set_user_option(property + '-column-visible', col.get_active())
 
466
        self.treeview.set_property(property + '-column-visible', col.get_active())
 
467
 
 
468
    def _toolbar_visibility_changed(self, col):
 
469
        if col.get_active():
 
470
            self.toolbar.show() 
 
471
        else:
 
472
            self.toolbar.hide()
 
473
 
 
474
    def _show_about_cb(self, w):
 
475
        dialog = AboutDialog()
 
476
        dialog.connect('response', lambda d,r: d.destroy())
 
477
        dialog.run()
 
478
 
 
479
    def _refresh_clicked(self, w):
 
480
        self.treeview.refresh()
 
481
 
 
482
    def _update_tags(self):
 
483
        menu = gtk.Menu()
 
484
 
 
485
        if self.branch.supports_tags():
 
486
            tags = self.branch.tags.get_tag_dict().items()
 
487
            tags.sort()
 
488
            tags.reverse()
 
489
            for tag, revid in tags:
 
490
                tag_image = gtk.Image()
 
491
                tag_image.set_from_file(icon_path('tag-16.png'))
 
492
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
 
493
                tag_item.set_image(tag_image)
 
494
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
495
                menu.add(tag_item)
 
496
            self.go_menu_tags.set_submenu(menu)
 
497
 
 
498
            self.go_menu_tags.set_sensitive(len(tags) != 0)
 
499
        else:
 
500
            self.go_menu_tags.set_sensitive(False)
 
501
 
 
502
        self.go_menu_tags.show_all()
 
503
 
 
504
    def show_diff(self, revid=None, parentid=None):
274
505
        """Open a new window to show a diff between the given revisions."""
275
506
        from bzrlib.plugins.gtk.diff import DiffWindow
276
507
        window = DiffWindow(parent=self)
277
 
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
278
 
                                                                   revid])
279
 
        description = revid + " - " + branch.nick
 
508
 
 
509
        if parentid is None:
 
510
            parentid = NULL_REVISION
 
511
 
 
512
        rev_tree    = self.branch.repository.revision_tree(revid)
 
513
        parent_tree = self.branch.repository.revision_tree(parentid)
 
514
 
 
515
        description = revid + " - " + self.branch.nick
280
516
        window.set_diff(description, rev_tree, parent_tree)
281
517
        window.show()
282
518
 
283
 
    def _show_clicked_cb(self, revid, parentid):
284
 
        """Callback for when the show button for a parent is clicked."""
285
 
        self.show_diff(self.branch, revid, parentid)
286
 
        self.treeview.grab_focus()
287
 
 
288
 
    def _treeview_row_mouseclick(self, widget, event):
289
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
290
 
        if event.button == 3:
291
 
            menu = RevisionPopupMenu(self.branch.repository, 
292
 
                [x.revision_id for x in self.selected_revisions()],
293
 
                self.branch)
294
 
            menu.popup(None, None, None, event.button, event.get_time())
295
 
 
296
 
    def selected_revision(self, path):
297
 
        return self.model[path][treemodel.REVISION]
298
 
 
299
 
    def selected_revisions(self):
300
 
        return [self.selected_revision(path) for path in \
301
 
                self.treeview.get_selection().get_selected_rows()[1]]
302
 
 
303
 
    def _treeview_row_activated_cb(self, widget, path, col):
304
 
        # TODO: more than one parent
305
 
        """Callback for when a treeview row gets activated."""
306
 
        revision_id = self.model[path][treemodel.REVID]
307
 
        parents = self.model[path][treemodel.PARENTS]
308
 
        if len(parents) == 0:
309
 
            # Ignore revisions without parent
310
 
            return
311
 
        parent_id = parents[0]
312
 
        self.show_diff(self.branch, revision_id, parent_id)
313
 
        self.treeview.grab_focus()
 
519