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