those darn double quotes...

This commit is contained in:
James Newton 2007-11-16 23:33:05 +00:00
parent c2b901dfe9
commit b1c5bc3984
1 changed files with 25 additions and 24 deletions

View File

@ -5184,47 +5184,48 @@ class RosterWindow:
def setup_for_osx(self): def setup_for_osx(self):
# Massage the GTK menu so it will match up to the OS/X nib style menu # Massage the GTK menu so it will match up to the OS/X nib style menu
# when passed to sync-menu and merged # when passed to sync-menu and merged
main_menu = self.xml.get_widget("menubar") print "FOOOOO"
app_item = gtk.MenuItem("Gajim") main_menu = self.xml.get_widget('menubar')
app_item = gtk.MenuItem('Gajim')
main_menu.insert(app_item, 0) main_menu.insert(app_item, 0)
win_item = gtk.MenuItem("Window") win_item = gtk.MenuItem('Window')
main_menu.insert(win_item, 4) main_menu.insert(win_item, 4)
actions_menu = self.xml.get_widget("actions_menu_menu") actions_menu = self.xml.get_widget('actions_menu_menu')
quit_item = self.xml.get_widget("quit_menuitem") quit_item = self.xml.get_widget('quit_menuitem')
actions_menu.remove(quit_item) actions_menu.remove(quit_item)
actions_menu.remove(self.xml.get_widget("separator1")) actions_menu.remove(self.xml.get_widget('separator1'))
edit_menu = self.xml.get_widget("edit_menu_menu") edit_menu = self.xml.get_widget('edit_menu_menu')
#edit_menu.remove(self.xml.get_widget("preferences_menuitem")) #edit_menu.remove(self.xml.get_widget('preferences_menuitem'))
edit_menu.remove(self.xml.get_widget("separator2")) edit_menu.remove(self.xml.get_widget('separator2'))
help_menu = self.xml.get_widget("help_menu_menu") help_menu = self.xml.get_widget('help_menu_menu')
about_item = self.xml.get_widget("about_menuitem") about_item = self.xml.get_widget('about_menuitem')
help_menu.remove(about_item) help_menu.remove(about_item)
# Build up App menu # Build up App menu
app_menu = gtk.Menu() app_menu = gtk.Menu()
app_item.set_submenu(app_menu) app_item.set_submenu(app_menu)
app_menu.append(about_item) app_menu.append(about_item)
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
prefs_item = gtk.MenuItem("Preferences...") prefs_item = gtk.MenuItem('Preferences...')
prefs_item.connect("activate", self.on_preferences_menuitem_activate) prefs_item.connect('activate', self.on_preferences_menuitem_activate)
accels = gtk.AccelGroup() accels = gtk.AccelGroup()
self.xml.get_widget("roster_window").add_accel_group(accels) self.xml.get_widget('roster_window').add_accel_group(accels)
prefs_item.add_accelerator("activate", accels, ord(','), prefs_item.add_accelerator('activate', accels, ord(','),
gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
app_menu.append(prefs_item) app_menu.append(prefs_item)
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(gtk.MenuItem("__SKIP__")) app_menu.append(gtk.MenuItem('__SKIP__'))
app_menu.append(quit_item) app_menu.append(quit_item)
app_menu.show_all() app_menu.show_all()
# Do the merge baby! # Do the merge baby!
syncmenu.takeover_menu(main_menu) syncmenu.takeover_menu(main_menu)
self.make_menu(force = True) self.make_menu(force = True)
# Hide the GTK menubar itself and let the OS/X menubar do its thing # Hide the GTK menubar itself and let the OS/X menubar do its thing
#self.xml.get_widget("menubar").hide() #self.xml.get_widget('menubar').hide()
return return
def __init__(self): def __init__(self):