/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: Curtis Hovey
  • Date: 2011-07-31 17:38:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731173830-mjhimj25p2ahjxfa
Update diff to gtk3.

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