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