/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: 2008-04-02 00:31:14 UTC
  • mto: (450.1.15 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: daniel.schierbeck@gmail.com-20080402003114-kwkxtnv7za97ur6t
Added tag icon to branch history window.

Show diffs side-by-side

added added

removed removed

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