/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/branchwin.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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