/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-09-04 03:53:20 UTC
  • mfrom: (738 trunk)
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110904035320-5abg7as2ki1r8w88
Merged trunk

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