/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to viz/branchwin.py

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

Show diffs side-by-side

added added

removed removed

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