diff --git a/debian/changelog b/debian/changelog index 38ace4a..10182c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mintmenu (4.8.1) helena; urgency=low + + * Blueprint implemented: https://blueprints.launchpad.net/linuxmint/+spec/generic-branding + + -- Clement Lefebvre Wed, 29 Jul 2009 22:48:00 +0000 + mintmenu (4.7.9) gloria; urgency=low * Fix: Hitting enter on search does nothing (https://bugs.launchpad.net/bugs/399990) diff --git a/debian/control b/debian/control index 42d7dca..966177a 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: mintmenu Architecture: all -Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, mintsystem, mintinstall, deskbar-applet -Description: The Linux Mint Menu for Gnome +Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, mintinstall, deskbar-applet +Description: Advanced Gnome menu One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features. diff --git a/mintmenu.pot b/mintmenu.pot index 3b74e8e..692a0a3 100644 --- a/mintmenu.pot +++ b/mintmenu.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-27 12:44+0200\n" +"POT-Creation-Date: 2009-07-29 22:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,32 +16,36 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:264 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:44 +msgid "Menu" +msgstr "" + +#: usr/lib/linuxmint/mintMenu/mintMenu.py:265 msgid "Couldn't load plugin:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:338 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:339 msgid "Couldn't initialize plugin" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:583 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:584 msgid "Preferences" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:583 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:584 msgid "Edit menu" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:583 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:584 msgid "Reload plugins" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:583 +#: usr/lib/linuxmint/mintMenu/mintMenu.py:584 msgid "About" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenu.py:761 -msgid "GNOME Menu for Linux Mint" +#: usr/lib/linuxmint/mintMenu/mintMenu.py:762 +msgid "Advanced Gnome Menu" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenu.py:765 @@ -78,111 +82,111 @@ msgid "Packages to be removed" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:42 -msgid "mintMenu Preferences" -msgstr "" - -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:44 -msgid "Show sidepane" +msgid "Menu preferences" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:45 -msgid "Show button icon" +msgid "Show sidepane" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:46 -msgid "Use custom colors" +msgid "Show button icon" msgstr "" #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:47 +msgid "Use custom colors" +msgstr "" + +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:48 msgid "Show recent documents" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:49 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:50 msgid "Show application comments" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:50 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:51 msgid "Show category icons" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:51 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:52 msgid "Hover" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:52 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:53 msgid "Swap name and generic name" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:54 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55 msgid "Border width:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56 msgid "pixels" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57 msgid "Button text:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58 msgid "Options" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:59 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:193 msgid "Applications" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:60 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61 msgid "Colors" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:62 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:179 #: usr/lib/linuxmint/mintMenu/plugins/applications.py:184 msgid "Favorites" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:62 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:63 msgid "Main button" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:64 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:65 msgid "Background:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:65 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66 msgid "Headings:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:67 msgid "Borders:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:70 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71 msgid "Number of columns:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:72 #: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:73 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:74 msgid "Icon size:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:74 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75 msgid "Hover delay (ms):" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76 msgid "Button icon:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:77 msgid "Search command:" msgstr "" -#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:78 +#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:79 msgid "Keyboard shortcut:" msgstr "" diff --git a/usr/lib/bonobo/servers/mintMenu.server b/usr/lib/bonobo/servers/mintMenu.server index 1444532..b422b91 100755 --- a/usr/lib/bonobo/servers/mintMenu.server +++ b/usr/lib/bonobo/servers/mintMenu.server @@ -7,7 +7,7 @@ - + - + - + diff --git a/usr/lib/linuxmint/mintMenu/compile.pyc b/usr/lib/linuxmint/mintMenu/compile.pyc index 03093f2..92e559d 100644 Binary files a/usr/lib/linuxmint/mintMenu/compile.pyc and b/usr/lib/linuxmint/mintMenu/compile.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/icon.png b/usr/lib/linuxmint/mintMenu/icon.png new file mode 100644 index 0000000..94caff0 Binary files /dev/null and b/usr/lib/linuxmint/mintMenu/icon.png differ diff --git a/usr/lib/linuxmint/mintMenu/icon.svg b/usr/lib/linuxmint/mintMenu/icon.svg new file mode 100644 index 0000000..b7fb95a --- /dev/null +++ b/usr/lib/linuxmint/mintMenu/icon.svg @@ -0,0 +1,317 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 7ee5165..3b7791c 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -33,14 +33,16 @@ except Exception, cause: try: import dl libc = dl.open( "/lib/libc.so.6" ) - libc.call( "prctl", 15, "mintMenu", 0, 0, 0 ) + libc.call( "prctl", 15, "mintmenu", 0, 0, 0 ) libc.close() except ImportError: pass +# i18n +gettext.install("messages", "/usr/lib/linuxmint/mintMenu/locale") -NAME = u"mintMenu" -ICON = "/usr/lib/linuxmint/mintSystem/icon.png" +NAME = _("Menu") +ICON = "/usr/lib/linuxmint/mintMenu/icon.svg" PATH = os.path.abspath( os.path.dirname( sys.argv[0] ) ) sys.path.append( os.path.join( PATH , "plugins") ) @@ -52,8 +54,7 @@ from easybuttons import iconManager from easygconf import EasyGConf from execute import * -# i18n -gettext.install("messages", "/usr/lib/linuxmint/mintMenu/locale") + class MainWindow( object ): """This is the main class for the application""" @@ -639,7 +640,7 @@ class MenuWin( object ): self.hideIcon = self.gconf.get( "bool", "hide_applet_icon", False ) self.buttonText = self.gconf.get( "string", "applet_text", "Menu" ) self.hotkeyText = self.gconf.get( "string", "hot_key", "Super_L" ) - self.buttonIcon = self.gconf.get( "string", "applet_icon", "/usr/lib/linuxmint/mintMenu/mintMenu.png" ) + self.buttonIcon = self.gconf.get( "string", "applet_icon", "/usr/lib/linuxmint/mintMenu/icon.png" ) self.setIconSize( self.gconf.get( "int", "applet_icon_size", 2 ) ) def setIconSize( self, icon_size): @@ -744,12 +745,12 @@ class MenuWin( object ): 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.set_name( NAME ) + about.set_name("mintMenu") import commands - version = commands.getoutput("mint-apt-version mintmenu") + version = commands.getoutput("/usr/lib/linuxmint/mintMenu/version.py") about.set_version(version) try: - h = open('/usr/lib/linuxmint/mintSystem/GPL.txt','r') + h = open('/usr/share/common-licenses/GPL','r') s = h.readlines() gpl = "" for line in s: @@ -758,12 +759,11 @@ class MenuWin( object ): about.set_license(gpl) except Exception, detail: print detail - about.set_comments( _("GNOME Menu for Linux Mint") ) + about.set_comments( _("Advanced Gnome Menu") ) about.set_authors( ["Clement Lefebvre ", "Lars-Peter Clausen "] ) about.set_translator_credits(("translator-credits") ) - about.set_website( "http://www.linuxmint.com" ) about.set_copyright( _("Based on USP from S.Chanderbally") ) - about.set_logo( gtk.gdk.pixbuf_new_from_file("/usr/lib/linuxmint/mintSystem/icon.png") ) + about.set_logo( gtk.gdk.pixbuf_new_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") ) about.connect( "response", lambda dialog, r: dialog.destroy() ) about.show() diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.pyc b/usr/lib/linuxmint/mintMenu/mintMenu.pyc index 35b56cf..e3e8307 100644 Binary files a/usr/lib/linuxmint/mintMenu/mintMenu.pyc and b/usr/lib/linuxmint/mintMenu/mintMenu.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py index e1bd61c..366f4c3 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py @@ -39,7 +39,8 @@ class mintMenuConfig( object ): #i18n - wTree.get_widget("mainWindow").set_title(_("mintMenu Preferences")) + wTree.get_widget("mainWindow").set_title(_("Menu preferences")) + wTree.get_widget("mainWindow").set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") wTree.get_widget("showSidepane").set_label(_("Show sidepane")) wTree.get_widget("showButtonIcon").set_label(_("Show button icon")) diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.pyc b/usr/lib/linuxmint/mintMenu/mintMenuConfig.pyc index 092b6cb..7187c96 100644 Binary files a/usr/lib/linuxmint/mintMenu/mintMenuConfig.pyc and b/usr/lib/linuxmint/mintMenu/mintMenuConfig.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/mintRemove.pyc b/usr/lib/linuxmint/mintMenu/mintRemove.pyc index 7795ef8..508e032 100644 Binary files a/usr/lib/linuxmint/mintMenu/mintRemove.pyc and b/usr/lib/linuxmint/mintMenu/mintRemove.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/__init__.pyc b/usr/lib/linuxmint/mintMenu/plugins/__init__.pyc index 7c84772..656d185 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/__init__.pyc and b/usr/lib/linuxmint/mintMenu/plugins/__init__.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.pyc b/usr/lib/linuxmint/mintMenu/plugins/applications.pyc index cddbd16..2607b4a 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/applications.pyc and b/usr/lib/linuxmint/mintMenu/plugins/applications.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.pyc b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.pyc index eb274a7..2f7de0e 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.pyc and b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/easyfiles.pyc b/usr/lib/linuxmint/mintMenu/plugins/easyfiles.pyc index d5a498e..ab1e45e 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/easyfiles.pyc and b/usr/lib/linuxmint/mintMenu/plugins/easyfiles.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/easygconf.pyc b/usr/lib/linuxmint/mintMenu/plugins/easygconf.pyc index aa9707c..1b867fb 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/easygconf.pyc and b/usr/lib/linuxmint/mintMenu/plugins/easygconf.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/execute.pyc b/usr/lib/linuxmint/mintMenu/plugins/execute.pyc index 611289f..8dafd0a 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/execute.pyc and b/usr/lib/linuxmint/mintMenu/plugins/execute.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.pyc b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.pyc index 82af3c8..a10baf5 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.pyc and b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.pyc b/usr/lib/linuxmint/mintMenu/plugins/places.pyc index 1a68ad8..97a4c55 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/places.pyc and b/usr/lib/linuxmint/mintMenu/plugins/places.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.pyc b/usr/lib/linuxmint/mintMenu/plugins/recent.pyc index e376299..3c9524c 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/recent.pyc and b/usr/lib/linuxmint/mintMenu/plugins/recent.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py index dabab8c..f9de343 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py +++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py @@ -97,7 +97,7 @@ class pluginclass( object ): #Add standard items def do_standard_items( self ): - Button1 = easyButton( "/usr/lib/linuxmint/mintSystem/icon.png", self.iconsize, [_("Software manager")], -1, -1 ) + Button1 = easyButton( "/usr/lib/linuxmint/mintInstall/icon.svg", self.iconsize, [_("Software manager")], -1, -1 ) Button1.connect( "clicked", self.ButtonClicked, "mintinstall" ) Button1.show() self.systemBtnHolder.pack_start( Button1, False, False ) diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.pyc b/usr/lib/linuxmint/mintMenu/plugins/system_management.pyc index b65a3bc..80bd7d4 100644 Binary files a/usr/lib/linuxmint/mintMenu/plugins/system_management.pyc and b/usr/lib/linuxmint/mintMenu/plugins/system_management.pyc differ diff --git a/usr/lib/linuxmint/mintMenu/version.py b/usr/lib/linuxmint/mintMenu/version.py new file mode 100755 index 0000000..f5b01a9 --- /dev/null +++ b/usr/lib/linuxmint/mintMenu/version.py @@ -0,0 +1,13 @@ +#!/usr/bin/python + +import apt +import sys + +try: + cache = apt.Cache() + pkg = cache["mintmenu"] + print pkg.installedVersion +except: + pass + + diff --git a/usr/lib/linuxmint/mintMenu/version.pyc b/usr/lib/linuxmint/mintMenu/version.pyc new file mode 100644 index 0000000..3334c74 Binary files /dev/null and b/usr/lib/linuxmint/mintMenu/version.pyc differ