/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: 2008-07-17 11:51:03 UTC
  • Revision ID: jelmer@samba.org-20080717115103-djh5sb0pvpse2zkb
Add note about glade.

Show diffs side-by-side

added added

removed removed

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