/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to viz/branchwin.py

  • Committer: Curtis Hovey
  • Date: 2011-08-12 20:25:28 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812202528-4xf4a2t23urx50d2
Updated gst to gtk3.

Show diffs side-by-side

added added

removed removed

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