/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-07-31 16:50:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731165029-9gixuqypi3lwapzm
Removed import_pygtk because gi does not impicitly call Main(). Inlined checks for gtk availablility.

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