Started migration to MATE 1.5
This commit is contained in:
parent
e09333794a
commit
a0a431c5d0
@ -10,4 +10,4 @@ if len(sys.argv) > 1:
|
|||||||
os.system("rm -rf ~/.linuxmint/mintMenu")
|
os.system("rm -rf ~/.linuxmint/mintMenu")
|
||||||
print "All mintMenu settings are now restored to default"
|
print "All mintMenu settings are now restored to default"
|
||||||
else:
|
else:
|
||||||
os.system("/usr/lib/linuxmint/mintMenu/mintMenu.py run-in-window")
|
os.system("/usr/lib/linuxmint/mintMenu/mintMenu.py")
|
||||||
|
@ -1,32 +1,33 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
import gi
|
||||||
|
gi.require_version("Gtk", "2.0")
|
||||||
|
|
||||||
|
from gi.repository import Gtk, Gdk
|
||||||
|
from gi.repository import MatePanelApplet
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import sys
|
import sys
|
||||||
import gtk
|
|
||||||
import gtk.glade
|
|
||||||
import pango
|
import pango
|
||||||
import os
|
import os
|
||||||
import commands
|
import commands
|
||||||
import mateapplet
|
|
||||||
import gettext
|
import gettext
|
||||||
import traceback
|
import traceback
|
||||||
import time
|
import time
|
||||||
import gc
|
import gc
|
||||||
import xdg.Config
|
import xdg.Config
|
||||||
import pygtk
|
|
||||||
pygtk.require( "2.0" )
|
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
print e
|
print e
|
||||||
sys.exit( 1 )
|
sys.exit( 1 )
|
||||||
|
|
||||||
global mbindkey
|
#global mbindkey
|
||||||
# Load the key binding lib (developped by deskbar-applet, copied into mintMenu so we don't end up with an unnecessary dependency)
|
# Load the key binding lib (developped by deskbar-applet, copied into mintMenu so we don't end up with an unnecessary dependency)
|
||||||
try:
|
#try:
|
||||||
from deskbar.core.keybinder import tomboy_keybinder_bind as bind_key
|
# from deskbar.core.keybinder import tomboy_keybinder_bind as bind_key
|
||||||
except Exception, cause:
|
#except Exception, cause:
|
||||||
print "*********** Keybind Driver Load Failure **************"
|
# print "*********** Keybind Driver Load Failure **************"
|
||||||
print "Error Report : ", str(cause)
|
# print "Error Report : ", str(cause)
|
||||||
pass
|
# pass
|
||||||
|
|
||||||
# Rename the process
|
# Rename the process
|
||||||
architecture = commands.getoutput("uname -a")
|
architecture = commands.getoutput("uname -a")
|
||||||
@ -841,7 +842,7 @@ class MenuWin( object ):
|
|||||||
def create_menu(self):
|
def create_menu(self):
|
||||||
self.applet.setup_menu(self.propxml, self.verbs, None)
|
self.applet.setup_menu(self.propxml, self.verbs, None)
|
||||||
|
|
||||||
def menu_factory( applet, iid ):
|
def applet_factory( applet, iid, data ):
|
||||||
MenuWin( applet, iid )
|
MenuWin( applet, iid )
|
||||||
applet.show()
|
applet.show()
|
||||||
return True
|
return True
|
||||||
@ -850,19 +851,7 @@ def quit_all(widget):
|
|||||||
gtk.main_quit()
|
gtk.main_quit()
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
if len(sys.argv) == 2 and sys.argv[1] == "run-in-window":
|
MatePanelApplet.Applet.factory_main("MintMenuAppletFactory", True,
|
||||||
gtk.gdk.threads_init()
|
MatePanelApplet.Applet.__gtype__,
|
||||||
main_window = gtk.Window( gtk.WINDOW_TOPLEVEL )
|
applet_factory, None)
|
||||||
main_window.set_title( NAME )
|
|
||||||
main_window.connect( "destroy", quit_all )
|
|
||||||
app = mateapplet.Applet()
|
|
||||||
menu_factory( app, None )
|
|
||||||
app.reparent( main_window )
|
|
||||||
main_window.show()
|
|
||||||
gtk.gdk.threads_enter()
|
|
||||||
gtk.main()
|
|
||||||
gtk.gdk.threads_leave()
|
|
||||||
else:
|
|
||||||
mateapplet.matecomponent_factory("OAFIID:MATE_mintMenu_Factory",
|
|
||||||
mateapplet.Applet.__gtype__,
|
|
||||||
"mintMenu", "0", menu_factory)
|
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
<oaf_info>
|
|
||||||
<oaf_server iid="OAFIID:MATE_mintMenu_Factory"
|
|
||||||
type="exe" location="/usr/lib/linuxmint/mintMenu/mintMenu.py">
|
|
||||||
|
|
||||||
<oaf_attribute name="repo_ids" type="stringv">
|
|
||||||
<item value="IDL:MateComponent/GenericFactory:1.0"/>
|
|
||||||
<item value="IDL:MateComponent/Unknown:1.0"/>
|
|
||||||
</oaf_attribute>
|
|
||||||
<oaf_attribute name="name" type="string" value="mintMenu"/>
|
|
||||||
<oaf_attribute name="description" type="string" value="Advanced Menu"/>
|
|
||||||
</oaf_server>
|
|
||||||
|
|
||||||
<oaf_server iid="OAFIID:MATE_mintMenu"
|
|
||||||
type="factory" location="OAFIID:MATE_mintMenu_Factory">
|
|
||||||
|
|
||||||
<oaf_attribute name="repo_ids" type="stringv">
|
|
||||||
<item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
|
|
||||||
<item value="IDL:MateComponent/Control:1.0"/>
|
|
||||||
<item value="IDL:MateComponent/Unknown:1.0"/>
|
|
||||||
</oaf_attribute>
|
|
||||||
<oaf_attribute name="name" type="string" value="mintMenu"/>
|
|
||||||
<oaf_attribute name="description" type="string" value="Advanced Menu"/>
|
|
||||||
<oaf_attribute name="panel:category" type="string" value="Utilities"/>
|
|
||||||
<oaf_attribute name="panel:icon" type="string" value="/usr/lib/linuxmint/mintMenu/mint-logo.svg"/>
|
|
||||||
</oaf_server>
|
|
||||||
</oaf_info>
|
|
@ -0,0 +1,3 @@
|
|||||||
|
[D-BUS Service]
|
||||||
|
Name=org.mate.panel.applet.MintMenuAppletFactory
|
||||||
|
Exec=/usr/lib/linuxmint/mintMenu/mintMenu.py
|
@ -0,0 +1,13 @@
|
|||||||
|
[Applet Factory]
|
||||||
|
Id=MintMenuAppletFactory
|
||||||
|
InProcess=false
|
||||||
|
Location=/usr/lib/linuxmint/mintMenu/mintMenu.py
|
||||||
|
Name=MintMenu Applet Factory
|
||||||
|
Description=Advanced Menu
|
||||||
|
|
||||||
|
[MintMenuApplet]
|
||||||
|
Name=mintMenu
|
||||||
|
Description=Advanced Menu
|
||||||
|
Icon=/usr/lib/linuxmint/mintMenu/mint-logo.svg
|
||||||
|
MateComponentId=OAFIID:MATE_MintMenuApplet;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user