/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: John Arbash Meinel
  • Date: 2007-10-02 23:08:12 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
 
1
# -*- coding: UTF-8 -*-
1
2
"""Branch window.
2
3
 
3
4
This module contains the code to manage the branch information window,
4
5
which contains both the revision graph and details panes.
5
6
"""
6
7
 
7
 
__copyright__ = "Copyright (c) 2005 Canonical Ltd."
 
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
9
10
 
10
11
 
11
 
from gi.repository import Gdk
12
 
from gi.repository import Gtk
13
 
 
14
 
from bzrlib.plugins.gtk import icon_path
15
 
from bzrlib.plugins.gtk.branchview import TreeView
16
 
from bzrlib.plugins.gtk.preferences import PreferencesWindow
17
 
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
18
 
from bzrlib.plugins.gtk.window import Window
19
 
 
20
 
from bzrlib.config import GlobalConfig
21
 
from bzrlib.revision import NULL_REVISION
22
 
from bzrlib.trace import mutter
23
 
 
24
 
 
25
 
class BranchWindow(Window):
 
12
import gtk
 
13
import gobject
 
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):
26
25
    """Branch window.
27
26
 
28
27
    This object represents and manages a single window containing information
29
28
    for a particular branch.
30
29
    """
31
30
 
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
 
 
41
 
        super(BranchWindow, self).__init__(parent=parent)
 
31
    def __init__(self, parent=None):
 
32
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
42
33
        self.set_border_width(0)
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._get_nick(local=True) + " - revision history")
55
 
 
56
 
        # user-configured window size
57
 
        size = self._load_size('viz-window-size')
58
 
        if size:
59
 
            width, height = size
60
 
        else:
61
 
            # Use three-quarters of the screen by default
62
 
            screen = self.get_screen()
63
 
            monitor = screen.get_monitor_geometry(0)
64
 
            width = int(monitor.width * 0.75)
65
 
            height = int(monitor.height * 0.75)
 
34
        self.set_title("bzrk")
 
35
 
 
36
        self._parent = parent
 
37
 
 
38
        self.connect('key-press-event', self._on_key_pressed)
 
39
 
 
40
        # Use three-quarters of the screen by default
 
41
        screen = self.get_screen()
 
42
        monitor = screen.get_monitor_geometry(0)
 
43
        width = int(monitor.width * 0.75)
 
44
        height = int(monitor.height * 0.75)
66
45
        self.set_default_size(width, height)
67
 
        self.set_size_request(width/3, height/3)
68
 
        self._save_size_on_destroy(self, 'viz-window-size')
69
46
 
70
47
        # FIXME AndyFitz!
71
 
        icon = self.render_icon_pixbuf(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)
 
48
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
72
49
        self.set_icon(icon)
73
50
 
74
 
        Gtk.AccelMap.add_entry("<viz>/Go/Next Revision", Gdk.KEY_Up, Gdk.ModifierType.MOD1_MASK)
75
 
        Gtk.AccelMap.add_entry("<viz>/Go/Previous Revision", Gdk.KEY_Down, Gdk.ModifierType.MOD1_MASK)
76
 
        Gtk.AccelMap.add_entry("<viz>/View/Refresh", Gdk.KEY_F5, 0)
77
 
 
78
 
        self.accel_group = Gtk.AccelGroup()
 
51
        self.accel_group = gtk.AccelGroup()
79
52
        self.add_accel_group(self.accel_group)
80
53
 
81
 
        self.prev_rev_action = Gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", Gtk.STOCK_GO_DOWN)
82
 
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
83
 
        self.prev_rev_action.set_accel_group(self.accel_group)
84
 
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
85
 
        self.prev_rev_action.connect_accelerator()
86
 
 
87
 
        self.next_rev_action = Gtk.Action("next-rev", "_Next Revision", "Go to the next revision", Gtk.STOCK_GO_UP)
88
 
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
89
 
        self.next_rev_action.set_accel_group(self.accel_group)
90
 
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
91
 
        self.next_rev_action.connect_accelerator()
92
 
 
93
 
        self.refresh_action = Gtk.Action("refresh", "_Refresh", "Refresh view", Gtk.STOCK_REFRESH)
94
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
95
 
        self.refresh_action.set_accel_group(self.accel_group)
96
 
        self.refresh_action.connect("activate", self._refresh_clicked)
97
 
        self.refresh_action.connect_accelerator()
98
 
 
99
 
        self.vbox = self.construct()
100
 
 
101
 
    def _save_size_on_destroy(self, widget, config_name):
102
 
        """Creates a hook that saves the size of widget to config option 
103
 
           config_name when the window is destroyed/closed."""
104
 
        def save_size(src):
105
 
            allocation = widget.get_allocation()
106
 
            width, height = allocation.width, allocation.height
107
 
            value = '%sx%s' % (width, height)
108
 
            self.config.set_user_option(config_name, value)
109
 
        self.connect("destroy", save_size)
110
 
 
111
 
    def set_revision(self, revid):
112
 
        self.treeview.set_revision_id(revid)
 
54
        self.construct()
113
55
 
114
56
    def construct(self):
115
57
        """Construct the window contents."""
116
 
        vbox = Gtk.VBox(spacing=0)
 
58
        vbox = gtk.VBox(spacing=0)
117
59
        self.add(vbox)
118
60
 
119
 
        # order is important here
120
 
        paned = self.construct_paned()
121
 
        nav = self.construct_navigation()
122
 
        menubar = self.construct_menubar()
 
61
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
123
62
 
124
 
        vbox.pack_start(menubar, False, True, 0)
125
 
        vbox.pack_start(nav, False, True, 0)
126
 
        vbox.pack_start(paned, True, True, 0)
 
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)
127
68
        vbox.set_focus_child(paned)
128
69
 
129
 
 
130
70
        vbox.show()
131
71
 
132
 
        return vbox
133
 
 
134
 
    def construct_paned(self):
135
 
        """Construct the main HPaned/VPaned contents."""
136
 
        if self.config.get_user_option('viz-vertical') == 'True':
137
 
            self.paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
138
 
        else:
139
 
            self.paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
140
 
 
141
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
142
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
143
 
        self.paned.show()
144
 
 
145
 
        return self.paned
146
 
 
147
 
    def construct_menubar(self):
148
 
        menubar = Gtk.MenuBar()
149
 
 
150
 
        file_menu = Gtk.Menu()
151
 
        file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
152
 
        file_menuitem.set_submenu(file_menu)
153
 
 
154
 
        file_menu_close = Gtk.ImageMenuItem.new_from_stock(
155
 
            Gtk.STOCK_CLOSE, self.accel_group)
156
 
        file_menu_close.connect('activate', lambda x: self.destroy())
157
 
 
158
 
        file_menu_quit = Gtk.ImageMenuItem.new_from_stock(
159
 
            Gtk.STOCK_QUIT, self.accel_group)
160
 
        file_menu_quit.connect('activate', lambda x: Gtk.main_quit())
161
 
 
162
 
        if self._parent is not None:
163
 
            file_menu.add(file_menu_close)
164
 
        file_menu.add(file_menu_quit)
165
 
 
166
 
        edit_menu = Gtk.Menu()
167
 
        edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
168
 
        edit_menuitem.set_submenu(edit_menu)
169
 
 
170
 
        edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
171
 
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
172
 
 
173
 
        edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
174
 
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
175
 
 
176
 
        edit_menu.add(edit_menu_branchopts)
177
 
        edit_menu.add(edit_menu_globopts)
178
 
 
179
 
        view_menu = Gtk.Menu()
180
 
        view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
181
 
        view_menuitem.set_submenu(view_menu)
182
 
 
183
 
        view_menu_refresh = self.refresh_action.create_menu_item()
184
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
185
 
 
186
 
        view_menu.add(view_menu_refresh)
187
 
        view_menu.add(Gtk.SeparatorMenuItem())
188
 
 
189
 
        view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")
190
 
        view_menu_toolbar.set_active(True)
191
 
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
192
 
            view_menu_toolbar.set_active(False)
193
 
            self.toolbar.hide()
194
 
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
195
 
 
196
 
        view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
197
 
        view_menu_compact.set_active(self.compact_view)
198
 
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
199
 
 
200
 
        view_menu_vertical = Gtk.CheckMenuItem(label="Side-by-side Layout")
201
 
        view_menu_vertical.set_active(False)
202
 
        if self.config.get_user_option('viz-vertical') == 'True':
203
 
            view_menu_vertical.set_active(True)
204
 
        view_menu_vertical.connect('toggled', self._vertical_layout)
205
 
 
206
 
        view_menu_diffs = Gtk.CheckMenuItem(label="Show Diffs")
207
 
        view_menu_diffs.set_active(False)
208
 
        if self.config.get_user_option('viz-show-diffs') == 'True':
209
 
            view_menu_diffs.set_active(True)
210
 
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
211
 
 
212
 
        view_menu_wide_diffs = Gtk.CheckMenuItem(label="Wide Diffs")
213
 
        view_menu_wide_diffs.set_active(False)
214
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
215
 
            view_menu_wide_diffs.set_active(True)
216
 
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
217
 
 
218
 
        view_menu_wrap_diffs = Gtk.CheckMenuItem.new_with_mnemonic(
219
 
            "Wrap _Long Lines in Diffs")
220
 
        view_menu_wrap_diffs.set_active(False)
221
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
222
 
            view_menu_wrap_diffs.set_active(True)
223
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
224
 
 
225
 
        view_menu.add(view_menu_toolbar)
226
 
        view_menu.add(view_menu_compact)
227
 
        view_menu.add(view_menu_vertical)
228
 
        view_menu.add(Gtk.SeparatorMenuItem())
229
 
        view_menu.add(view_menu_diffs)
230
 
        view_menu.add(view_menu_wide_diffs)
231
 
        view_menu.add(view_menu_wrap_diffs)
232
 
        view_menu.add(Gtk.SeparatorMenuItem())
233
 
 
234
 
        self.mnu_show_revno_column = Gtk.CheckMenuItem.new_with_mnemonic(
235
 
            "Show Revision _Number Column")
236
 
        self.mnu_show_date_column = Gtk.CheckMenuItem.new_with_mnemonic(
237
 
            "Show _Date Column")
238
 
 
239
 
        # Revision numbers are pointless if there are multiple branches
240
 
        if len(self.start_revs) > 1:
241
 
            self.mnu_show_revno_column.set_sensitive(False)
242
 
            self.treeview.set_property('revno-column-visible', False)
243
 
 
244
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
245
 
                            (self.mnu_show_date_column, "date")]:
246
 
            col.set_active(self.treeview.get_property(name + "-column-visible"))
247
 
            col.connect('toggled', self._col_visibility_changed, name)
248
 
            view_menu.add(col)
249
 
 
250
 
        go_menu = Gtk.Menu()
251
 
        go_menu.set_accel_group(self.accel_group)
252
 
        go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
253
 
        go_menuitem.set_submenu(go_menu)
254
 
 
255
 
        go_menu_next = self.next_rev_action.create_menu_item()
256
 
        go_menu_prev = self.prev_rev_action.create_menu_item()
257
 
 
258
 
        tag_image = Gtk.Image()
259
 
        tag_image.set_from_file(icon_path("tag-16.png"))
260
 
        self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")
261
 
        self.go_menu_tags.set_image(tag_image)
262
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
263
 
 
264
 
        go_menu.add(go_menu_next)
265
 
        go_menu.add(go_menu_prev)
266
 
        go_menu.add(Gtk.SeparatorMenuItem())
267
 
        go_menu.add(self.go_menu_tags)
268
 
 
269
 
        self.revision_menu = RevisionMenu(self.branch.repository, [],
270
 
            self.branch, parent=self)
271
 
        revision_menuitem = Gtk.MenuItem.new_with_mnemonic("_Revision")
272
 
        revision_menuitem.set_submenu(self.revision_menu)
273
 
 
274
 
        branch_menu = Gtk.Menu()
275
 
        branch_menuitem = Gtk.MenuItem.new_with_mnemonic("_Branch")
276
 
        branch_menuitem.set_submenu(branch_menu)
277
 
 
278
 
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))
279
 
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))
280
 
 
281
 
        try:
282
 
            from bzrlib.plugins import search
283
 
        except ImportError:
284
 
            mutter("Didn't find search plugin")
285
 
        else:
286
 
            branch_menu.add(Gtk.SeparatorMenuItem())
287
 
 
288
 
            branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")
289
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
290
 
            branch_menu.add(branch_index_menuitem)
291
 
 
292
 
            branch_search_menuitem = Gtk.MenuItem.new_with_mnemonic("_Search")
293
 
            branch_search_menuitem.connect('activate', self._branch_search_cb)
294
 
            branch_menu.add(branch_search_menuitem)
295
 
 
296
 
        help_menu = Gtk.Menu()
297
 
        help_menuitem = Gtk.MenuItem.new_with_mnemonic("_Help")
298
 
        help_menuitem.set_submenu(help_menu)
299
 
 
300
 
        help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(
301
 
            Gtk.STOCK_ABOUT, self.accel_group)
302
 
        help_about_menuitem.connect('activate', self._about_dialog_cb)
303
 
 
304
 
        help_menu.add(help_about_menuitem)
305
 
 
306
 
        menubar.add(file_menuitem)
307
 
        menubar.add(edit_menuitem)
308
 
        menubar.add(view_menuitem)
309
 
        menubar.add(go_menuitem)
310
 
        menubar.add(revision_menuitem)
311
 
        menubar.add(branch_menuitem)
312
 
        menubar.add(help_menuitem)
313
 
        menubar.show_all()
314
 
 
315
 
        return menubar
316
 
 
317
72
    def construct_top(self):
318
73
        """Construct the top-half of the window."""
319
 
        # FIXME: Make broken_line_length configurable
320
 
 
321
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
322
 
            self.compact_view)
323
 
 
324
 
        for col in ["revno", "date"]:
325
 
            option = self.config.get_user_option(col + '-column-visible')
326
 
            if option is not None:
327
 
                self.treeview.set_property(col + '-column-visible',
328
 
                    option == 'True')
329
 
            else:
330
 
                self.treeview.set_property(col + '-column-visible', False)
331
 
 
 
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)
332
88
        self.treeview.show()
333
89
 
334
 
        align = Gtk.Alignment.new(0.0, 0.0, 1.0, 1.0)
335
 
        align.set_padding(5, 0, 0, 0)
336
 
        align.add(self.treeview)
337
 
        # user-configured size
338
 
        size = self._load_size('viz-graph-size')
339
 
        if size:
340
 
            width, height = size
341
 
            align.set_size_request(width, height)
342
 
        else:
343
 
            (width, height) = self.get_size()
344
 
            align.set_size_request(width, int(height / 2.5))
345
 
        self._save_size_on_destroy(align, 'viz-graph-size')
346
 
        align.show()
347
 
 
348
 
        return align
 
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
349
145
 
350
146
    def construct_navigation(self):
351
147
        """Construct the navigation buttons."""
352
 
        self.toolbar = Gtk.Toolbar()
353
 
        self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
354
 
 
355
 
        self.prev_button = self.prev_rev_action.create_tool_item()
356
 
        self.toolbar.insert(self.prev_button, -1)
357
 
 
358
 
        self.next_button = self.next_rev_action.create_tool_item()
359
 
        self.toolbar.insert(self.next_button, -1)
360
 
 
361
 
        self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
362
 
 
363
 
        refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
364
 
        refresh_button.connect('clicked', self._refresh_clicked)
365
 
        self.toolbar.insert(refresh_button, -1)
366
 
 
367
 
        self.toolbar.show_all()
368
 
 
369
 
        return self.toolbar
 
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
370
173
 
371
174
    def construct_bottom(self):
372
175
        """Construct the bottom half of the window."""
373
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
374
 
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
375
 
        else:
376
 
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
 
176
        from bzrlib.plugins.gtk.logview import LogView
 
177
        self.logview = LogView(None, True, [], True)
377
178
        (width, height) = self.get_size()
378
 
        self.diff_paned.set_size_request(20, 20) # shrinkable
379
 
 
380
 
        from bzrlib.plugins.gtk.revisionview import RevisionView
381
 
        self.revisionview = RevisionView(branch=self.branch)
382
 
        self.revisionview.set_size_request(width/3, int(height / 2.5))
383
 
        # user-configured size
384
 
        size = self._load_size('viz-revisionview-size')
385
 
        if size:
386
 
            width, height = size
387
 
            self.revisionview.set_size_request(width, height)
388
 
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
389
 
        self.revisionview.show()
390
 
        self.revisionview.set_show_callback(self._show_clicked_cb)
391
 
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
392
 
        self.treeview.connect('tag-added',
393
 
            lambda w, t, r: self.revisionview.update_tags())
394
 
        self.treeview.connect('revision-selected',
395
 
                self._treeselection_changed_cb)
396
 
        self.treeview.connect('revision-activated',
397
 
                self._tree_revision_activated)
398
 
        self.diff_paned.pack1(self.revisionview)
399
 
 
400
 
        from bzrlib.plugins.gtk.diff import DiffWidget
401
 
        self.diff = DiffWidget()
402
 
        self.diff_paned.pack2(self.diff)
403
 
 
404
 
        self.diff_paned.show_all()
405
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
406
 
            self.diff.hide()
407
 
 
408
 
        return self.diff_paned
409
 
 
410
 
    def _tag_selected_cb(self, menuitem, revid):
411
 
        self.treeview.set_revision_id(revid)
412
 
 
 
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
    
413
227
    def _treeselection_changed_cb(self, selection, *args):
414
 
        """callback for when the treeview changes."""
415
 
        revision = self.treeview.get_revision()
416
 
        parents  = self.treeview.get_parents()
417
 
        children = self.treeview.get_children()
418
 
 
419
 
        if revision and revision.revision_id != NULL_REVISION:
420
 
            self.revision_menu.set_revision_ids([revision.revision_id])
421
 
            prev_menu = Gtk.Menu()
422
 
            if len(parents) > 0:
423
 
                self.prev_rev_action.set_sensitive(True)
424
 
                for parent_id in parents:
425
 
                    if parent_id and parent_id != NULL_REVISION:
426
 
                        parent = self.branch.repository.get_revision(parent_id)
427
 
                        try:
428
 
                            str = ' (%s)' % parent.properties['branch-nick']
429
 
                        except KeyError:
430
 
                            str = ""
431
 
 
432
 
                        item = Gtk.MenuItem(
433
 
                            label=parent.message.split("\n")[0] + str)
434
 
                        item.connect('activate', self._set_revision_cb, parent_id)
435
 
                        prev_menu.add(item)
436
 
                prev_menu.show_all()
437
 
            else:
438
 
                self.prev_rev_action.set_sensitive(False)
439
 
                prev_menu.hide()
440
 
 
441
 
            if getattr(self.prev_button, 'set_menu', None) is not None:
442
 
                self.prev_button.set_menu(prev_menu)
443
 
 
444
 
            next_menu = Gtk.Menu()
445
 
            if len(children) > 0:
446
 
                self.next_rev_action.set_sensitive(True)
447
 
                for child_id in children:
448
 
                    child = self.branch.repository.get_revision(child_id)
449
 
                    try:
450
 
                        str = ' (%s)' % child.properties['branch-nick']
451
 
                    except KeyError:
452
 
                        str = ""
453
 
 
454
 
                    item = Gtk.MenuItem(
455
 
                        label=child.message.split("\n")[0] + str)
456
 
                    item.connect('activate', self._set_revision_cb, child_id)
457
 
                    next_menu.add(item)
458
 
                next_menu.show_all()
459
 
            else:
460
 
                self.next_rev_action.set_sensitive(False)
461
 
                next_menu.hide()
462
 
 
463
 
            if getattr(self.next_button, 'set_menu', None) is not None:
464
 
                self.next_button.set_menu(next_menu)
465
 
 
466
 
            self.revisionview.set_revision(revision)
467
 
            self.revisionview.set_children(children)
468
 
            self.update_diff_panel(revision, parents)
469
 
 
470
 
    def _tree_revision_activated(self, widget, path, col):
471
 
        # TODO: more than one parent
472
 
        """Callback for when a treeview row gets activated."""
473
 
        revision = self.treeview.get_revision()
474
 
        parents  = self.treeview.get_parents()
475
 
 
476
 
        if len(parents) == 0:
477
 
            parent_id = NULL_REVISION
478
 
        else:
479
 
            parent_id = parents[0]
480
 
 
481
 
        if revision is not None:
482
 
            self.show_diff(revision.revision_id, parent_id)
483
 
        else:
484
 
            self.show_diff(NULL_REVISION)
485
 
        self.treeview.grab_focus()
 
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)
486
244
 
487
245
    def _back_clicked_cb(self, *args):
488
246
        """Callback for when the back button is clicked."""
489
 
        self.treeview.back()
 
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()
490
261
 
491
262
    def _fwd_clicked_cb(self, *args):
492
263
        """Callback for when the forward button is clicked."""
493
 
        self.treeview.forward()
494
 
 
495
 
    def _go_clicked_cb(self, w, p):
 
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):
496
280
        """Callback for when the go button for a parent is clicked."""
497
 
        if self.revisionview.get_revision() is not None:
498
 
            self.treeview.set_revision(self.revisionview.get_revision())
499
 
 
500
 
    def _show_clicked_cb(self, revid, parentid):
501
 
        """Callback for when the show button for a parent is clicked."""
502
 
        self.show_diff(revid, parentid)
 
281
        self.treeview.set_cursor(self.index[revid])
503
282
        self.treeview.grab_focus()
504
283
 
505
 
    def _set_revision_cb(self, w, revision_id):
506
 
        self.treeview.set_revision_id(revision_id)
507
 
 
508
 
    def _brokenlines_toggled_cb(self, button):
509
 
        self.compact_view = button.get_active()
510
 
 
511
 
        if self.compact_view:
512
 
            option = 'yes'
513
 
        else:
514
 
            option = 'no'
515
 
 
516
 
        self.config.set_user_option('viz-compact-view', option)
517
 
        self.treeview.set_property('compact', self.compact_view)
518
 
        self.treeview.refresh()
519
 
 
520
 
    def _branch_index_cb(self, w):
521
 
        from bzrlib.plugins.search import index as _mod_index
522
 
        _mod_index.index_url(self.branch.base)
523
 
 
524
 
    def _branch_search_cb(self, w):
525
 
        from bzrlib.plugins.search import (
526
 
            index as _mod_index,
527
 
            errors as search_errors,
528
 
            )
529
 
        from bzrlib.plugins.gtk.search import SearchDialog
530
 
 
531
 
        try:
532
 
            index = _mod_index.open_index_url(self.branch.base)
533
 
        except search_errors.NoSearchIndex:
534
 
            dialog = Gtk.MessageDialog(self, type=Gtk.MessageType.QUESTION, 
535
 
                buttons=Gtk.ButtonsType.OK_CANCEL, 
536
 
                message_format="This branch has not been indexed yet. "
537
 
                               "Index now?")
538
 
            if dialog.run() == Gtk.ResponseType.OK:
539
 
                dialog.destroy()
540
 
                index = _mod_index.index_url(self.branch.base)
541
 
            else:
542
 
                dialog.destroy()
543
 
                return
544
 
 
545
 
        dialog = SearchDialog(index)
546
 
 
547
 
        if dialog.run() == Gtk.ResponseType.OK:
548
 
            revid = dialog.get_revision()
549
 
            if revid is not None:
550
 
                self.set_revision(revid)
551
 
 
552
 
        dialog.destroy()
553
 
 
554
 
    def _about_dialog_cb(self, w):
555
 
        from bzrlib.plugins.gtk.about import AboutDialog
556
 
        AboutDialog().run()
557
 
 
558
 
    def _col_visibility_changed(self, col, property):
559
 
        self.config.set_user_option(property + '-column-visible', col.get_active())
560
 
        self.treeview.set_property(property + '-column-visible', col.get_active())
561
 
 
562
 
    def _toolbar_visibility_changed(self, col):
563
 
        if col.get_active():
564
 
            self.toolbar.show()
565
 
        else:
566
 
            self.toolbar.hide()
567
 
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
568
 
 
569
 
    def _vertical_layout(self, col):
570
 
        """Toggle the layout vertical/horizontal"""
571
 
        self.config.set_user_option('viz-vertical', str(col.get_active()))
572
 
 
573
 
        old = self.paned
574
 
        self.vbox.remove(old)
575
 
        self.vbox.pack_start(
576
 
            self.construct_paned(), True, True, 0)
577
 
        self._make_diff_paned_nonzero_size()
578
 
        self._make_diff_nonzero_size()
579
 
 
580
 
        self.treeview.emit('revision-selected')
581
 
 
582
 
    def _make_diff_paned_nonzero_size(self):
583
 
        """make sure the diff/revision pane isn't zero-width or zero-height"""
584
 
        alloc = self.diff_paned.get_allocation()
585
 
        if (alloc.width < 10) or (alloc.height < 10):
586
 
            width, height = self.get_size()
587
 
            self.diff_paned.set_size_request(width/3, int(height / 2.5))
588
 
 
589
 
    def _make_diff_nonzero_size(self):
590
 
        """make sure the diff isn't zero-width or zero-height"""
591
 
        alloc = self.diff.get_allocation()
592
 
        if (alloc.width < 10) or (alloc.height < 10):
593
 
            width, height = self.get_size()
594
 
            self.revisionview.set_size_request(width/3, int(height / 2.5))
595
 
 
596
 
    def _diff_visibility_changed(self, col):
597
 
        """Hide or show the diff panel."""
598
 
        if col.get_active():
599
 
            self.diff.show()
600
 
            self._make_diff_nonzero_size()
601
 
        else:
602
 
            self.diff.hide()
603
 
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
604
 
        self.update_diff_panel()
605
 
 
606
 
    def _diff_placement_changed(self, col):
607
 
        """Toggle the diff panel's position."""
608
 
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
609
 
 
610
 
        old = self.paned.get_child2()
611
 
        self.paned.remove(old)
612
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
613
 
        self._make_diff_nonzero_size()
614
 
 
615
 
        self.treeview.emit('revision-selected')
616
 
 
617
 
    def _diff_wrap_changed(self, widget):
618
 
        """Toggle word wrap in the diff widget."""
619
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
620
 
        self.diff._on_wraplines_toggled(widget)
621
 
 
622
 
    def _refresh_clicked(self, w):
623
 
        self.treeview.refresh()
624
 
 
625
 
    def _update_tags(self):
626
 
        menu = Gtk.Menu()
627
 
 
628
 
        if self.branch.supports_tags():
629
 
            tags = self.branch.tags.get_tag_dict().items()
630
 
            tags.sort(reverse=True)
631
 
            for tag, revid in tags:
632
 
                tag_image = Gtk.Image()
633
 
                tag_image.set_from_file(icon_path('tag-16.png'))
634
 
                tag_item = Gtk.ImageMenuItem.new_with_mnemonic(
635
 
                    tag.replace('_', '__'))
636
 
                tag_item.set_image(tag_image)
637
 
                tag_item.connect('activate', self._tag_selected_cb, revid)
638
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
639
 
                menu.add(tag_item)
640
 
            self.go_menu_tags.set_submenu(menu)
641
 
 
642
 
            self.go_menu_tags.set_sensitive(len(tags) != 0)
643
 
        else:
644
 
            self.go_menu_tags.set_sensitive(False)
645
 
 
646
 
        self.go_menu_tags.show_all()
647
 
 
648
 
    def _load_size(self, name):
649
 
        """Read and parse 'name' from self.config.
650
 
        The value is a string, formatted as WIDTHxHEIGHT
651
 
        Returns None, or (width, height)
652
 
        """
653
 
        size = self.config.get_user_option(name)
654
 
        if size:
655
 
            width, height = [int(num) for num in size.split('x')]
656
 
            # avoid writing config every time we start
657
 
            return width, height
658
 
        return None
659
 
 
660
 
    def show_diff(self, revid, parentid=NULL_REVISION):
 
284
    def show_diff(self, branch, revid, parentid):
661
285
        """Open a new window to show a diff between the given revisions."""
662
286
        from bzrlib.plugins.gtk.diff import DiffWindow
663
 
        window = DiffWindow(parent=self)
664
 
 
665
 
        rev_tree    = self.branch.repository.revision_tree(revid)
666
 
        parent_tree = self.branch.repository.revision_tree(parentid)
667
 
 
668
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
287
        window = DiffWindow()
 
288
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
289
                                                                   revid])
 
290
        description = revid + " - " + branch.nick
669
291
        window.set_diff(description, rev_tree, parent_tree)
670
292
        window.show()
671
293
 
672
 
    def update_diff_panel(self, revision=None, parents=None):
673
 
        """Show the current revision in the diff panel."""
674
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
675
 
            return
676
 
 
677
 
        if not revision: # default to selected row
678
 
            revision = self.treeview.get_revision()
679
 
        if revision == NULL_REVISION:
680
 
            return
681
 
 
682
 
        if not parents: # default to selected row's parents
683
 
            parents  = self.treeview.get_parents()
 
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]
684
319
        if len(parents) == 0:
685
 
            parent_id = NULL_REVISION
686
 
        else:
687
 
            parent_id = parents[0]
688
 
 
689
 
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
690
 
        parent_tree = self.branch.repository.revision_tree(parent_id)
691
 
 
692
 
        self.diff.set_diff(rev_tree, parent_tree)
693
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
694
 
            self.diff._on_wraplines_toggled(wrap=True)
695
 
        self.diff.show_all()
 
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()