move images to /usr/share
| @ -69,7 +69,7 @@ class MainWindow( object ): | |||||||
| 
 | 
 | ||||||
|         self.detect_desktop_environment() |         self.detect_desktop_environment() | ||||||
| 
 | 
 | ||||||
|         self.icon = "/usr/lib/linuxmint/mintMenu/visualisation-logo.png" |         self.icon = "/usr/share/linuxmint/mintMenu/visualisation-logo.png" | ||||||
| 
 | 
 | ||||||
|         self.toggle = toggleButton |         self.toggle = toggleButton | ||||||
|         # Load UI file and extract widgets    |         # Load UI file and extract widgets    | ||||||
| @ -732,7 +732,7 @@ class MenuWin( object ): | |||||||
|       #  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/share/linuxmint/mintMenu/icon.svg") ) | ||||||
|         about.connect( "response", lambda dialog, r: dialog.destroy() ) |         about.connect( "response", lambda dialog, r: dialog.destroy() ) | ||||||
|         about.show() |         about.show() | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -40,7 +40,7 @@ class mintMenuConfig( object ): | |||||||
| 
 | 
 | ||||||
|         #i18n |         #i18n | ||||||
|         self.mainWindow.set_title(_("Menu preferences")) |         self.mainWindow.set_title(_("Menu preferences")) | ||||||
|         self.mainWindow.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") |         self.mainWindow.set_icon_from_file("/usr/share/linuxmint/mintMenu/icon.svg") | ||||||
| 
 | 
 | ||||||
|         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane")) |         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane")) | ||||||
|         self.builder.get_object("showButtonIcon").set_label(_("Show button icon")) |         self.builder.get_object("showButtonIcon").set_label(_("Show button icon")) | ||||||
| @ -427,7 +427,7 @@ class mintMenuConfig( object ): | |||||||
|         newPlaceDialog = self.builder.get_object( "editPlaceDialog" ) |         newPlaceDialog = self.builder.get_object( "editPlaceDialog" ) | ||||||
|         folderChooserDialog = self.builder.get_object( "fileChooserDialog" ) |         folderChooserDialog = self.builder.get_object( "fileChooserDialog" ) | ||||||
|         newPlaceDialog.set_transient_for(self.mainWindow) |         newPlaceDialog.set_transient_for(self.mainWindow) | ||||||
|         newPlaceDialog.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") |         newPlaceDialog.set_icon_from_file("/usr/share/linuxmint/mintMenu/icon.svg") | ||||||
|         newPlaceDialog.set_title(self.newPlaceDialogTitle) |         newPlaceDialog.set_title(self.newPlaceDialogTitle) | ||||||
|         folderChooserDialog.set_title(self.folderChooserDialogTitle) |         folderChooserDialog.set_title(self.folderChooserDialogTitle) | ||||||
|         newPlaceDialog.set_default_response(Gtk.ResponseType.OK) |         newPlaceDialog.set_default_response(Gtk.ResponseType.OK) | ||||||
| @ -458,7 +458,7 @@ class mintMenuConfig( object ): | |||||||
|         editPlaceDialog = self.builder.get_object( "editPlaceDialog" ) |         editPlaceDialog = self.builder.get_object( "editPlaceDialog" ) | ||||||
|         folderChooserDialog = self.builder.get_object( "fileChooserDialog" ) |         folderChooserDialog = self.builder.get_object( "fileChooserDialog" ) | ||||||
|         editPlaceDialog.set_transient_for(self.mainWindow) |         editPlaceDialog.set_transient_for(self.mainWindow) | ||||||
|         editPlaceDialog.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") |         editPlaceDialog.set_icon_from_file("/usr/share/linuxmint/mintMenu/icon.svg") | ||||||
|         editPlaceDialog.set_title(self.editPlaceDialogTitle) |         editPlaceDialog.set_title(self.editPlaceDialogTitle) | ||||||
|         folderChooserDialog.set_title(self.folderChooserDialogTitle) |         folderChooserDialog.set_title(self.folderChooserDialogTitle) | ||||||
|         editPlaceDialog.set_default_response(Gtk.ResponseType.OK) |         editPlaceDialog.set_default_response(Gtk.ResponseType.OK) | ||||||
|  | |||||||
| @ -632,14 +632,14 @@ class pluginclass( object ): | |||||||
|         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") |         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") | ||||||
|         suggestionButton.connect("clicked", self.search_google) |         suggestionButton.connect("clicked", self.search_google) | ||||||
|         suggestionButton.set_text(_("Search Google for %s") % text) |         suggestionButton.set_text(_("Search Google for %s") % text) | ||||||
|         suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico") |         suggestionButton.set_image("/usr/share/linuxmint/mintMenu/search_engines/google.ico") | ||||||
|         self.applicationsBox.add(suggestionButton) |         self.applicationsBox.add(suggestionButton) | ||||||
|         self.suggestions.append(suggestionButton) |         self.suggestions.append(suggestionButton) | ||||||
|          |          | ||||||
|         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") |         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") | ||||||
|         suggestionButton.connect("clicked", self.search_wikipedia) |         suggestionButton.connect("clicked", self.search_wikipedia) | ||||||
|         suggestionButton.set_text(_("Search Wikipedia for %s") % text) |         suggestionButton.set_text(_("Search Wikipedia for %s") % text) | ||||||
|         suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico") |         suggestionButton.set_image("/usr/share/linuxmint/mintMenu/search_engines/wikipedia.ico") | ||||||
|         self.applicationsBox.add(suggestionButton) |         self.applicationsBox.add(suggestionButton) | ||||||
|         self.suggestions.append(suggestionButton) |         self.suggestions.append(suggestionButton) | ||||||
|                  |                  | ||||||
| @ -655,7 +655,7 @@ class pluginclass( object ): | |||||||
|         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") |         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "") | ||||||
|         suggestionButton.connect("clicked", self.search_dictionary) |         suggestionButton.connect("clicked", self.search_dictionary) | ||||||
|         suggestionButton.set_text(_("Lookup %s in Dictionary") % text) |         suggestionButton.set_text(_("Lookup %s in Dictionary") % text) | ||||||
|         suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png") |         suggestionButton.set_image("/usr/share/linuxmint/mintMenu/search_engines/dictionary.png") | ||||||
|         self.applicationsBox.add(suggestionButton) |         self.applicationsBox.add(suggestionButton) | ||||||
|         self.suggestions.append(suggestionButton)   |         self.suggestions.append(suggestionButton)   | ||||||
|          |          | ||||||
| @ -1047,14 +1047,14 @@ class pluginclass( object ): | |||||||
| 
 | 
 | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Search Google")) |         menuItem = Gtk.ImageMenuItem(_("Search Google")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/google.ico') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_google) |         menuItem.connect("activate", self.search_google) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
|          |          | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Search Wikipedia")) |         menuItem = Gtk.ImageMenuItem(_("Search Wikipedia")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/wikipedia.ico') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_wikipedia) |         menuItem.connect("activate", self.search_wikipedia) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
| @ -1064,7 +1064,7 @@ class pluginclass( object ): | |||||||
|          |          | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary")) |         menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/dictionary.png') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_dictionary) |         menuItem.connect("activate", self.search_dictionary) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
| @ -1081,35 +1081,35 @@ class pluginclass( object ): | |||||||
|          |          | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Find Software")) |         menuItem = Gtk.ImageMenuItem(_("Find Software")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/software.png') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/software.png') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_mint_software) |         menuItem.connect("activate", self.search_mint_software) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
|          |          | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Find Tutorials")) |         menuItem = Gtk.ImageMenuItem(_("Find Tutorials")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/tutorials.png') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/tutorials.png') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_mint_tutorials) |         menuItem.connect("activate", self.search_mint_tutorials) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
|          |          | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Find Hardware")) |         menuItem = Gtk.ImageMenuItem(_("Find Hardware")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/hardware.png') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/hardware.png') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_mint_hardware) |         menuItem.connect("activate", self.search_mint_hardware) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
|          |          | ||||||
|         menuItem =Gtk.ImageMenuItem(_("Find Ideas")) |         menuItem =Gtk.ImageMenuItem(_("Find Ideas")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/ideas.png') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/ideas.png') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_mint_ideas) |         menuItem.connect("activate", self.search_mint_ideas) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
|          |          | ||||||
|         menuItem = Gtk.ImageMenuItem(_("Find Users")) |         menuItem = Gtk.ImageMenuItem(_("Find Users")) | ||||||
|         img = Gtk.Image() |         img = Gtk.Image() | ||||||
|         img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/users.png') |         img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/users.png') | ||||||
|         menuItem.set_image(img) |         menuItem.set_image(img) | ||||||
|         menuItem.connect("activate", self.search_mint_users) |         menuItem.connect("activate", self.search_mint_users) | ||||||
|         menu.append(menuItem) |         menu.append(menuItem) | ||||||
|  | |||||||
| @ -69,7 +69,7 @@ | |||||||
|     </key> |     </key> | ||||||
|      |      | ||||||
|     <key type="s" name="applet-icon"> |     <key type="s" name="applet-icon"> | ||||||
|       <default>"/usr/lib/linuxmint/mintMenu/visualisation-logo.png"</default> |       <default>"/usr/share/linuxmint/mintMenu/visualisation-logo.png"</default> | ||||||
|       <summary></summary> |       <summary></summary> | ||||||
|       <description></description> |       <description></description> | ||||||
|     </key> |     </key> | ||||||
|  | |||||||
| Before Width: | Height: | Size: 204 B After Width: | Height: | Size: 204 B | 
| Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB | 
| Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB | 
| Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB | 
| Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 733 B After Width: | Height: | Size: 733 B | 
| Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB | 
| Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 411 B After Width: | Height: | Size: 411 B | 
| Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB | 
| Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB | 
| Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B | 
| Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB | 
| @ -8,6 +8,6 @@ Description=Advanced Menu | |||||||
| [MintMenuApplet] | [MintMenuApplet] | ||||||
| Name=mintMenu | Name=mintMenu | ||||||
| Description=Advanced Menu | Description=Advanced Menu | ||||||
| Icon=/usr/lib/linuxmint/mintMenu/mint-logo.svg | Icon=/usr/share/linuxmint/mintMenu/mint-logo.svg | ||||||
| MateComponentId=OAFIID:MATE_MintMenuApplet; | MateComponentId=OAFIID:MATE_MintMenuApplet; | ||||||
| 
 | 
 | ||||||
|  | |||||||