/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-29 14:12:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110829141230-6nv7h0oxjrojb1y1
Updated hacking doc.

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