self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Desktop: Add global shortcut to show/hide Joplin (#2653)

Browse Source 
Previously it was possible to open Joplin by clicking on the tray icon.
This functionality is no longer available due to changes in Electron.

The following key combination will show or hide Joplin in the current workspace:

- macOS: `Cmd+Opt+J`
- Linux, Windows: `Ctrl+Alt+J`
This commit is contained in:
Helmut K. C. Tessarek 2020-03-15 20:36:18 -04:00 committed by GitHub
parent 63a2f7b7a5
commit 0863f0d564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ElectronClient/ElectronAppWrapper.js
View File

@ -1,4 +1,4 @@
const { BrowserWindow, Tray, screen } = require('electron'); const { BrowserWindow, Tray, screen, globalShortcut } = require('electron');
const { shim } = require('lib/shim'); const { shim } = require('lib/shim');
const url = require('url'); const url = require('url');
const path = require('path'); const path = require('path');
@ -243,6 +243,15 @@ class ElectronAppWrapper {
return false; return false;
} }
toggleWindowVisilibity() {
if (this.win_.isVisible()) {
this.win_.hide();
} else {
this.win_.setVisibleOnAllWorkspaces(true);
this.win_.show();
}
}
async start() { async start() {
// Since we are doing other async things before creating the window, we might miss // Since we are doing other async things before creating the window, we might miss
// the "ready" event. So we use the function below to make sure that the app is ready. // the "ready" event. So we use the function below to make sure that the app is ready.
@ -253,8 +262,17 @@ class ElectronAppWrapper {
this.createWindow(); this.createWindow();
const registerGlobalShortcut = globalShortcut.register('CommandOrControl+Alt+J', () => {
this.toggleWindowVisilibity();
});
if (!registerGlobalShortcut) {
console.warn('Could not register global shortcut');
}
this.electronApp_.on('before-quit', () => { this.electronApp_.on('before-quit', () => {
this.willQuitApp_ = true; this.willQuitApp_ = true;
globalShortcut.unregisterAll();
}); });
this.electronApp_.on('window-all-closed', () => { this.electronApp_.on('window-all-closed', () => {

4
README.md
View File

@ -303,6 +303,10 @@ Notes are sorted by "relevance". Currently it means the notes that contain the r
In the desktop application, press Ctrl+G or Cmd+G and type the title of a note to jump directly to it. You can also type `#` followed by a tag or `@` followed by a notebook title. In the desktop application, press Ctrl+G or Cmd+G and type the title of a note to jump directly to it. You can also type `#` followed by a tag or `@` followed by a notebook title.
# Global shortcut
In the desktop application, press `Cmd+Opt+J` (macOS) or `Ctrl+Alt+J` (Linux, Windows) to show or hide Joplin in the current workspace.
# Privacy # Privacy
Joplin values your privacy and security by giving you complete control over your information and digital footprint. Joplin values your privacy and security by giving you complete control over your information and digital footprint.