github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-03 06:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 023626aa62 into 11c8cc1e19

Browse Source
This commit is contained in:
Leonardo dos Santos Duarte Silva 2024-06-13 18:36:26 +00:00 committed by GitHub
commit 8be9c8f9ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docs/KEYBINDINGS_LINUX.md
View File

@ -6,21 +6,22 @@ MarkText key bindings for Linux. Please see [general key bindings](KEYBINDINGS.m
#### File menu #### File menu
| Id | Default | Description | | Id | Default | Description |
|:------------------- | --------------------------------------------- | ------------------------------------- | |:---------------------- | --------------------------------------------- | ------------------------------------- |
| `file.new-window` | <kbd>Ctrl</kbd>+<kbd>N</kbd> | New window | | `file.new-window` | <kbd>Ctrl</kbd>+<kbd>N</kbd> | New window |
| `file.new-tab` | <kbd>Ctrl</kbd>+<kbd>T</kbd> | New tab | | `file.new-tab` | <kbd>Ctrl</kbd>+<kbd>T</kbd> | New tab |
| `file.open-file` | <kbd>Ctrl</kbd>+<kbd>O</kbd> | Open markdown file | | `file.open-file` | <kbd>Ctrl</kbd>+<kbd>O</kbd> | Open markdown file |
| `file.open-folder` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> | Open folder | | `file.open-folder` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> | Open folder |
| `file.save` | <kbd>Ctrl</kbd>+<kbd>S</kbd> | Save | | `file.save` | <kbd>Ctrl</kbd>+<kbd>S</kbd> | Save |
| `file.save-as` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>S</kbd> | Save as... | | `file.save-as` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>S</kbd> | Save as... |
| `file.move-file` | - | Move current file to another location | | `file.export-file.pdf` | <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>E</kbd> | Export file as PDF |
| `file.rename-file` | - | Rename current file | | `file.move-file` | - | Move current file to another location |
| `file.print` | - | Print current tab | | `file.rename-file` | - | Rename current file |
| `file.preferences` | <kbd>Ctrl</kbd>+<kbd>,</kbd> | Open settings window | | `file.print` | - | Print current tab |
| `file.close-tab` | <kbd>Ctrl</kbd>+<kbd>W</kbd> | Close tab | | `file.preferences` | <kbd>Ctrl</kbd>+<kbd>,</kbd> | Open settings window |
| `file.close-window` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd> | Close window | | `file.close-tab` | <kbd>Ctrl</kbd>+<kbd>W</kbd> | Close tab |
| `file.quit` | <kbd>Ctrl</kbd>+<kbd>Q</kbd> | Quit MarkText | | `file.close-window` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd> | Close window |
| `file.quit` | <kbd>Ctrl</kbd>+<kbd>Q</kbd> | Quit MarkText |
#### Edit menu #### Edit menu

27
docs/KEYBINDINGS_OSX.md
View File

@ -15,19 +15,20 @@ MarkText key bindings for macOS. Please see [general key bindings](KEYBINDINGS.m
#### File menu #### File menu
| Id | Default | Description | | Id | Default | Description |
|:------------------- | ------------------------------------------------ | ------------------------------------- | |:---------------------- | ------------------------------------------------ | ------------------------------------- |
| `file.new-window` | <kbd>Command</kbd>+<kbd>N</kbd> | New window | | `file.new-window` | <kbd>Command</kbd>+<kbd>N</kbd> | New window |
| `file.new-tab` | <kbd>Command</kbd>+<kbd>T</kbd> | New tab | | `file.new-tab` | <kbd>Command</kbd>+<kbd>T</kbd> | New tab |
| `file.open-file` | <kbd>Command</kbd>+<kbd>O</kbd> | Open markdown file | | `file.open-file` | <kbd>Command</kbd>+<kbd>O</kbd> | Open markdown file |
| `file.open-folder` | <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> | Open folder | | `file.open-folder` | <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> | Open folder |
| `file.save` | <kbd>Command</kbd>+<kbd>S</kbd> | Save | | `file.save` | <kbd>Command</kbd>+<kbd>S</kbd> | Save |
| `file.save-as` | <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>S</kbd> | Save as... | | `file.save-as` | <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>S</kbd> | Save as... |
| `file.move-file` | - | Move current file to another location | | `file.export-file.pdf` | <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>E</kbd> | Export file as PDF |
| `file.rename-file` | - | Rename current file | | `file.move-file` | - | Move current file to another location |
| `file.print` | - | Print current tab | | `file.rename-file` | - | Rename current file |
| `file.close-tab` | <kbd>Command</kbd>+<kbd>W</kbd> | Close tab | | `file.print` | - | Print current tab |
| `file.close-window` | <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd> | Close window | | `file.close-tab` | <kbd>Command</kbd>+<kbd>W</kbd> | Close tab |
| `file.close-window` | <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd> | Close window |
#### Edit menu #### Edit menu

31
docs/KEYBINDINGS_WINDOWS.md
View File

@ -6,21 +6,22 @@ MarkText key bindings for Windows. Please see [general key bindings](KEYBINDINGS
#### File menu #### File menu
| Id | Default | Description | | Id | Default | Description |
|:------------------- | --------------------------------------------- | ------------------------------------- | |:---------------------- | --------------------------------------------- | ------------------------------------- |
| `file.new-window` | <kbd>Ctrl</kbd>+<kbd>N</kbd> | New window | | `file.new-window` | <kbd>Ctrl</kbd>+<kbd>N</kbd> | New window |
| `file.new-tab` | <kbd>Ctrl</kbd>+<kbd>T</kbd> | New tab | | `file.new-tab` | <kbd>Ctrl</kbd>+<kbd>T</kbd> | New tab |
| `file.open-file` | <kbd>Ctrl</kbd>+<kbd>O</kbd> | Open markdown file | | `file.open-file` | <kbd>Ctrl</kbd>+<kbd>O</kbd> | Open markdown file |
| `file.open-folder` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> | Open folder | | `file.open-folder` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>O</kbd> | Open folder |
| `file.save` | <kbd>Ctrl</kbd>+<kbd>S</kbd> | Save | | `file.save` | <kbd>Ctrl</kbd>+<kbd>S</kbd> | Save |
| `file.save-as` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>S</kbd> | Save as... | | `file.save-as` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>S</kbd> | Save as... |
| `file.move-file` | - | Move current file to another location | | `file.export-file.pdf` | <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>E</kbd> | Export file as PDF |
| `file.rename-file` | - | Rename current file | | `file.move-file` | - | Move current file to another location |
| `file.print` | - | Print current tab | | `file.rename-file` | - | Rename current file |
| `file.preferences` | <kbd>Ctrl</kbd>+<kbd>,</kbd> | Open settings window | | `file.print` | - | Print current tab |
| `file.close-tab` | <kbd>Ctrl</kbd>+<kbd>W</kbd> | Close tab | | `file.preferences` | <kbd>Ctrl</kbd>+<kbd>,</kbd> | Open settings window |
| `file.close-window` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd> | Close window | | `file.close-tab` | <kbd>Ctrl</kbd>+<kbd>W</kbd> | Close tab |
| `file.quit` | <kbd>Ctrl</kbd>+<kbd>Q</kbd> | Quit MarkText | | `file.close-window` | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>W</kbd> | Close window |
| `file.quit` | <kbd>Ctrl</kbd>+<kbd>Q</kbd> | Quit MarkText |
#### Edit menu #### Edit menu

1
src/common/commands/constants.js
View File

@ -35,6 +35,7 @@ const COMMANDS = Object.freeze({
FILE_RENAME_FILE: 'file.rename-file', FILE_RENAME_FILE: 'file.rename-file',
FILE_SAVE: 'file.save', FILE_SAVE: 'file.save',
FILE_SAVE_AS: 'file.save-as', FILE_SAVE_AS: 'file.save-as',
FILE_EXPORT_FILE_PDF: 'file.export-file.pdf',
// FILE_TOGGLE_AUTO_SAVE: 'file.toggle-auto-save', // FILE_TOGGLE_AUTO_SAVE: 'file.toggle-auto-save',
FORMAT_CLEAR_FORMAT: 'format.clear-format', FORMAT_CLEAR_FORMAT: 'format.clear-format',

3
src/main/keyboard/keybindingsDarwin.js
View File

@ -23,6 +23,9 @@ export default new Map([
['file.close-window', 'Command+Shift+W'], ['file.close-window', 'Command+Shift+W'],
['file.quit', 'Command+Q'], ['file.quit', 'Command+Q'],
// File > Export submenu
['file.export-file.pdf', 'Ctrl+Alt+E'],
// Edit menu // Edit menu
['edit.undo', 'Command+Z'], ['edit.undo', 'Command+Z'],
['edit.redo', 'Command+Shift+Z'], ['edit.redo', 'Command+Shift+Z'],

3
src/main/keyboard/keybindingsLinux.js
View File

@ -27,6 +27,9 @@ export default new Map([
['file.close-window', 'Ctrl+Shift+W'], ['file.close-window', 'Ctrl+Shift+W'],
['file.quit', 'Ctrl+Q'], ['file.quit', 'Ctrl+Q'],
// File > Export submenu
['file.export-file.pdf', 'Ctrl+Alt+E'],
// Edit menu // Edit menu
['edit.undo', 'Ctrl+Z'], ['edit.undo', 'Ctrl+Z'],
['edit.redo', 'Ctrl+Shift+Z'], ['edit.redo', 'Ctrl+Shift+Z'],

3
src/main/keyboard/keybindingsWindows.js
View File

@ -24,6 +24,9 @@ export default new Map([
['file.close-window', 'Ctrl+Shift+W'], ['file.close-window', 'Ctrl+Shift+W'],
['file.quit', 'Ctrl+Q'], ['file.quit', 'Ctrl+Q'],
// File > Export submenu
['file.export-file.pdf', 'Ctrl+Alt+E'],
// Edit menu // Edit menu
['edit.undo', 'Ctrl+Z'], ['edit.undo', 'Ctrl+Z'],
['edit.redo', 'Ctrl+Shift+Z'], ['edit.redo', 'Ctrl+Shift+Z'],

7
src/main/menu/actions/file.js
View File

@ -580,6 +580,12 @@ export const saveAs = win => {
} }
} }
export const exportPDF = win => {
if (win && win.webContents) {
exportFile(win, 'pdf')
}
}
export const autoSave = (menuItem, browserWindow) => { export const autoSave = (menuItem, browserWindow) => {
const { checked } = menuItem const { checked } = menuItem
ipcMain.emit('set-user-preference', { autoSave: checked }) ipcMain.emit('set-user-preference', { autoSave: checked })
@ -620,4 +626,5 @@ export const loadFileCommands = commandManager => {
commandManager.add(COMMANDS.FILE_RENAME_FILE, rename) commandManager.add(COMMANDS.FILE_RENAME_FILE, rename)
commandManager.add(COMMANDS.FILE_SAVE, save) commandManager.add(COMMANDS.FILE_SAVE, save)
commandManager.add(COMMANDS.FILE_SAVE_AS, saveAs) commandManager.add(COMMANDS.FILE_SAVE_AS, saveAs)
commandManager.add(COMMANDS.FILE_EXPORT_FILE_PDF, exportPDF)
} }

1
src/main/menu/templates/file.js
View File

@ -126,6 +126,7 @@ export default function (keybindings, userPreference, recentlyUsedFiles) {
} }
}, { }, {
label: 'PDF', label: 'PDF',
accelerator: keybindings.getAccelerator('file.export-file.pdf'),
click (menuItem, browserWindow) { click (menuItem, browserWindow) {
actions.exportFile(browserWindow, 'pdf') actions.exportFile(browserWindow, 'pdf')
} }

1
src/renderer/commands/descriptions.js
View File

@ -111,6 +111,7 @@ const commandDescriptions = Object.freeze({
'file.toggle-auto-save': 'File: Toggle Auto Save', 'file.toggle-auto-save': 'File: Toggle Auto Save',
'file.import-file': 'File: Import...', 'file.import-file': 'File: Import...',
'file.export-file': 'File: Export...', 'file.export-file': 'File: Export...',
'file.export-file.pdf': 'File: Export as PDF...',
'file.zoom': 'Window: Zoom...', 'file.zoom': 'Window: Zoom...',
'file.check-update': 'MarkText: Check for Updates...', 'file.check-update': 'MarkText: Check for Updates...',
'paragraph.reset-paragraph': 'Paragraph: Transform into Paragraph', 'paragraph.reset-paragraph': 'Paragraph: Transform into Paragraph',