/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-18 20:19:45 UTC
  • mto: This revision was merged to the branch mainline in revision 555.
  • Revision ID: jelmer@samba.org-20080718201945-85lowjdgx1d9ds82
Use absolute imports.

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