More fixes

This commit is contained in:
Michael Webster 2013-03-06 22:08:11 -05:00
parent ca56fa8e19
commit e81b078789
3 changed files with 9 additions and 11 deletions

View File

@ -9,7 +9,6 @@ from gi.repository import Gio
try: try:
import sys import sys
sys.path.append('/usr/lib/linuxmint/mintMenu/plugins')
from gi.repository import Pango from gi.repository import Pango
import os import os
import commands import commands
@ -20,7 +19,6 @@ try:
import ctypes import ctypes
from ctypes import * from ctypes import *
import capi import capi
from execute import *
import xdg.Config import xdg.Config
except Exception, e: except Exception, e:
print e print e
@ -67,7 +65,7 @@ if not windowManager:
xdg.Config.setWindowManager( windowManager.upper() ) xdg.Config.setWindowManager( windowManager.upper() )
from easybuttons import iconManager from easybuttons import iconManager
#from execute import * COMMENTED DURING MIGRATION from execute import *
class MainWindow( object ): class MainWindow( object ):
"""This is the main class for the application""" """This is the main class for the application"""
@ -739,10 +737,8 @@ class MenuWin( object ):
self.loadSettings() self.loadSettings()
self.updateButton() self.updateButton()
def showAboutDialog( self, uicomponent, verb ): def showAboutDialog( self, action, userdata = None ):
Gtk.about_dialog_set_email_hook( lambda dialog, mail: gnomevfs.url_show( "mailto:" + mail ) )
Gtk.about_dialog_set_url_hook( lambda dialog, url: gnomevfs.url_show( url ) )
about = Gtk.AboutDialog() about = Gtk.AboutDialog()
about.set_name("mintMenu") about.set_name("mintMenu")
import commands import commands
@ -759,7 +755,7 @@ class MenuWin( object ):
except Exception, detail: except Exception, detail:
print detail print detail
about.set_comments( _("Advanced Gnome Menu") ) about.set_comments( _("Advanced Gnome Menu") )
about.set_authors( ["Clement Lefebvre <clem@linuxmint.com>", "Lars-Peter Clausen <lars@laprican.de>"] ) # about.set_authors( ["Clement Lefebvre <clem@linuxmint.com>", "Lars-Peter Clausen <lars@laprican.de>"] )
about.set_translator_credits(("translator-credits") ) about.set_translator_credits(("translator-credits") )
#about.set_copyright( _("Based on USP from S.Chanderbally") ) #about.set_copyright( _("Based on USP from S.Chanderbally") )
about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") ) about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") )

View File

@ -32,7 +32,7 @@ import matemenu
from user import home from user import home
GObject.threads_init() Gdk.threads_init()
# i18n # i18n
gettext.install("mintmenu", "/usr/share/linuxmint/locale") gettext.install("mintmenu", "/usr/share/linuxmint/locale")
@ -1001,8 +1001,9 @@ class pluginclass( object ):
startupMenuItem.connect( "toggled", self.onAddToStartup, widget ) startupMenuItem.connect( "toggled", self.onAddToStartup, widget )
mTree.connect( 'deactivate', self.onMenuPopupDeactivate) mTree.connect( 'deactivate', self.onMenuPopupDeactivate)
gtk.gtk_menu_popup(hash(mTree), None, None, None, 3, 0) gtk.gtk_menu_popup(hash(mTree), None, None, None, None, 0, 0)
#mTree.popup( None, None, None, event.button, event.time ) #mTree.popup( None, None, None, None, event.button, event.time )
print "sdfdfs"
return True return True
def onMenuPopupDeactivate( self, widget): def onMenuPopupDeactivate( self, widget):

View File

@ -258,9 +258,10 @@ class pluginclass( object ):
trashMenu.append(emptyTrashMenuItem) trashMenu.append(emptyTrashMenuItem)
trashMenu.show_all() trashMenu.show_all()
emptyTrashMenuItem.connect ( "activate", self.emptyTrash, widget ) emptyTrashMenuItem.connect ( "activate", self.emptyTrash, widget )
gtk.gtk_menu_popup(hash(trashMenu), None, None, None, 3, 0) gtk.gtk_menu_popup(trashMenu, None, None, None, None, 3, 0)
#trashMenu.popup( None, None, None, event.button, event.time ) #trashMenu.popup( None, None, None, event.button, event.time )
# self.mintMenuWin.grab() # self.mintMenuWin.grab()
return True
def emptyTrash( self, menu, widget): def emptyTrash( self, menu, widget):