-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from Tommimon/gnome-41-compatibility
Gnome 41 compatibility
- Loading branch information
Showing
9 changed files
with
162 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| const AppDisplay = imports.ui.appDisplay; | ||
|
|
||
| const ExtensionUtils = imports.misc.extensionUtils; | ||
| const Me = ExtensionUtils.getCurrentExtension(); | ||
| const ShortcutMaker = Me.imports.shortcutMaker; | ||
| const AppDisplay = imports.ui.appDisplay; | ||
|
|
||
| // Saves the standard Menu globally to be able to reset it on disable | ||
| var parentMenu = null; | ||
| var parentIcon = null; | ||
|
|
||
| function init () { | ||
|
|
||
| } | ||
|
|
||
| function enable () { | ||
| parentMenu = AppDisplay.AppIconMenu; | ||
| ShortcutMaker.editMenuClass(parentMenu); | ||
| parentIcon = AppDisplay.AppIcon; | ||
| ShortcutMaker.editIconClass(parentIcon); | ||
| } | ||
|
|
||
| function disable () { | ||
| // Reset the menu to the standard one (without new item) | ||
| AppDisplay.AppIconMenu = parentMenu; | ||
| AppDisplay.AppIcon = parentIcon; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,10 @@ | ||
| { | ||
| "description" : "An easy way to create desktop app shortcut in gnome", | ||
| "name" : "Add to Desktop", | ||
| "shell-version" : [ | ||
| "3.28", | ||
| "3.29", | ||
| "3.30", | ||
| "3.31", | ||
| "3.32", | ||
| "3.33", | ||
| "3.34", | ||
| "3.35", | ||
| "3.36", | ||
| "3.37", | ||
| "3.38", | ||
| "40.beta", | ||
| "40" | ||
| "description": "An easy way to create desktop app shortcut in gnome", | ||
| "name": "Add to Desktop", | ||
| "shell-version": [ | ||
| "41" | ||
| ], | ||
| "url" : "https://github.com/Tommimon/add-to-desktop", | ||
| "uuid" : "add-to-desktop@tommimon.github.com", | ||
| "version" : 5 | ||
| "url": "https://github.com/Tommimon/add-to-desktop", | ||
| "uuid": "add-to-desktop@tommimon.github.com", | ||
| "version": 6 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,145 +1,142 @@ | ||
| const ExtensionUtils = imports.misc.extensionUtils; | ||
| const Me = ExtensionUtils.getCurrentExtension(); | ||
| const Gio = imports.gi.Gio; | ||
| const GLib = imports.gi.GLib; | ||
| const AppDisplay = imports.ui.appDisplay; | ||
| const PopupMenu = imports.ui.popupMenu; | ||
| const Gettext = imports.gettext; | ||
| const Config = imports.misc.config; | ||
| Gettext.textdomain(Config.GETTEXT_PACKAGE); // use 'gnome-shell' as default domain | ||
| const shell_gettext = Gettext.gettext; | ||
| Gettext.bindtextdomain( 'add-to-desktop', Me.dir.get_child('locale').get_path()); | ||
|
|
||
| var DEFAULT_AND_UEXEC = 0o00764; | ||
|
|
||
| function _(stringIn) { | ||
| return Gettext.dgettext('add-to-desktop', stringIn) | ||
| } | ||
|
|
||
| // override the context menu rebuild method to add the new item | ||
| function editMenuClass(parentMenu) { | ||
| AppDisplay.AppIconMenu = class CustomMenu extends parentMenu { | ||
| // for shell version 3.35 or earlier | ||
| _redisplay() { | ||
| super._redisplay(); | ||
| insertAddToDesktopButton(this); | ||
| } | ||
|
|
||
| // for shell version 3.36 or later | ||
| _rebuildMenu() { | ||
| super._rebuildMenu(); | ||
| insertAddToDesktopButton(this); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function insertAddToDesktopButton(menu) { | ||
| // look for both english and translated | ||
| let nameArray = ['Add to Favorites', 'Remove from Favorites', shell_gettext('Add to Favorites'), shell_gettext('Remove from Favorites')] | ||
| let itemsArray = menu._getMenuItems(); | ||
| let pos = -1; | ||
| for(let i = itemsArray.length-1; i >= 0; i--) { | ||
| let item = itemsArray[i]; | ||
| // check class because there are also separators or other things | ||
| if(item instanceof PopupMenu.PopupMenuItem) { | ||
| let label = item.label.get_text(); | ||
| if(nameArray.includes(label)) { | ||
| pos = i; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let label = _('Add to Desktop'); | ||
| let item; | ||
| if(pos === -1) { | ||
| menu._appendSeparator(); | ||
| item = menu._appendMenuItem(label); // add at the end | ||
| } | ||
| else { | ||
| item = new PopupMenu.PopupMenuItem(label); | ||
| menu.addMenuItem(item, pos+1); // insert at specific position | ||
| } | ||
|
|
||
| item.connect('activate', () => { | ||
| let appPath = menu._source.app.get_app_info().get_filename(); // get the .desktop file complete path | ||
| let shortcutMaker = new ShortcutMaker(); | ||
| shortcutMaker.makeShortcut(appPath); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| var ShortcutMaker = class ShortcutMaker { | ||
| constructor() { | ||
| this._desktop = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP); | ||
| this._appPath = null; | ||
| this._appFile = null; | ||
| this._copyPath = null; | ||
| this._shortcutFile = null; | ||
| } | ||
|
|
||
| // calculates the copy path from the desktop path | ||
| getCopyPath() { | ||
| let array = this._appPath.split('/'); | ||
| let name = array.pop(); | ||
| return this._desktop + '/' + name; | ||
| } | ||
|
|
||
| makeShortcut(appPath) { | ||
| this._appPath = appPath; | ||
| this._appFile = Gio.File.new_for_path(this._appPath); | ||
| this._copyPath = this.getCopyPath(); | ||
| this._shortcutFile = Gio.File.new_for_path(this._copyPath); | ||
| this._createCopy(); | ||
| } | ||
|
|
||
| _createCopy() { | ||
| this._appFile.copy_async( | ||
| this._shortcutFile, | ||
| Gio.FileCopyFlags.OVERWRITE | Gio.FileCopyFlags.TARGET_DEFAULT_PERMS, | ||
| GLib.PRIORITY_DEFAULT, | ||
| null, | ||
| null, | ||
| (source, result) => { | ||
| try { | ||
| source.copy_finish(result); | ||
| this._setMetadata(); | ||
| } catch(e) { | ||
| log(`Failed to create shortcut file: ${e.message}`); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| // mark as trusted to allow launching | ||
| _setMetadata() { | ||
| let proc = new Gio.Subprocess({argv: ['gio', 'set', this._copyPath, 'metadata::trusted', 'true']}); | ||
| proc.init(null); | ||
| proc.wait_check_async(null, | ||
| (source, result) => { | ||
| try { | ||
| source.wait_check_finish(result); | ||
| this._setExecutableBit(); | ||
| } catch(e) { | ||
| log(`Failed to allow launching: ${e.message}`); | ||
| } | ||
| }); | ||
| //TODO: metadata::shortcut-of | ||
| } | ||
|
|
||
| // set executable bit last because this call refresh in desktop icon extension | ||
| _setExecutableBit() { | ||
| let new_info = new Gio.FileInfo(); | ||
| new_info.set_attribute_uint32(Gio.FILE_ATTRIBUTE_UNIX_MODE, DEFAULT_AND_UEXEC); | ||
| this._shortcutFile.set_attributes_async(new_info, | ||
| Gio.FileQueryInfoFlags.NONE, | ||
| GLib.PRIORITY_LOW, | ||
| null, | ||
| (source, result) => { | ||
| try { | ||
| source.set_attributes_finish (result); | ||
| log('Shortcut created successfully'); | ||
| } catch(e) { | ||
| log(`Failed to set unix mode: ${e.message}`); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| const ExtensionUtils = imports.misc.extensionUtils; | ||
| const Me = ExtensionUtils.getCurrentExtension(); | ||
| const { Gio, GLib, St, GObject } = imports.gi; | ||
| const AppDisplay = imports.ui.appDisplay; | ||
| const PopupMenu = imports.ui.popupMenu; | ||
| const Gettext = imports.gettext; | ||
| const Config = imports.misc.config; | ||
| Gettext.textdomain(Config.GETTEXT_PACKAGE); // use 'gnome-shell' as default domain | ||
| const shell_gettext = Gettext.gettext; | ||
| Gettext.bindtextdomain( 'add-to-desktop', Me.dir.get_child('locale').get_path()); | ||
|
|
||
| var DEFAULT_AND_UEXEC = 0o00764; | ||
|
|
||
| function _(stringIn) { | ||
| return Gettext.dgettext('add-to-desktop', stringIn) | ||
| } | ||
|
|
||
| // override the icon popupMenu method to add the new item | ||
| function editIconClass(parentIcon) { | ||
| AppDisplay.AppIcon = GObject.registerClass( | ||
| class CustomIcon extends parentIcon { | ||
| popupMenu(side = St.Side.LEFT) | ||
| if(!this._menu) { | ||
| super.popupMenu(side); | ||
| insertAddToDesktopButton(this._menu); | ||
| } | ||
| else { | ||
| super.popupMenu(side); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function insertAddToDesktopButton(menu) { | ||
| // look for both english and translated | ||
| let nameArray = ['Add to Favorites', 'Remove from Favorites', shell_gettext('Add to Favorites'), shell_gettext('Remove from Favorites')] | ||
| let itemsArray = menu._getMenuItems(); | ||
| let pos = -1; | ||
| for(let i = itemsArray.length-1; i >= 0; i--) { | ||
| let item = itemsArray[i]; | ||
| // check class because there are also separators or other things | ||
| if(item instanceof PopupMenu.PopupMenuItem) { | ||
| let label = item.label.get_text(); | ||
| if(nameArray.includes(label)) { | ||
| pos = i; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let label = _('Add to Desktop'); | ||
| item = new PopupMenu.PopupMenuItem(label); | ||
| if(pos === -1) { | ||
| menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); | ||
| menu.addMenuItem(item); // add at the end | ||
| } | ||
| else { | ||
| menu.addMenuItem(item, pos+1); // insert at specific position | ||
| } | ||
|
|
||
| item.connect('activate', () => { | ||
| let appPath = menu._app.get_app_info().get_filename(); // get the .desktop file complete path | ||
| let shortcutMaker = new ShortcutMaker(); | ||
| shortcutMaker.makeShortcut(appPath); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| var ShortcutMaker = class ShortcutMaker { | ||
| constructor() { | ||
| this._desktop = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP); | ||
| this._appPath = null; | ||
| this._appFile = null; | ||
| this._copyPath = null; | ||
| this._shortcutFile = null; | ||
| } | ||
|
|
||
| // calculates the copy path from the desktop path | ||
| getCopyPath() { | ||
| let array = this._appPath.split('/'); | ||
| let name = array.pop(); | ||
| return this._desktop + '/' + name; | ||
| } | ||
|
|
||
| makeShortcut(appPath) { | ||
| this._appPath = appPath; | ||
| this._appFile = Gio.File.new_for_path(this._appPath); | ||
| this._copyPath = this.getCopyPath(); | ||
| this._shortcutFile = Gio.File.new_for_path(this._copyPath); | ||
| this._createCopy(); | ||
| } | ||
|
|
||
| _createCopy() { | ||
| this._appFile.copy_async( | ||
| this._shortcutFile, | ||
| Gio.FileCopyFlags.OVERWRITE | Gio.FileCopyFlags.TARGET_DEFAULT_PERMS, | ||
| GLib.PRIORITY_DEFAULT, | ||
| null, | ||
| null, | ||
| (source, result) => { | ||
| try { | ||
| source.copy_finish(result); | ||
| this._setMetadata(); | ||
| } catch(e) { | ||
| log(`Failed to create shortcut file: ${e.message}`); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| // mark as trusted to allow launching | ||
| _setMetadata() { | ||
| let proc = new Gio.Subprocess({argv: ['gio', 'set', this._copyPath, 'metadata::trusted', 'true']}); | ||
| proc.init(null); | ||
| proc.wait_check_async(null, | ||
| (source, result) => { | ||
| try { | ||
| source.wait_check_finish(result); | ||
| this._setExecutableBit(); | ||
| } catch(e) { | ||
| log(`Failed to allow launching: ${e.message}`); | ||
| } | ||
| }); | ||
| //TODO: metadata::shortcut-of | ||
| } | ||
|
|
||
| // set executable bit last because this call refresh in desktop icon extension | ||
| _setExecutableBit() { | ||
| let new_info = new Gio.FileInfo(); | ||
| new_info.set_attribute_uint32(Gio.FILE_ATTRIBUTE_UNIX_MODE, DEFAULT_AND_UEXEC); | ||
| this._shortcutFile.set_attributes_async(new_info, | ||
| Gio.FileQueryInfoFlags.NONE, | ||
| GLib.PRIORITY_LOW, | ||
| null, | ||
| (source, result) => { | ||
| try { | ||
| source.set_attributes_finish (result); | ||
| log('Shortcut created successfully'); | ||
| } catch(e) { | ||
| log(`Failed to set unix mode: ${e.message}`); | ||
| } | ||
| }); | ||
| } | ||
| } |