/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: Daniel Schierbeck
  • Date: 2007-11-07 14:19:09 UTC
  • mfrom: (330.3.5 trunk)
  • Revision ID: daniel.schierbeck@gmail.com-20071107141909-3zxf7nw5laldvfxi
Merged with mainline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
 
16
 
from bzrlib.plugins.gtk import icon_path
17
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
16
from bzrlib.plugins.gtk.window import Window
18
17
from bzrlib.plugins.gtk.tags import AddTagDialog
19
18
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
 
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
21
 
from bzrlib.plugins.gtk.window import Window
22
 
 
23
 
from bzrlib.config import BranchConfig, GlobalConfig
24
 
from bzrlib.revision import Revision, NULL_REVISION
25
 
from bzrlib.trace import mutter
 
19
from bzrlib.revision import Revision
 
20
from bzrlib.config import BranchConfig
 
21
from bzrlib.config import GlobalConfig
 
22
from treeview import TreeView
26
23
 
27
24
class BranchWindow(Window):
28
25
    """Branch window.
31
28
    for a particular branch.
32
29
    """
33
30
 
34
 
    def __init__(self, branch, start_revs, maxnum, parent=None):
 
31
    def __init__(self, branch, start, maxnum, parent=None):
35
32
        """Create a new BranchWindow.
36
33
 
37
34
        :param branch: Branch object for branch to show.
38
 
        :param start_revs: Revision ids of top revisions.
 
35
        :param start: Revision id of top revision.
39
36
        :param maxnum: Maximum number of revisions to display, 
40
37
                       None for no limit.
41
38
        """
44
41
        self.set_border_width(0)
45
42
 
46
43
        self.branch      = branch
47
 
        self.start_revs  = start_revs
 
44
        self.start       = start
48
45
        self.maxnum      = maxnum
49
46
        self.config      = GlobalConfig()
50
47
 
51
 
        self._sizes      = {} # window and widget sizes
52
 
 
53
48
        if self.config.get_user_option('viz-compact-view') == 'yes':
54
49
            self.compact_view = True
55
50
        else:
57
52
 
58
53
        self.set_title(branch.nick + " - revision history")
59
54
 
60
 
        # user-configured window size
61
 
        size = self._load_size('viz-window-size')
62
 
        if size:
63
 
            width, height = size
64
 
        else:
65
 
            # Use three-quarters of the screen by default
66
 
            screen = self.get_screen()
67
 
            monitor = screen.get_monitor_geometry(0)
68
 
            width = int(monitor.width * 0.75)
69
 
            height = int(monitor.height * 0.75)
 
55
        # Use three-quarters of the screen by default
 
56
        screen = self.get_screen()
 
57
        monitor = screen.get_monitor_geometry(0)
 
58
        width = int(monitor.width * 0.75)
 
59
        height = int(monitor.height * 0.75)
70
60
        self.set_default_size(width, height)
71
 
        self.set_size_request(width/3, height/3)
72
 
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
73
61
 
74
62
        # FIXME AndyFitz!
75
63
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
76
64
        self.set_icon(icon)
77
65
 
78
 
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
79
 
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
80
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
81
 
 
82
66
        self.accel_group = gtk.AccelGroup()
83
67
        self.add_accel_group(self.accel_group)
84
68
 
85
 
        gtk.Action.set_tool_item_type(gtk.MenuToolButton)
86
 
 
87
 
        self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
88
 
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
89
 
        self.prev_rev_action.set_accel_group(self.accel_group)
90
 
        self.prev_rev_action.connect("activate", self._back_clicked_cb)
91
 
        self.prev_rev_action.connect_accelerator()
92
 
 
93
 
        self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
94
 
        self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
95
 
        self.next_rev_action.set_accel_group(self.accel_group)
96
 
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
97
 
        self.next_rev_action.connect_accelerator()
98
 
 
99
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
100
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
101
 
        self.refresh_action.set_accel_group(self.accel_group)
102
 
        self.refresh_action.connect("activate", self._refresh_clicked)
103
 
        self.refresh_action.connect_accelerator()
104
 
 
105
69
        self.construct()
106
70
 
107
 
    def set_revision(self, revid):
108
 
        self.treeview.set_revision_id(revid)
 
71
    def set_revision(self, revision):
 
72
        self.treeview.set_revision(revision)
109
73
 
110
74
    def construct(self):
111
75
        """Construct the window contents."""
112
76
        vbox = gtk.VBox(spacing=0)
113
77
        self.add(vbox)
114
78
 
115
 
        self.paned = gtk.VPaned()
116
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
117
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
118
 
        self.paned.show()
119
 
 
120
 
        nav = self.construct_navigation()
121
 
        menubar = self.construct_menubar()
122
 
        vbox.pack_start(menubar, expand=False, fill=True)
123
 
        vbox.pack_start(nav, expand=False, fill=True)
124
 
 
125
 
        vbox.pack_start(self.paned, expand=True, fill=True)
126
 
        vbox.set_focus_child(self.paned)
 
79
        top = self.construct_top()
 
80
 
 
81
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
 
82
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
83
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
 
84
        
 
85
        paned = gtk.VPaned()
 
86
        paned.pack1(top, resize=True, shrink=False)
 
87
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
88
        paned.show()
 
89
        vbox.pack_start(paned, expand=True, fill=True)
 
90
        vbox.set_focus_child(paned)
127
91
 
128
92
        vbox.show()
129
 
    
 
93
 
130
94
    def construct_menubar(self):
131
95
        menubar = gtk.MenuBar()
132
96
 
140
104
        file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
141
105
        file_menu_quit.connect('activate', lambda x: gtk.main_quit())
142
106
        
143
 
        if self._parent is not None:
144
 
            file_menu.add(file_menu_close)
 
107
        file_menu.add(file_menu_close)
145
108
        file_menu.add(file_menu_quit)
146
109
 
147
110
        edit_menu = gtk.Menu()
148
111
        edit_menuitem = gtk.MenuItem("_Edit")
149
112
        edit_menuitem.set_submenu(edit_menu)
150
113
 
 
114
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
115
 
151
116
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
152
117
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
153
118
 
154
 
        edit_menu_globopts = gtk.MenuItem("Global Settings")
155
 
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
 
119
        edit_menu_prefs = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
 
120
        edit_menu_prefs.connect('activate', lambda x: PreferencesWindow().show())
156
121
 
 
122
        edit_menu.add(edit_menu_find)
157
123
        edit_menu.add(edit_menu_branchopts)
158
 
        edit_menu.add(edit_menu_globopts)
 
124
        edit_menu.add(edit_menu_prefs)
159
125
 
160
126
        view_menu = gtk.Menu()
161
127
        view_menuitem = gtk.MenuItem("_View")
162
128
        view_menuitem.set_submenu(view_menu)
163
129
 
164
 
        view_menu_refresh = self.refresh_action.create_menu_item()
165
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
166
 
 
167
 
        view_menu.add(view_menu_refresh)
168
 
        view_menu.add(gtk.SeparatorMenuItem())
169
 
 
170
130
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
171
131
        view_menu_toolbar.set_active(True)
172
 
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
173
 
            view_menu_toolbar.set_active(False)
174
 
            self.toolbar.hide()
175
132
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
176
133
 
177
 
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
178
 
        view_menu_compact.set_active(self.compact_view)
179
 
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
180
 
        
181
 
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
182
 
        view_menu_diffs.set_active(False)
183
 
        if self.config.get_user_option('viz-show-diffs') == 'True':
184
 
            view_menu_diffs.set_active(True)
185
 
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
186
 
        
187
 
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
188
 
        view_menu_wide_diffs.set_active(False)
189
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
190
 
            view_menu_wide_diffs.set_active(True)
191
 
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
192
 
        
193
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
194
 
        view_menu_wrap_diffs.set_active(False)
195
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
196
 
            view_menu_wrap_diffs.set_active(True)
197
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
198
 
                
199
134
        view_menu.add(view_menu_toolbar)
200
 
        view_menu.add(view_menu_compact)
201
 
        view_menu.add(gtk.SeparatorMenuItem())
202
 
        view_menu.add(view_menu_diffs)
203
 
        view_menu.add(view_menu_wide_diffs)
204
 
        view_menu.add(view_menu_wrap_diffs)
205
 
        view_menu.add(gtk.SeparatorMenuItem())
206
 
 
207
 
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
208
 
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
209
 
 
210
 
        # Revision numbers are pointless if there are multiple branches
211
 
        if len(self.start_revs) > 1:
212
 
            self.mnu_show_revno_column.set_sensitive(False)
213
 
            self.treeview.set_property('revno-column-visible', False)
214
 
 
215
 
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
216
 
                            (self.mnu_show_date_column, "date")]:
 
135
        view_menu.add(gtk.SeparatorMenuItem())
 
136
 
 
137
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
 
138
            col = gtk.CheckMenuItem("Show " + label + " Column")
217
139
            col.set_active(self.treeview.get_property(name + "-column-visible"))
218
140
            col.connect('toggled', self._col_visibility_changed, name)
219
141
            view_menu.add(col)
220
142
 
221
143
        go_menu = gtk.Menu()
222
 
        go_menu.set_accel_group(self.accel_group)
223
144
        go_menuitem = gtk.MenuItem("_Go")
224
145
        go_menuitem.set_submenu(go_menu)
225
146
        
226
 
        go_menu_next = self.next_rev_action.create_menu_item()
227
 
        go_menu_prev = self.prev_rev_action.create_menu_item()
228
 
 
229
 
        tag_image = gtk.Image()
230
 
        tag_image.set_from_file(icon_path("tag-16.png"))
231
 
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
232
 
        self.go_menu_tags.set_image(tag_image)
233
 
        self._update_tags()
234
 
 
235
 
        go_menu.add(go_menu_next)
236
 
        go_menu.add(go_menu_prev)
 
147
        go_menu_back = gtk.ImageMenuItem(gtk.STOCK_GO_DOWN)
 
148
        go_menu_back.connect("activate", self._back_clicked_cb)
 
149
 
 
150
        go_menu_forward = gtk.ImageMenuItem(gtk.STOCK_GO_UP)
 
151
        go_menu_forward.connect("activate", self._fwd_clicked_cb)
 
152
 
 
153
        tags_menu = gtk.Menu()
 
154
        go_menu_tags = gtk.MenuItem("_Tags")
 
155
        go_menu_tags.set_submenu(tags_menu)
 
156
 
 
157
        if self.branch.supports_tags():
 
158
            for (tag, revid) in self.branch.tags.get_tag_dict().items():
 
159
                tag_item = gtk.MenuItem(tag)
 
160
                tag_item.connect('activate', self._tag_selected_cb, revid)
 
161
                tags_menu.add(tag_item)
 
162
 
 
163
        go_menu.add(go_menu_back)
 
164
        go_menu.add(go_menu_forward)
237
165
        go_menu.add(gtk.SeparatorMenuItem())
238
 
        go_menu.add(self.go_menu_tags)
 
166
        go_menu.add(go_menu_tags)
239
167
 
240
 
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
 
168
        revision_menu = gtk.Menu()
241
169
        revision_menuitem = gtk.MenuItem("_Revision")
242
 
        revision_menuitem.set_submenu(self.revision_menu)
 
170
        revision_menuitem.set_submenu(revision_menu)
 
171
 
 
172
        revision_menu_diff = gtk.MenuItem("View Changes")
 
173
        revision_menu_diff.connect('activate', 
 
174
                lambda w: self.treeview.show_diff())
 
175
 
 
176
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
177
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
178
 
 
179
        revision_menu.add(revision_menu_tag)
 
180
        revision_menu.add(revision_menu_diff)
243
181
 
244
182
        branch_menu = gtk.Menu()
245
183
        branch_menuitem = gtk.MenuItem("_Branch")
247
185
 
248
186
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
249
187
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
250
 
 
251
 
        try:
252
 
            from bzrlib.plugins import search
253
 
        except ImportError:
254
 
            mutter("Didn't find search plugin")
255
 
        else:
256
 
            branch_menu.add(gtk.SeparatorMenuItem())
257
 
 
258
 
            branch_index_menuitem = gtk.MenuItem("_Index")
259
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
260
 
            branch_menu.add(branch_index_menuitem)
261
 
 
262
 
            branch_search_menuitem = gtk.MenuItem("_Search")
263
 
            branch_search_menuitem.connect('activate', self._branch_search_cb)
264
 
            branch_menu.add(branch_search_menuitem)
265
 
 
266
 
        help_menu = gtk.Menu()
267
 
        help_menuitem = gtk.MenuItem("_Help")
268
 
        help_menuitem.set_submenu(help_menu)
269
 
 
270
 
        help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
271
 
        help_about_menuitem.connect('activate', self._about_dialog_cb)
272
 
 
273
 
        help_menu.add(help_about_menuitem)
274
 
 
 
188
       
275
189
        menubar.add(file_menuitem)
276
190
        menubar.add(edit_menuitem)
277
191
        menubar.add(view_menuitem)
278
192
        menubar.add(go_menuitem)
279
193
        menubar.add(revision_menuitem)
280
194
        menubar.add(branch_menuitem)
281
 
        menubar.add(help_menuitem)
282
195
        menubar.show_all()
283
196
 
284
197
        return menubar
 
198
    
 
199
    def construct_loading_msg(self):
 
200
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
 
201
                                                 gtk.ICON_SIZE_BUTTON)
 
202
        image_loading.show()
 
203
        
 
204
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
 
205
        label_loading.set_alignment(0.0, 0.5)
 
206
        label_loading.show()
 
207
        
 
208
        self.loading_msg_box = gtk.HBox()
 
209
        self.loading_msg_box.set_spacing(5)
 
210
        self.loading_msg_box.set_border_width(5)        
 
211
        self.loading_msg_box.pack_start(image_loading, False, False)
 
212
        self.loading_msg_box.pack_start(label_loading, True, True)
 
213
        self.loading_msg_box.show()
 
214
        
 
215
        return self.loading_msg_box
285
216
 
286
217
    def construct_top(self):
287
218
        """Construct the top-half of the window."""
288
219
        # FIXME: Make broken_line_length configurable
289
 
 
290
 
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
291
 
 
292
 
        self.treeview.connect('revision-selected',
 
220
        if self.compact_view:
 
221
            brokenlines = 32
 
222
        else:
 
223
            brokenlines = None
 
224
 
 
225
        self.treeview = TreeView(self.branch, self.start, self.maxnum, brokenlines)
 
226
 
 
227
        self.treeview.connect("revision-selected",
293
228
                self._treeselection_changed_cb)
294
 
        self.treeview.connect('revision-activated',
295
 
                self._tree_revision_activated)
296
 
 
297
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
298
 
 
299
 
        for col in ["revno", "date"]:
300
 
            option = self.config.get_user_option(col + '-column-visible')
301
 
            if option is not None:
302
 
                self.treeview.set_property(col + '-column-visible', option == 'True')
303
 
            else:
304
 
                self.treeview.set_property(col + '-column-visible', False)
 
229
 
 
230
        self.treeview.connect('revisions-loaded', 
 
231
                lambda x: self.loading_msg_box.hide())
305
232
 
306
233
        self.treeview.show()
307
234
 
308
 
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
309
 
        align.set_padding(5, 0, 0, 0)
310
 
        align.add(self.treeview)
311
 
        # user-configured size
312
 
        size = self._load_size('viz-graph-size')
313
 
        if size:
314
 
            width, height = size
315
 
            align.set_size_request(width, height)
316
 
        else:
317
 
            (width, height) = self.get_size()
318
 
            align.set_size_request(width, int(height / 2.5))
319
 
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
320
 
        align.show()
321
 
 
322
 
        return align
 
235
        return self.treeview
323
236
 
324
237
    def construct_navigation(self):
325
238
        """Construct the navigation buttons."""
326
239
        self.toolbar = gtk.Toolbar()
327
240
        self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
328
241
 
329
 
        self.prev_button = self.prev_rev_action.create_tool_item()
330
 
        self.toolbar.insert(self.prev_button, -1)
 
242
        self.back_button = gtk.MenuToolButton(stock_id=gtk.STOCK_GO_DOWN)
 
243
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
 
244
                                         0, 0)
 
245
        self.back_button.connect("clicked", self._back_clicked_cb)
 
246
        self.toolbar.insert(self.back_button, -1)
331
247
 
332
 
        self.next_button = self.next_rev_action.create_tool_item()
333
 
        self.toolbar.insert(self.next_button, -1)
 
248
        self.fwd_button = gtk.MenuToolButton(stock_id=gtk.STOCK_GO_UP)
 
249
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
 
250
                                        0, 0)
 
251
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
 
252
        self.toolbar.insert(self.fwd_button, -1)
334
253
 
335
254
        self.toolbar.insert(gtk.SeparatorToolItem(), -1)
336
255
 
337
 
        refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
338
 
        refresh_button.connect('clicked', self._refresh_clicked)
339
 
        self.toolbar.insert(refresh_button, -1)
 
256
        brokenlines_button = gtk.ToggleToolButton()
 
257
        brokenlines_button.set_label("Compact View")
 
258
        brokenlines_button.set_active(self.compact_view)
 
259
        brokenlines_button.set_is_important(True)
 
260
        brokenlines_button.connect('toggled', self._brokenlines_toggled_cb)
 
261
        self.toolbar.insert(brokenlines_button, -1)
340
262
 
341
263
        self.toolbar.show_all()
342
264
 
344
266
 
345
267
    def construct_bottom(self):
346
268
        """Construct the bottom half of the window."""
347
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
348
 
            self.diff_paned = gtk.VPaned()
349
 
        else:
350
 
            self.diff_paned = gtk.HPaned()
 
269
        from bzrlib.plugins.gtk.revisionview import RevisionView
 
270
        self.revisionview = RevisionView(None, tags=[], show_children=True, branch=self.branch)
351
271
        (width, height) = self.get_size()
352
 
        self.diff_paned.set_size_request(20, 20) # shrinkable
353
 
 
354
 
        from bzrlib.plugins.gtk.revisionview import RevisionView
355
 
        self.revisionview = RevisionView(branch=self.branch)
356
 
        self.revisionview.set_size_request(width/3, int(height / 2.5))
357
 
        # user-configured size
358
 
        size = self._load_size('viz-revisionview-size')
359
 
        if size:
360
 
            width, height = size
361
 
            self.revisionview.set_size_request(width, height)
362
 
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
 
272
        self.revisionview.set_size_request(width, int(height / 2.5))
363
273
        self.revisionview.show()
364
274
        self.revisionview.set_show_callback(self._show_clicked_cb)
365
 
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
366
 
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
367
 
        self.diff_paned.pack1(self.revisionview)
368
 
 
369
 
        from bzrlib.plugins.gtk.diff import DiffWidget
370
 
        self.diff = DiffWidget()
371
 
        self.diff_paned.pack2(self.diff)
372
 
 
373
 
        self.diff_paned.show_all()
374
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
375
 
            self.diff.hide()
376
 
 
377
 
        return self.diff_paned
 
275
        self.revisionview.set_go_callback(self._go_clicked_cb)
 
276
        return self.revisionview
378
277
 
379
278
    def _tag_selected_cb(self, menuitem, revid):
380
279
        self.treeview.set_revision_id(revid)
385
284
        parents  = self.treeview.get_parents()
386
285
        children = self.treeview.get_children()
387
286
 
388
 
        self.revision_menu.set_revision_ids([revision.revision_id])
389
 
 
390
 
        if revision and revision != NULL_REVISION:
391
 
            prev_menu = gtk.Menu()
 
287
        if revision is not None:
 
288
            back_menu = gtk.Menu()
392
289
            if len(parents) > 0:
393
 
                self.prev_rev_action.set_sensitive(True)
 
290
                self.back_button.set_sensitive(True)
394
291
                for parent_id in parents:
395
 
                    if parent_id and parent_id != NULL_REVISION:
396
 
                        parent = self.branch.repository.get_revision(parent_id)
397
 
                        try:
398
 
                            str = ' (' + parent.properties['branch-nick'] + ')'
399
 
                        except KeyError:
400
 
                            str = ""
 
292
                    parent = self.branch.repository.get_revision(parent_id)
 
293
                    try:
 
294
                        str = ' (' + parent.properties['branch-nick'] + ')'
 
295
                    except KeyError:
 
296
                        str = ""
401
297
 
402
 
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
403
 
                        item.connect('activate', self._set_revision_cb, parent_id)
404
 
                        prev_menu.add(item)
405
 
                prev_menu.show_all()
 
298
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
299
                    item.connect('activate', self._set_revision_cb, parent_id)
 
300
                    back_menu.add(item)
 
301
                back_menu.show_all()
406
302
            else:
407
 
                self.prev_rev_action.set_sensitive(False)
408
 
                prev_menu.hide()
409
 
 
410
 
            self.prev_button.set_menu(prev_menu)
411
 
 
412
 
            next_menu = gtk.Menu()
 
303
                self.back_button.set_sensitive(False)
 
304
                back_menu.hide()
 
305
 
 
306
            self.back_button.set_menu(back_menu)
 
307
 
 
308
            fwd_menu = gtk.Menu()
413
309
            if len(children) > 0:
414
 
                self.next_rev_action.set_sensitive(True)
 
310
                self.fwd_button.set_sensitive(True)
415
311
                for child_id in children:
416
312
                    child = self.branch.repository.get_revision(child_id)
417
313
                    try:
421
317
 
422
318
                    item = gtk.MenuItem(child.message.split("\n")[0] + str)
423
319
                    item.connect('activate', self._set_revision_cb, child_id)
424
 
                    next_menu.add(item)
425
 
                next_menu.show_all()
 
320
                    fwd_menu.add(item)
 
321
                fwd_menu.show_all()
426
322
            else:
427
 
                self.next_rev_action.set_sensitive(False)
428
 
                next_menu.hide()
429
 
 
430
 
            self.next_button.set_menu(next_menu)
431
 
 
432
 
            self.revisionview.set_revision(revision)
433
 
            self.revisionview.set_children(children)
434
 
            self.update_diff_panel(revision, parents)
435
 
 
436
 
    def _tree_revision_activated(self, widget, path, col):
437
 
        # TODO: more than one parent
438
 
        """Callback for when a treeview row gets activated."""
439
 
        revision = self.treeview.get_revision()
440
 
        parents  = self.treeview.get_parents()
441
 
 
442
 
        if len(parents) == 0:
443
 
            parent_id = None
444
 
        else:
445
 
            parent_id = parents[0]
446
 
 
447
 
        self.show_diff(revision.revision_id, parent_id)
448
 
        self.treeview.grab_focus()
449
 
        
 
323
                self.fwd_button.set_sensitive(False)
 
324
                fwd_menu.hide()
 
325
 
 
326
            self.fwd_button.set_menu(fwd_menu)
 
327
 
 
328
            tags = []
 
329
            if self.branch.supports_tags():
 
330
                tagdict = self.branch.tags.get_reverse_tag_dict()
 
331
                if tagdict.has_key(revision.revision_id):
 
332
                    tags = tagdict[revision.revision_id]
 
333
            self.revisionview.set_revision(revision, tags, children)
 
334
 
450
335
    def _back_clicked_cb(self, *args):
451
336
        """Callback for when the back button is clicked."""
452
337
        self.treeview.back()
455
340
        """Callback for when the forward button is clicked."""
456
341
        self.treeview.forward()
457
342
 
458
 
    def _go_clicked_cb(self, w, p):
 
343
    def _go_clicked_cb(self, revid):
459
344
        """Callback for when the go button for a parent is clicked."""
460
 
        if self.revisionview.get_revision() is not None:
461
 
            self.treeview.set_revision(self.revisionview.get_revision())
 
345
        self.treeview.set_revision_id(revid)
462
346
 
463
347
    def _show_clicked_cb(self, revid, parentid):
464
348
        """Callback for when the show button for a parent is clicked."""
465
 
        self.show_diff(revid, parentid)
 
349
        self.treeview.show_diff(revid, parentid)
466
350
        self.treeview.grab_focus()
467
351
 
468
352
    def _set_revision_cb(self, w, revision_id):
477
361
            option = 'no'
478
362
 
479
363
        self.config.set_user_option('viz-compact-view', option)
480
 
        self.treeview.set_property('compact', self.compact_view)
481
 
        self.treeview.refresh()
482
 
 
483
 
    def _branch_index_cb(self, w):
484
 
        from bzrlib.plugins.search import index as _mod_index
485
 
        _mod_index.index_url(self.branch.base)
486
 
 
487
 
    def _branch_search_cb(self, w):
488
 
        from bzrlib.plugins.search import index as _mod_index
489
 
        from bzrlib.plugins.gtk.search import SearchDialog
490
 
        from bzrlib.plugins.search import errors as search_errors
491
 
 
492
 
        try:
493
 
            index = _mod_index.open_index_url(self.branch.base)
494
 
        except search_errors.NoSearchIndex:
495
 
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
496
 
                buttons=gtk.BUTTONS_OK_CANCEL, 
497
 
                message_format="This branch has not been indexed yet. "
498
 
                               "Index now?")
499
 
            if dialog.run() == gtk.RESPONSE_OK:
500
 
                dialog.destroy()
501
 
                index = _mod_index.index_url(self.branch.base)
502
 
            else:
503
 
                dialog.destroy()
504
 
                return
505
 
 
506
 
        dialog = SearchDialog(index)
 
364
 
 
365
        revision = self.treeview.get_revision()
 
366
 
 
367
        self.treeview.destroy()
 
368
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
369
 
 
370
        gobject.idle_add(self.set_revision, revision.revision_id)
 
371
 
 
372
    def _tag_revision_cb(self, w):
 
373
        dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
374
        response = dialog.run()
 
375
        if response != gtk.RESPONSE_NONE:
 
376
            dialog.hide()
507
377
        
508
 
        if dialog.run() == gtk.RESPONSE_OK:
509
 
            self.set_revision(dialog.get_revision())
510
 
 
511
 
        dialog.destroy()
512
 
 
513
 
    def _about_dialog_cb(self, w):
514
 
        from bzrlib.plugins.gtk.about import AboutDialog
515
 
 
516
 
        AboutDialog().run()
 
378
            if response == gtk.RESPONSE_OK:
 
379
                try:
 
380
                    self.branch.lock_write()
 
381
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
382
                finally:
 
383
                    self.branch.unlock()
 
384
            
 
385
            dialog.destroy()
517
386
 
518
387
    def _col_visibility_changed(self, col, property):
519
 
        self.config.set_user_option(property + '-column-visible', col.get_active())
520
388
        self.treeview.set_property(property + '-column-visible', col.get_active())
521
389
 
522
390
    def _toolbar_visibility_changed(self, col):
523
391
        if col.get_active():
524
 
            self.toolbar.show()
 
392
            self.toolbar.show() 
525
393
        else:
526
394
            self.toolbar.hide()
527
 
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
528
 
 
529
 
    def _make_diff_nonzero_size(self):
530
 
        """make sure the diff isn't zero-width or zero-height"""
531
 
        alloc = self.diff.get_allocation()
532
 
        if (alloc.width < 10) or (alloc.height < 10):
533
 
            width, height = self.get_size()
534
 
            self.revisionview.set_size_request(width/3, int(height / 2.5))
535
 
 
536
 
    def _diff_visibility_changed(self, col):
537
 
        """Hide or show the diff panel."""
538
 
        if col.get_active():
539
 
            self.diff.show()
540
 
            self._make_diff_nonzero_size()
541
 
        else:
542
 
            self.diff.hide()
543
 
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
544
 
        self.update_diff_panel()
545
 
 
546
 
    def _diff_placement_changed(self, col):
547
 
        """Toggle the diff panel's position."""
548
 
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
549
 
 
550
 
        old = self.paned.get_child2()
551
 
        self.paned.remove(old)
552
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
553
 
        self._make_diff_nonzero_size()
554
 
 
555
 
        self.treeview.emit('revision-selected')
556
 
    
557
 
    def _diff_wrap_changed(self, widget):
558
 
        """Toggle word wrap in the diff widget."""
559
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
560
 
        self.diff._on_wraplines_toggled(widget)
561
 
    
562
 
    def _show_about_cb(self, w):
563
 
        dialog = AboutDialog()
564
 
        dialog.connect('response', lambda d,r: d.destroy())
565
 
        dialog.run()
566
 
 
567
 
    def _refresh_clicked(self, w):
568
 
        self.treeview.refresh()
569
 
 
570
 
    def _update_tags(self):
571
 
        menu = gtk.Menu()
572
 
 
573
 
        if self.branch.supports_tags():
574
 
            tags = self.branch.tags.get_tag_dict().items()
575
 
            tags.sort()
576
 
            tags.reverse()
577
 
            for tag, revid in tags:
578
 
                tag_image = gtk.Image()
579
 
                tag_image.set_from_file(icon_path('tag-16.png'))
580
 
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
581
 
                tag_item.set_image(tag_image)
582
 
                tag_item.connect('activate', self._tag_selected_cb, revid)
583
 
                menu.add(tag_item)
584
 
            self.go_menu_tags.set_submenu(menu)
585
 
 
586
 
            self.go_menu_tags.set_sensitive(len(tags) != 0)
587
 
        else:
588
 
            self.go_menu_tags.set_sensitive(False)
589
 
 
590
 
        self.go_menu_tags.show_all()
591
 
 
592
 
    def _load_size(self, name):
593
 
        """Read and parse 'name' from self.config.
594
 
        The value is a string, formatted as WIDTHxHEIGHT
595
 
        Returns None, or (width, height)
596
 
        """
597
 
        size = self.config.get_user_option(name)
598
 
        if size:
599
 
            width, height = [int(num) for num in size.split('x')]
600
 
            # avoid writing config every time we start
601
 
            self._sizes[name] = (width, height)
602
 
            return width, height
603
 
        return None
604
 
 
605
 
    def _on_size_allocate(self, widget, allocation, name):
606
 
        """When window has been resized, save the new size."""
607
 
        width, height = 0, 0
608
 
        if name in self._sizes:
609
 
            width, height = self._sizes[name]
610
 
 
611
 
        size_changed = (width != allocation.width) or \
612
 
                (height != allocation.height)
613
 
 
614
 
        if size_changed:
615
 
            width, height = allocation.width, allocation.height
616
 
            self._sizes[name] = (width, height)
617
 
            value = '%sx%s' % (width, height)
618
 
            self.config.set_user_option(name, value)
619
 
 
620
 
    def show_diff(self, revid=None, parentid=None):
621
 
        """Open a new window to show a diff between the given revisions."""
622
 
        from bzrlib.plugins.gtk.diff import DiffWindow
623
 
        window = DiffWindow(parent=self)
624
 
 
625
 
        if parentid is None:
626
 
            parentid = NULL_REVISION
627
 
 
628
 
        rev_tree    = self.branch.repository.revision_tree(revid)
629
 
        parent_tree = self.branch.repository.revision_tree(parentid)
630
 
 
631
 
        description = revid + " - " + self.branch.nick
632
 
        window.set_diff(description, rev_tree, parent_tree)
633
 
        window.show()
634
 
 
635
 
    def update_diff_panel(self, revision=None, parents=None):
636
 
        """Show the current revision in the diff panel."""
637
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
638
 
            return
639
 
 
640
 
        if not revision: # default to selected row
641
 
            revision = self.treeview.get_revision()
642
 
        if (not revision) or (revision == NULL_REVISION):
643
 
            return
644
 
 
645
 
        if not parents: # default to selected row's parents
646
 
            parents  = self.treeview.get_parents()
647
 
        if len(parents) == 0:
648
 
            parent_id = None
649
 
        else:
650
 
            parent_id = parents[0]
651
 
 
652
 
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
653
 
        parent_tree = self.branch.repository.revision_tree(parent_id)
654
 
 
655
 
        self.diff.set_diff(rev_tree, parent_tree)
656
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
657
 
            self.diff._on_wraplines_toggled(wrap=True)
658
 
        self.diff.show_all()