/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-03-28 19:26:53 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.

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