/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: Curtis Hovey
  • Date: 2011-08-27 18:35:08 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827183508-ugqbp58na4mtt1no
Updated the pixbuf calls to gtk3.

Show diffs side-by-side

added added

removed removed

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