/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to viz/branchwin.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-30 20:32:25 UTC
  • mto: This revision was merged to the branch mainline in revision 529.
  • Revision ID: jelmer@samba.org-20080630203225-fioyq9lh7eji28pk
Fix Window-based progress indication.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
 
1
# -*- coding: UTF-8 -*-
1
2
"""Branch window.
2
3
 
3
4
This module contains the code to manage the branch information window,
4
5
which contains both the revision graph and details panes.
5
6
"""
6
7
 
7
 
__copyright__ = "Copyright (c) 2005 Canonical Ltd."
 
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
9
10
 
10
11
 
11
 
from gi.repository import Gdk
12
 
from gi.repository import Gtk
 
12
import gtk
 
13
import gobject
 
14
import pango
13
15
 
 
16
from bzrlib.plugins.gtk.window import Window
14
17
from bzrlib.plugins.gtk import icon_path
15
 
from bzrlib.plugins.gtk.branchview import TreeView
 
18
from bzrlib.plugins.gtk.tags import AddTagDialog
16
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
17
 
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
18
 
from bzrlib.plugins.gtk.window import Window
 
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
19
21
 
20
 
from bzrlib.config import GlobalConfig
21
 
from bzrlib.revision import NULL_REVISION
 
22
from bzrlib.config import BranchConfig, GlobalConfig
 
23
from bzrlib.revision import Revision, NULL_REVISION
22
24
from bzrlib.trace import mutter
23
25
 
24
 
 
25
26
class BranchWindow(Window):
26
27
    """Branch window.
27
28
 
38
39
                       None for no limit.
39
40
        """
40
41
 
41
 
        super(BranchWindow, self).__init__(parent=parent)
 
42
        Window.__init__(self, parent=parent)
42
43
        self.set_border_width(0)
43
44
 
44
45
        self.branch      = branch
51
52
        else:
52
53
            self.compact_view = False
53
54
 
54
 
        self.set_title(branch._get_nick(local=True) + " - revision history")
 
55
        self.set_title(branch.nick + " - revision history")
55
56
 
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)
 
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)
66
62
        self.set_default_size(width, height)
67
 
        self.set_size_request(width/3, height/3)
68
 
        self._save_size_on_destroy(self, 'viz-window-size')
69
63
 
70
64
        # FIXME AndyFitz!
71
 
        icon = self.render_icon_pixbuf(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)
 
65
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
72
66
        self.set_icon(icon)
73
67
 
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)
 
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)
77
71
 
78
 
        self.accel_group = Gtk.AccelGroup()
 
72
        self.accel_group = gtk.AccelGroup()
79
73
        self.add_accel_group(self.accel_group)
80
74
 
81
 
        self.prev_rev_action = Gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", Gtk.STOCK_GO_DOWN)
 
75
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
 
76
 
 
77
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
82
78
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
83
79
        self.prev_rev_action.set_accel_group(self.accel_group)
84
80
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
85
81
        self.prev_rev_action.connect_accelerator()
86
82
 
87
 
        self.next_rev_action = Gtk.Action("next-rev", "_Next Revision", "Go to the next revision", Gtk.STOCK_GO_UP)
 
83
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
88
84
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
89
85
        self.next_rev_action.set_accel_group(self.accel_group)
90
86
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
91
87
        self.next_rev_action.connect_accelerator()
92
88
 
93
 
        self.refresh_action = Gtk.Action("refresh", "_Refresh", "Refresh view", Gtk.STOCK_REFRESH)
 
89
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
94
90
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
95
91
        self.refresh_action.set_accel_group(self.accel_group)
96
92
        self.refresh_action.connect("activate", self._refresh_clicked)
97
93
        self.refresh_action.connect_accelerator()
98
94
 
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)
 
95
        self.construct()
110
96
 
111
97
    def set_revision(self, revid):
112
98
        self.treeview.set_revision_id(revid)
113
99
 
114
100
    def construct(self):
115
101
        """Construct the window contents."""
116
 
        vbox = Gtk.VBox(spacing=0)
 
102
        vbox = gtk.VBox(spacing=0)
117
103
        self.add(vbox)
118
104
 
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
 
 
 
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)
 
108
        self.paned.show()
 
109
 
 
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)
129
115
 
130
116
        vbox.show()
131
117
 
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)
143
 
        self.paned.show()
144
 
 
145
 
        return self.paned
146
 
 
147
118
    def construct_menubar(self):
148
 
        menubar = Gtk.MenuBar()
 
119
        menubar = gtk.MenuBar()
149
120
 
150
 
        file_menu = Gtk.Menu()
151
 
        file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
 
121
        file_menu = gtk.Menu()
 
122
        file_menuitem = gtk.MenuItem("_File")
152
123
        file_menuitem.set_submenu(file_menu)
153
124
 
154
 
        file_menu_close = Gtk.ImageMenuItem.new_from_stock(
155
 
            Gtk.STOCK_CLOSE, self.accel_group)
 
125
        file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
156
126
        file_menu_close.connect('activate', lambda x: self.destroy())
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
 
 
 
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
        
162
131
        if self._parent is not None:
163
132
            file_menu.add(file_menu_close)
164
133
        file_menu.add(file_menu_quit)
165
134
 
166
 
        edit_menu = Gtk.Menu()
167
 
        edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
 
135
        edit_menu = gtk.Menu()
 
136
        edit_menuitem = gtk.MenuItem("_Edit")
168
137
        edit_menuitem.set_submenu(edit_menu)
169
138
 
170
 
        edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
 
139
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
140
 
 
141
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
171
142
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
172
143
 
173
 
        edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
 
144
        edit_menu_globopts = gtk.MenuItem("Global Settings")
174
145
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
175
146
 
 
147
        edit_menu.add(edit_menu_find)
176
148
        edit_menu.add(edit_menu_branchopts)
177
149
        edit_menu.add(edit_menu_globopts)
178
150
 
179
 
        view_menu = Gtk.Menu()
180
 
        view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
 
151
        view_menu = gtk.Menu()
 
152
        view_menuitem = gtk.MenuItem("_View")
181
153
        view_menuitem.set_submenu(view_menu)
182
154
 
183
155
        view_menu_refresh = self.refresh_action.create_menu_item()
184
156
        view_menu_refresh.connect('activate', self._refresh_clicked)
185
157
 
186
158
        view_menu.add(view_menu_refresh)
187
 
        view_menu.add(Gtk.SeparatorMenuItem())
 
159
        view_menu.add(gtk.SeparatorMenuItem())
188
160
 
189
 
        view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")
 
161
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
190
162
        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()
194
163
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
195
164
 
196
 
        view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
 
165
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
197
166
        view_menu_compact.set_active(self.compact_view)
198
167
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
199
168
 
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
 
 
225
169
        view_menu.add(view_menu_toolbar)
226
170
        view_menu.add(view_menu_compact)
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())
 
171
        view_menu.add(gtk.SeparatorMenuItem())
233
172
 
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")
 
173
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
 
174
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
238
175
 
239
176
        # Revision numbers are pointless if there are multiple branches
240
177
        if len(self.start_revs) > 1:
247
184
            col.connect('toggled', self._col_visibility_changed, name)
248
185
            view_menu.add(col)
249
186
 
250
 
        go_menu = Gtk.Menu()
 
187
        go_menu = gtk.Menu()
251
188
        go_menu.set_accel_group(self.accel_group)
252
 
        go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
 
189
        go_menuitem = gtk.MenuItem("_Go")
253
190
        go_menuitem.set_submenu(go_menu)
254
 
 
 
191
        
255
192
        go_menu_next = self.next_rev_action.create_menu_item()
256
193
        go_menu_prev = self.prev_rev_action.create_menu_item()
257
194
 
258
 
        tag_image = Gtk.Image()
 
195
        tag_image = gtk.Image()
259
196
        tag_image.set_from_file(icon_path("tag-16.png"))
260
 
        self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")
 
197
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
261
198
        self.go_menu_tags.set_image(tag_image)
262
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
 
199
        self._update_tags()
263
200
 
264
201
        go_menu.add(go_menu_next)
265
202
        go_menu.add(go_menu_prev)
266
 
        go_menu.add(Gtk.SeparatorMenuItem())
 
203
        go_menu.add(gtk.SeparatorMenuItem())
267
204
        go_menu.add(self.go_menu_tags)
268
205
 
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")
 
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")
276
227
        branch_menuitem.set_submenu(branch_menu)
277
228
 
278
 
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))
279
 
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))
 
229
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
 
230
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
280
231
 
281
232
        try:
282
233
            from bzrlib.plugins import search
283
234
        except ImportError:
284
235
            mutter("Didn't find search plugin")
285
236
        else:
286
 
            branch_menu.add(Gtk.SeparatorMenuItem())
287
 
 
288
 
            branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")
 
237
            branch_index_menuitem = gtk.MenuItem("_Index")
289
238
            branch_index_menuitem.connect('activate', self._branch_index_cb)
290
239
            branch_menu.add(branch_index_menuitem)
291
240
 
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")
 
241
        help_menu = gtk.Menu()
 
242
        help_menuitem = gtk.MenuItem("_Help")
298
243
        help_menuitem.set_submenu(help_menu)
299
244
 
300
 
        help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(
301
 
            Gtk.STOCK_ABOUT, self.accel_group)
 
245
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
302
246
        help_about_menuitem.connect('activate', self._about_dialog_cb)
303
247
 
304
248
        help_menu.add(help_about_menuitem)
318
262
        """Construct the top-half of the window."""
319
263
        # FIXME: Make broken_line_length configurable
320
264
 
321
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum,
322
 
            self.compact_view)
 
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())
323
273
 
324
274
        for col in ["revno", "date"]:
325
275
            option = self.config.get_user_option(col + '-column-visible')
326
276
            if option is not None:
327
 
                self.treeview.set_property(col + '-column-visible',
328
 
                    option == 'True')
 
277
                self.treeview.set_property(col + '-column-visible', option == 'True')
329
278
            else:
330
279
                self.treeview.set_property(col + '-column-visible', False)
331
280
 
332
281
        self.treeview.show()
333
282
 
334
 
        align = Gtk.Alignment.new(0.0, 0.0, 1.0, 1.0)
 
283
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
335
284
        align.set_padding(5, 0, 0, 0)
336
285
        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')
346
286
        align.show()
347
287
 
348
288
        return align
349
289
 
350
290
    def construct_navigation(self):
351
291
        """Construct the navigation buttons."""
352
 
        self.toolbar = Gtk.Toolbar()
353
 
        self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
 
292
        self.toolbar = gtk.Toolbar()
 
293
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
354
294
 
355
295
        self.prev_button = self.prev_rev_action.create_tool_item()
356
296
        self.toolbar.insert(self.prev_button, -1)
358
298
        self.next_button = self.next_rev_action.create_tool_item()
359
299
        self.toolbar.insert(self.next_button, -1)
360
300
 
361
 
        self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
 
301
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
362
302
 
363
 
        refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
 
303
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
364
304
        refresh_button.connect('clicked', self._refresh_clicked)
365
305
        self.toolbar.insert(refresh_button, -1)
366
306
 
370
310
 
371
311
    def construct_bottom(self):
372
312
        """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
 
 
380
313
        from bzrlib.plugins.gtk.revisionview import RevisionView
381
314
        self.revisionview = RevisionView(branch=self.branch)
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')
 
315
        (width, height) = self.get_size()
 
316
        self.revisionview.set_size_request(width, int(height / 2.5))
389
317
        self.revisionview.show()
390
318
        self.revisionview.set_show_callback(self._show_clicked_cb)
391
319
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
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
 
320
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
 
321
        return self.revisionview
409
322
 
410
323
    def _tag_selected_cb(self, menuitem, revid):
411
324
        self.treeview.set_revision_id(revid)
416
329
        parents  = self.treeview.get_parents()
417
330
        children = self.treeview.get_children()
418
331
 
419
 
        if revision and revision.revision_id != NULL_REVISION:
420
 
            self.revision_menu.set_revision_ids([revision.revision_id])
421
 
            prev_menu = Gtk.Menu()
 
332
        if revision and revision != NULL_REVISION:
 
333
            prev_menu = gtk.Menu()
422
334
            if len(parents) > 0:
423
335
                self.prev_rev_action.set_sensitive(True)
424
336
                for parent_id in parents:
425
337
                    if parent_id and parent_id != NULL_REVISION:
426
338
                        parent = self.branch.repository.get_revision(parent_id)
427
339
                        try:
428
 
                            str = ' (%s)' % parent.properties['branch-nick']
 
340
                            str = ' (' + parent.properties['branch-nick'] + ')'
429
341
                        except KeyError:
430
342
                            str = ""
431
343
 
432
 
                        item = Gtk.MenuItem(
433
 
                            label=parent.message.split("\n")[0] + str)
 
344
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
434
345
                        item.connect('activate', self._set_revision_cb, parent_id)
435
346
                        prev_menu.add(item)
436
347
                prev_menu.show_all()
438
349
                self.prev_rev_action.set_sensitive(False)
439
350
                prev_menu.hide()
440
351
 
441
 
            if getattr(self.prev_button, 'set_menu', None) is not None:
442
 
                self.prev_button.set_menu(prev_menu)
 
352
            self.prev_button.set_menu(prev_menu)
443
353
 
444
 
            next_menu = Gtk.Menu()
 
354
            next_menu = gtk.Menu()
445
355
            if len(children) > 0:
446
356
                self.next_rev_action.set_sensitive(True)
447
357
                for child_id in children:
448
358
                    child = self.branch.repository.get_revision(child_id)
449
359
                    try:
450
 
                        str = ' (%s)' % child.properties['branch-nick']
 
360
                        str = ' (' + child.properties['branch-nick'] + ')'
451
361
                    except KeyError:
452
362
                        str = ""
453
363
 
454
 
                    item = Gtk.MenuItem(
455
 
                        label=child.message.split("\n")[0] + str)
 
364
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
456
365
                    item.connect('activate', self._set_revision_cb, child_id)
457
366
                    next_menu.add(item)
458
367
                next_menu.show_all()
460
369
                self.next_rev_action.set_sensitive(False)
461
370
                next_menu.hide()
462
371
 
463
 
            if getattr(self.next_button, 'set_menu', None) is not None:
464
 
                self.next_button.set_menu(next_menu)
 
372
            self.next_button.set_menu(next_menu)
465
373
 
466
374
            self.revisionview.set_revision(revision)
467
375
            self.revisionview.set_children(children)
468
 
            self.update_diff_panel(revision, parents)
469
 
 
 
376
    
470
377
    def _tree_revision_activated(self, widget, path, col):
471
378
        # TODO: more than one parent
472
379
        """Callback for when a treeview row gets activated."""
474
381
        parents  = self.treeview.get_parents()
475
382
 
476
383
        if len(parents) == 0:
477
 
            parent_id = NULL_REVISION
 
384
            parent_id = None
478
385
        else:
479
386
            parent_id = parents[0]
480
387
 
481
 
        if revision is not None:
482
 
            self.show_diff(revision.revision_id, parent_id)
483
 
        else:
484
 
            self.show_diff(NULL_REVISION)
 
388
        self.show_diff(revision.revision_id, parent_id)
485
389
        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)    
486
403
 
487
404
    def _back_clicked_cb(self, *args):
488
405
        """Callback for when the back button is clicked."""
489
406
        self.treeview.back()
490
 
 
 
407
        
491
408
    def _fwd_clicked_cb(self, *args):
492
409
        """Callback for when the forward button is clicked."""
493
410
        self.treeview.forward()
502
419
        self.show_diff(revid, parentid)
503
420
        self.treeview.grab_focus()
504
421
 
 
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
            
505
438
    def _set_revision_cb(self, w, revision_id):
506
439
        self.treeview.set_revision_id(revision_id)
507
440
 
517
450
        self.treeview.set_property('compact', self.compact_view)
518
451
        self.treeview.refresh()
519
452
 
 
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
 
520
469
    def _branch_index_cb(self, w):
521
470
        from bzrlib.plugins.search import index as _mod_index
522
471
        _mod_index.index_url(self.branch.base)
523
472
 
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
 
 
531
 
        try:
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()
553
 
 
554
473
    def _about_dialog_cb(self, w):
555
474
        from bzrlib.plugins.gtk.about import AboutDialog
 
475
 
556
476
        AboutDialog().run()
557
477
 
558
478
    def _col_visibility_changed(self, col, property):
561
481
 
562
482
    def _toolbar_visibility_changed(self, col):
563
483
        if col.get_active():
564
 
            self.toolbar.show()
 
484
            self.toolbar.show() 
565
485
        else:
566
486
            self.toolbar.hide()
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)
 
487
 
 
488
    def _show_about_cb(self, w):
 
489
        dialog = AboutDialog()
 
490
        dialog.connect('response', lambda d,r: d.destroy())
 
491
        dialog.run()
621
492
 
622
493
    def _refresh_clicked(self, w):
623
494
        self.treeview.refresh()
624
495
 
625
496
    def _update_tags(self):
626
 
        menu = Gtk.Menu()
 
497
        menu = gtk.Menu()
627
498
 
628
499
        if self.branch.supports_tags():
629
500
            tags = self.branch.tags.get_tag_dict().items()
630
 
            tags.sort(reverse=True)
 
501
            tags.sort()
 
502
            tags.reverse()
631
503
            for tag, revid in tags:
632
 
                tag_image = Gtk.Image()
 
504
                tag_image = gtk.Image()
633
505
                tag_image.set_from_file(icon_path('tag-16.png'))
634
 
                tag_item = Gtk.ImageMenuItem.new_with_mnemonic(
635
 
                    tag.replace('_', '__'))
 
506
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
636
507
                tag_item.set_image(tag_image)
637
508
                tag_item.connect('activate', self._tag_selected_cb, revid)
638
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
639
509
                menu.add(tag_item)
640
510
            self.go_menu_tags.set_submenu(menu)
641
511
 
645
515
 
646
516
        self.go_menu_tags.show_all()
647
517
 
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):
 
518
    def show_diff(self, revid=None, parentid=None):
661
519
        """Open a new window to show a diff between the given revisions."""
662
520
        from bzrlib.plugins.gtk.diff import DiffWindow
663
521
        window = DiffWindow(parent=self)
664
522
 
 
523
        if parentid is None:
 
524
            parentid = NULL_REVISION
 
525
 
665
526
        rev_tree    = self.branch.repository.revision_tree(revid)
666
527
        parent_tree = self.branch.repository.revision_tree(parentid)
667
528
 
668
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
529
        description = revid + " - " + self.branch.nick
669
530
        window.set_diff(description, rev_tree, parent_tree)
670
531
        window.show()
671
532
 
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()
 
533