/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-08-27 18:03:04 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827180304-9405wmp3lyzq5jx2
Updated most of BranchView 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
11
12
from gi.repository import Gtk
12
13
 
13
14
from bzrlib.plugins.gtk import icon_path
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)
122
123
        nav = self.construct_navigation()
123
124
        menubar = self.construct_menubar()
124
125
 
125
 
        vbox.pack_start(menubar, False, True, True, 0)
126
 
        vbox.pack_start(nav, False, True,True, 0)
127
 
        vbox.pack_start(paned, True, True, True, 0)
 
126
        vbox.pack_start(menubar, False, True, 0)
 
127
        vbox.pack_start(nav, False, True, 0)
 
128
        vbox.pack_start(paned, True, True, 0)
128
129
        vbox.set_focus_child(paned)
129
130
 
130
131
 
149
150
        menubar = Gtk.MenuBar()
150
151
 
151
152
        file_menu = Gtk.Menu()
152
 
        file_menuitem = Gtk.MenuItem("_File")
 
153
        file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")
153
154
        file_menuitem.set_submenu(file_menu)
154
155
 
155
 
        file_menu_close = Gtk.ImageMenuItem(Gtk.STOCK_CLOSE, self.accel_group)
 
156
        file_menu_close = Gtk.ImageMenuItem.new_from_stock(
 
157
            Gtk.STOCK_CLOSE, self.accel_group)
156
158
        file_menu_close.connect('activate', lambda x: self.destroy())
157
159
 
158
 
        file_menu_quit = Gtk.ImageMenuItem(Gtk.STOCK_QUIT, self.accel_group)
 
160
        file_menu_quit = Gtk.ImageMenuItem.new_from_stock(
 
161
            Gtk.STOCK_QUIT, self.accel_group)
159
162
        file_menu_quit.connect('activate', lambda x: Gtk.main_quit())
160
163
 
161
164
        if self._parent is not None:
163
166
        file_menu.add(file_menu_quit)
164
167
 
165
168
        edit_menu = Gtk.Menu()
166
 
        edit_menuitem = Gtk.MenuItem("_Edit")
 
169
        edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")
167
170
        edit_menuitem.set_submenu(edit_menu)
168
171
 
169
 
        edit_menu_branchopts = Gtk.MenuItem("Branch Settings")
 
172
        edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")
170
173
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
171
174
 
172
 
        edit_menu_globopts = Gtk.MenuItem("Global Settings")
 
175
        edit_menu_globopts = Gtk.MenuItem(label="Global Settings")
173
176
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
174
177
 
175
178
        edit_menu.add(edit_menu_branchopts)
176
179
        edit_menu.add(edit_menu_globopts)
177
180
 
178
181
        view_menu = Gtk.Menu()
179
 
        view_menuitem = Gtk.MenuItem("_View")
 
182
        view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")
180
183
        view_menuitem.set_submenu(view_menu)
181
184
 
182
185
        view_menu_refresh = self.refresh_action.create_menu_item()
185
188
        view_menu.add(view_menu_refresh)
186
189
        view_menu.add(Gtk.SeparatorMenuItem())
187
190
 
188
 
        view_menu_toolbar = Gtk.CheckMenuItem("Show Toolbar")
 
191
        view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")
189
192
        view_menu_toolbar.set_active(True)
190
193
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
191
194
            view_menu_toolbar.set_active(False)
192
195
            self.toolbar.hide()
193
196
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
194
197
 
195
 
        view_menu_compact = Gtk.CheckMenuItem("Show Compact Graph")
 
198
        view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")
196
199
        view_menu_compact.set_active(self.compact_view)
197
200
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
198
201
 
199
 
        view_menu_vertical = Gtk.CheckMenuItem("Side-by-side Layout")
 
202
        view_menu_vertical = Gtk.CheckMenuItem(label="Side-by-side Layout")
200
203
        view_menu_vertical.set_active(False)
201
204
        if self.config.get_user_option('viz-vertical') == 'True':
202
205
            view_menu_vertical.set_active(True)
203
206
        view_menu_vertical.connect('toggled', self._vertical_layout)
204
207
 
205
 
        view_menu_diffs = Gtk.CheckMenuItem("Show Diffs")
 
208
        view_menu_diffs = Gtk.CheckMenuItem(label="Show Diffs")
206
209
        view_menu_diffs.set_active(False)
207
210
        if self.config.get_user_option('viz-show-diffs') == 'True':
208
211
            view_menu_diffs.set_active(True)
209
212
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
210
213
 
211
 
        view_menu_wide_diffs = Gtk.CheckMenuItem("Wide Diffs")
 
214
        view_menu_wide_diffs = Gtk.CheckMenuItem(label="Wide Diffs")
212
215
        view_menu_wide_diffs.set_active(False)
213
216
        if self.config.get_user_option('viz-wide-diffs') == 'True':
214
217
            view_menu_wide_diffs.set_active(True)
215
218
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
216
219
 
217
 
        view_menu_wrap_diffs = Gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
 
220
        view_menu_wrap_diffs = Gtk.CheckMenuItem.new_with_mnemonic(
 
221
            "Wrap _Long Lines in Diffs")
218
222
        view_menu_wrap_diffs.set_active(False)
219
223
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
220
224
            view_menu_wrap_diffs.set_active(True)
229
233
        view_menu.add(view_menu_wrap_diffs)
230
234
        view_menu.add(Gtk.SeparatorMenuItem())
231
235
 
232
 
        self.mnu_show_revno_column = Gtk.CheckMenuItem("Show Revision _Number Column")
233
 
        self.mnu_show_date_column = Gtk.CheckMenuItem("Show _Date Column")
 
236
        self.mnu_show_revno_column = Gtk.CheckMenuItem.new_with_mnemonic(
 
237
            "Show Revision _Number Column")
 
238
        self.mnu_show_date_column = Gtk.CheckMenuItem.new_with_mnemonic(
 
239
            "Show _Date Column")
234
240
 
235
241
        # Revision numbers are pointless if there are multiple branches
236
242
        if len(self.start_revs) > 1:
245
251
 
246
252
        go_menu = Gtk.Menu()
247
253
        go_menu.set_accel_group(self.accel_group)
248
 
        go_menuitem = Gtk.MenuItem("_Go")
 
254
        go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")
249
255
        go_menuitem.set_submenu(go_menu)
250
256
 
251
257
        go_menu_next = self.next_rev_action.create_menu_item()
253
259
 
254
260
        tag_image = Gtk.Image()
255
261
        tag_image.set_from_file(icon_path("tag-16.png"))
256
 
        self.go_menu_tags = Gtk.ImageMenuItem("_Tags")
 
262
        self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")
257
263
        self.go_menu_tags.set_image(tag_image)
258
264
        self.treeview.connect('refreshed', lambda w: self._update_tags())
259
265
 
264
270
 
265
271
        self.revision_menu = RevisionMenu(self.branch.repository, [],
266
272
            self.branch, parent=self)
267
 
        revision_menuitem = Gtk.MenuItem("_Revision")
 
273
        revision_menuitem = Gtk.MenuItem.new_with_mnemonic("_Revision")
268
274
        revision_menuitem.set_submenu(self.revision_menu)
269
275
 
270
276
        branch_menu = Gtk.Menu()
271
 
        branch_menuitem = Gtk.MenuItem("_Branch")
 
277
        branch_menuitem = Gtk.MenuItem.new_with_mnemonic("_Branch")
272
278
        branch_menuitem.set_submenu(branch_menu)
273
279
 
274
 
        branch_menu.add(Gtk.MenuItem("Pu_ll Revisions"))
275
 
        branch_menu.add(Gtk.MenuItem("Pu_sh Revisions"))
 
280
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))
 
281
        branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))
276
282
 
277
283
        try:
278
284
            from bzrlib.plugins import search
281
287
        else:
282
288
            branch_menu.add(Gtk.SeparatorMenuItem())
283
289
 
284
 
            branch_index_menuitem = Gtk.MenuItem("_Index")
 
290
            branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")
285
291
            branch_index_menuitem.connect('activate', self._branch_index_cb)
286
292
            branch_menu.add(branch_index_menuitem)
287
293
 
288
 
            branch_search_menuitem = Gtk.MenuItem("_Search")
 
294
            branch_search_menuitem = Gtk.MenuItem.new_with_mnemonic("_Search")
289
295
            branch_search_menuitem.connect('activate', self._branch_search_cb)
290
296
            branch_menu.add(branch_search_menuitem)
291
297
 
292
298
        help_menu = Gtk.Menu()
293
 
        help_menuitem = Gtk.MenuItem("_Help")
 
299
        help_menuitem = Gtk.MenuItem.new_with_mnemonic("_Help")
294
300
        help_menuitem.set_submenu(help_menu)
295
301
 
296
 
        help_about_menuitem = Gtk.ImageMenuItem(Gtk.STOCK_ABOUT,
297
 
            self.accel_group)
 
302
        help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(
 
303
            Gtk.STOCK_ABOUT, self.accel_group)
298
304
        help_about_menuitem.connect('activate', self._about_dialog_cb)
299
305
 
300
306
        help_menu.add(help_about_menuitem)
346
352
    def construct_navigation(self):
347
353
        """Construct the navigation buttons."""
348
354
        self.toolbar = Gtk.Toolbar()
349
 
        self.toolbar.set_style(Gtk.TOOLBAR_BOTH_HORIZ)
 
355
        self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)
350
356
 
351
357
        self.prev_button = self.prev_rev_action.create_tool_item()
352
358
        self.toolbar.insert(self.prev_button, -1)
356
362
 
357
363
        self.toolbar.insert(Gtk.SeparatorToolItem(), -1)
358
364
 
359
 
        refresh_button = Gtk.ToolButton(Gtk.STOCK_REFRESH)
 
365
        refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)
360
366
        refresh_button.connect('clicked', self._refresh_clicked)
361
367
        self.toolbar.insert(refresh_button, -1)
362
368
 
562
568
        old = self.paned
563
569
        self.vbox.remove(old)
564
570
        self.vbox.pack_start(
565
 
            self.construct_paned(, True, True, 0), True, True, True, 0)
 
571
            self.construct_paned(), True, True, True, 0)
566
572
        self._make_diff_paned_nonzero_size()
567
573
        self._make_diff_nonzero_size()
568
574
 
620
626
            for tag, revid in tags:
621
627
                tag_image = Gtk.Image()
622
628
                tag_image.set_from_file(icon_path('tag-16.png'))
623
 
                tag_item = Gtk.ImageMenuItem(tag.replace('_', '__'))
 
629
                tag_item = Gtk.ImageMenuItem.new_with_mnemonic(
 
630
                    tag.replace('_', '__'))
624
631
                tag_item.set_image(tag_image)
625
632
                tag_item.connect('activate', self._tag_selected_cb, revid)
626
633
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))