/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-07-17 11:51:03 UTC
  • Revision ID: jelmer@samba.org-20080717115103-djh5sb0pvpse2zkb
Add note about glade.

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