/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
8
8
__author__    = "Scott James Remnant <scott@ubuntu.com>"
9
9
 
10
10
 
 
11
from gi.repository import Gdk
11
12
from gi.repository import Gtk
12
13
 
13
14
from bzrlib.plugins.gtk import icon_path
37
38
                       None for no limit.
38
39
        """
39
40
 
40
 
        Window.__init__(self, parent=parent)
 
41
        super(BranchWindow, self).__init__(parent=parent)
41
42
        self.set_border_width(0)
42
43
 
43
44
        self.branch      = branch
67
68
        self._save_size_on_destroy(self, 'viz-window-size')
68
69
 
69
70
        # FIXME AndyFitz!
70
 
        icon = self.render_icon(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)
 
71
        icon = self.render_icon_pixbuf(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)
71
72
        self.set_icon(icon)
72
73
 
73
74
        Gtk.AccelMap.add_entry("<viz>/Go/Next Revision", Gdk.KEY_Up, Gdk.ModifierType.MOD1_MASK)
77
78
        self.accel_group = Gtk.AccelGroup()
78
79
        self.add_accel_group(self.accel_group)
79
80
 
80
 
        if getattr(Gtk.Action, 'set_tool_item_type', None) is not None:
81
 
            Gtk.Action.set_tool_item_type(Gtk.MenuToolButton)
82
 
 
83
81
        self.prev_rev_action = Gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", Gtk.STOCK_GO_DOWN)
84
82
        self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
85
83
        self.prev_rev_action.set_accel_group(self.accel_group)
104
102
        """Creates a hook that saves the size of widget to config option 
105
103
           config_name when the window is destroyed/closed."""
106
104
        def save_size(src):
107
 
            width, height = widget.allocation.width, widget.allocation.height
 
105
            allocation = widget.get_allocation()
 
106
            width, height = allocation.width, allocation.height
108
107
            value = '%sx%s' % (width, height)
109
108
            self.config.set_user_option(config_name, value)
110
109
        self.connect("destroy", save_size)
122
121
        nav = self.construct_navigation()
123
122
        menubar = self.construct_menubar()
124
123
 
125
 
        vbox.pack_start(menubar, expand=False, fill=True)
126
 
        vbox.pack_start(nav, expand=False, fill=True)
127
 
        vbox.pack_start(paned, expand=True, fill=True)
 
124
        vbox.pack_start(menubar, False, True, 0)
 
125
        vbox.pack_start(nav, False, True, 0)
 
126
        vbox.pack_start(paned, True, True, 0)
128
127
        vbox.set_focus_child(paned)
129
128
 
130
129
 
135
134
    def construct_paned(self):
136
135
        """Construct the main HPaned/VPaned contents."""
137
136
        if self.config.get_user_option('viz-vertical') == 'True':
138
 
            self.paned = Gtk.HPaned()
 
137
            self.paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
139
138
        else:
140
 
            self.paned = Gtk.VPaned()
 
139
            self.paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
141
140
 
142
141
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
143
142
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
149
148
        menubar = Gtk.MenuBar()
150
149
 
151
150
        file_menu = Gtk.Menu()
152
 
        file_menuitem = Gtk.MenuItem("_File")
 
151
        file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
153
152
        file_menuitem.set_submenu(file_menu)
154
153
 
155
 
        file_menu_close = Gtk.ImageMenuItem(Gtk.STOCK_CLOSE, self.accel_group)
 
154
        file_menu_close = Gtk.ImageMenuItem.new_from_stock(
 
155
            Gtk.STOCK_CLOSE, self.accel_group)
156
156
        file_menu_close.connect('activate', lambda x: self.destroy())
157
157
 
158
 
        file_menu_quit = Gtk.ImageMenuItem(Gtk.STOCK_QUIT, self.accel_group)
 
158
        file_menu_quit = Gtk.ImageMenuItem.new_from_stock(
 
159
            Gtk.STOCK_QUIT, self.accel_group)
159
160
        file_menu_quit.connect('activate', lambda x: Gtk.main_quit())
160
161
 
161
162
        if self._parent is not None:
163
164
        file_menu.add(file_menu_quit)
164
165
 
165
166
        edit_menu = Gtk.Menu()
166
 
        edit_menuitem = Gtk.MenuItem("_Edit")
 
167
        edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
167
168
        edit_menuitem.set_submenu(edit_menu)
168
169
 
169
 
        edit_menu_branchopts = Gtk.MenuItem("Branch Settings")
 
170
        edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
170
171
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
171
172
 
172
 
        edit_menu_globopts = Gtk.MenuItem("Global Settings")
 
173
        edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
173
174
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
174
175
 
175
176
        edit_menu.add(edit_menu_branchopts)
176
177
        edit_menu.add(edit_menu_globopts)
177
178
 
178
179
        view_menu = Gtk.Menu()
179
 
        view_menuitem = Gtk.MenuItem("_View")
 
180
        view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
180
181
        view_menuitem.set_submenu(view_menu)
181
182
 
182
183
        view_menu_refresh = self.refresh_action.create_menu_item()
185
186
        view_menu.add(view_menu_refresh)
186
187
        view_menu.add(Gtk.SeparatorMenuItem())
187
188
 
188
 
        view_menu_toolbar = Gtk.CheckMenuItem("Show Toolbar")
 
189
        view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")
189
190
        view_menu_toolbar.set_active(True)
190
191
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
191
192
            view_menu_toolbar.set_active(False)
192
193
            self.toolbar.hide()
193
194
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
194
195
 
195
 
        view_menu_compact = Gtk.CheckMenuItem("Show Compact Graph")
 
196
        view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
196
197
        view_menu_compact.set_active(self.compact_view)
197
198
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
198
199
 
199
 
        view_menu_vertical = Gtk.CheckMenuItem("Side-by-side Layout")
 
200
        view_menu_vertical = Gtk.CheckMenuItem(label="Side-by-side Layout")
200
201
        view_menu_vertical.set_active(False)
201
202
        if self.config.get_user_option('viz-vertical') == 'True':
202
203
            view_menu_vertical.set_active(True)
203
204
        view_menu_vertical.connect('toggled', self._vertical_layout)
204
205
 
205
 
        view_menu_diffs = Gtk.CheckMenuItem("Show Diffs")
 
206
        view_menu_diffs = Gtk.CheckMenuItem(label="Show Diffs")
206
207
        view_menu_diffs.set_active(False)
207
208
        if self.config.get_user_option('viz-show-diffs') == 'True':
208
209
            view_menu_diffs.set_active(True)
209
210
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
210
211
 
211
 
        view_menu_wide_diffs = Gtk.CheckMenuItem("Wide Diffs")
 
212
        view_menu_wide_diffs = Gtk.CheckMenuItem(label="Wide Diffs")
212
213
        view_menu_wide_diffs.set_active(False)
213
214
        if self.config.get_user_option('viz-wide-diffs') == 'True':
214
215
            view_menu_wide_diffs.set_active(True)
215
216
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
216
217
 
217
 
        view_menu_wrap_diffs = Gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
 
218
        view_menu_wrap_diffs = Gtk.CheckMenuItem.new_with_mnemonic(
 
219
            "Wrap _Long Lines in Diffs")
218
220
        view_menu_wrap_diffs.set_active(False)
219
221
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
220
222
            view_menu_wrap_diffs.set_active(True)
229
231
        view_menu.add(view_menu_wrap_diffs)
230
232
        view_menu.add(Gtk.SeparatorMenuItem())
231
233
 
232
 
        self.mnu_show_revno_column = Gtk.CheckMenuItem("Show Revision _Number Column")
233
 
        self.mnu_show_date_column = Gtk.CheckMenuItem("Show _Date Column")
 
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")
234
238
 
235
239
        # Revision numbers are pointless if there are multiple branches
236
240
        if len(self.start_revs) > 1:
245
249
 
246
250
        go_menu = Gtk.Menu()
247
251
        go_menu.set_accel_group(self.accel_group)
248
 
        go_menuitem = Gtk.MenuItem("_Go")
 
252
        go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
249
253
        go_menuitem.set_submenu(go_menu)
250
254
 
251
255
        go_menu_next = self.next_rev_action.create_menu_item()
253
257
 
254
258
        tag_image = Gtk.Image()
255
259
        tag_image.set_from_file(icon_path("tag-16.png"))
256
 
        self.go_menu_tags = Gtk.ImageMenuItem("_Tags")
 
260
        self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")
257
261
        self.go_menu_tags.set_image(tag_image)
258
262
        self.treeview.connect('refreshed', lambda w: self._update_tags())
259
263
 
264
268
 
265
269
        self.revision_menu = RevisionMenu(self.branch.repository, [],
266
270
            self.branch, parent=self)
267
 
        revision_menuitem = Gtk.MenuItem("_Revision")
 
271
        revision_menuitem = Gtk.MenuItem.new_with_mnemonic("_Revision")
268
272
        revision_menuitem.set_submenu(self.revision_menu)
269
273
 
270
274
        branch_menu = Gtk.Menu()
271
 
        branch_menuitem = Gtk.MenuItem("_Branch")
 
275
        branch_menuitem = Gtk.MenuItem.new_with_mnemonic("_Branch")
272
276
        branch_menuitem.set_submenu(branch_menu)
273
277
 
274
 
        branch_menu.add(Gtk.MenuItem("Pu_ll Revisions"))
275
 
        branch_menu.add(Gtk.MenuItem("Pu_sh Revisions"))
 
278
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))
 
279
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))
276
280
 
277
281
        try:
278
282
            from bzrlib.plugins import search
281
285
        else:
282
286
            branch_menu.add(Gtk.SeparatorMenuItem())
283
287
 
284
 
            branch_index_menuitem = Gtk.MenuItem("_Index")
 
288
            branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")
285
289
            branch_index_menuitem.connect('activate', self._branch_index_cb)
286
290
            branch_menu.add(branch_index_menuitem)
287
291
 
288
 
            branch_search_menuitem = Gtk.MenuItem("_Search")
 
292
            branch_search_menuitem = Gtk.MenuItem.new_with_mnemonic("_Search")
289
293
            branch_search_menuitem.connect('activate', self._branch_search_cb)
290
294
            branch_menu.add(branch_search_menuitem)
291
295
 
292
296
        help_menu = Gtk.Menu()
293
 
        help_menuitem = Gtk.MenuItem("_Help")
 
297
        help_menuitem = Gtk.MenuItem.new_with_mnemonic("_Help")
294
298
        help_menuitem.set_submenu(help_menu)
295
299
 
296
 
        help_about_menuitem = Gtk.ImageMenuItem(Gtk.STOCK_ABOUT,
297
 
            self.accel_group)
 
300
        help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(
 
301
            Gtk.STOCK_ABOUT, self.accel_group)
298
302
        help_about_menuitem.connect('activate', self._about_dialog_cb)
299
303
 
300
304
        help_menu.add(help_about_menuitem)
346
350
    def construct_navigation(self):
347
351
        """Construct the navigation buttons."""
348
352
        self.toolbar = Gtk.Toolbar()
349
 
        self.toolbar.set_style(Gtk.TOOLBAR_BOTH_HORIZ)
 
353
        self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
350
354
 
351
355
        self.prev_button = self.prev_rev_action.create_tool_item()
352
356
        self.toolbar.insert(self.prev_button, -1)
356
360
 
357
361
        self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
358
362
 
359
 
        refresh_button = Gtk.ToolButton(Gtk.STOCK_REFRESH)
 
363
        refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
360
364
        refresh_button.connect('clicked', self._refresh_clicked)
361
365
        self.toolbar.insert(refresh_button, -1)
362
366
 
367
371
    def construct_bottom(self):
368
372
        """Construct the bottom half of the window."""
369
373
        if self.config.get_user_option('viz-wide-diffs') == 'True':
370
 
            self.diff_paned = Gtk.VPaned()
 
374
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
371
375
        else:
372
 
            self.diff_paned = Gtk.HPaned()
 
376
            self.diff_paned = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
373
377
        (width, height) = self.get_size()
374
378
        self.diff_paned.set_size_request(20, 20) # shrinkable
375
379
 
425
429
                        except KeyError:
426
430
                            str = ""
427
431
 
428
 
                        item = Gtk.MenuItem(parent.message.split("\n")[0] + str)
 
432
                        item = Gtk.MenuItem(
 
433
                            label=parent.message.split("\n")[0] + str)
429
434
                        item.connect('activate', self._set_revision_cb, parent_id)
430
435
                        prev_menu.add(item)
431
436
                prev_menu.show_all()
446
451
                    except KeyError:
447
452
                        str = ""
448
453
 
449
 
                    item = Gtk.MenuItem(child.message.split("\n")[0] + str)
 
454
                    item = Gtk.MenuItem(
 
455
                        label=child.message.split("\n")[0] + str)
450
456
                    item.connect('activate', self._set_revision_cb, child_id)
451
457
                    next_menu.add(item)
452
458
                next_menu.show_all()
472
478
        else:
473
479
            parent_id = parents[0]
474
480
 
475
 
        self.show_diff(revision.revision_id, parent_id)
 
481
        if revision is not None:
 
482
            self.show_diff(revision.revision_id, parent_id)
 
483
        else:
 
484
            self.show_diff(NULL_REVISION)
476
485
        self.treeview.grab_focus()
477
486
 
478
487
    def _back_clicked_cb(self, *args):
536
545
        dialog = SearchDialog(index)
537
546
 
538
547
        if dialog.run() == Gtk.ResponseType.OK:
539
 
            self.set_revision(dialog.get_revision())
 
548
            revid = dialog.get_revision()
 
549
            if revid is not None:
 
550
                self.set_revision(revid)
540
551
 
541
552
        dialog.destroy()
542
553
 
561
572
 
562
573
        old = self.paned
563
574
        self.vbox.remove(old)
564
 
        self.vbox.pack_start(self.construct_paned(, True, True, 0), expand=True, fill=True)
 
575
        self.vbox.pack_start(
 
576
            self.construct_paned(), True, True, 0)
565
577
        self._make_diff_paned_nonzero_size()
566
578
        self._make_diff_nonzero_size()
567
579
 
619
631
            for tag, revid in tags:
620
632
                tag_image = Gtk.Image()
621
633
                tag_image.set_from_file(icon_path('tag-16.png'))
622
 
                tag_item = Gtk.ImageMenuItem(tag.replace('_', '__'))
 
634
                tag_item = Gtk.ImageMenuItem.new_with_mnemonic(
 
635
                    tag.replace('_', '__'))
623
636
                tag_item.set_image(tag_image)
624
637
                tag_item.connect('activate', self._tag_selected_cb, revid)
625
638
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
644
657
            return width, height
645
658
        return None
646
659
 
647
 
    def show_diff(self, revid=None, parentid=NULL_REVISION):
 
660
    def show_diff(self, revid, parentid=NULL_REVISION):
648
661
        """Open a new window to show a diff between the given revisions."""
649
662
        from bzrlib.plugins.gtk.diff import DiffWindow
650
663
        window = DiffWindow(parent=self)