diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index e979ae4a3..a3ab98606 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -1426,6 +1426,80 @@ } ] }, + { + "isClone": false, + "noteId": "3seOhtN8uLIY", + "notePath": [ + "pOsGYCXsbNQG", + "gh7bpGYxajRS", + "Vc8PjrjAGuOp", + "3seOhtN8uLIY" + ], + "title": "Tabs", + "notePosition": 50, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-dock-top", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "luNhaphA37EO", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "x0JgW8UqGXvq", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "oPVyFC7WL2Lp", + "isInheritable": false, + "position": 40 + } + ], + "format": "markdown", + "dataFileName": "Tabs.md", + "attachments": [ + { + "attachmentId": "b4aCeUxoyA9k", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Tabs_image.png" + }, + { + "attachmentId": "bSaBdT5sH1S7", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Tabs_image.png" + }, + { + "attachmentId": "HffqAHhqe69i", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "2_Tabs_image.png" + } + ] + }, { "isClone": false, "noteId": "xYmIYSP6wE3F", @@ -1436,7 +1510,7 @@ "xYmIYSP6wE3F" ], "title": "Launch Bar", - "notePosition": 80, + "notePosition": 90, "prefix": null, "isExpanded": false, "type": "text", @@ -1529,7 +1603,7 @@ "Ms1nauBra7gq" ], "title": "Quick search", - "notePosition": 90, + "notePosition": 100, "prefix": null, "isExpanded": false, "type": "text", @@ -1557,7 +1631,7 @@ "8YBEPzcpUgxw" ], "title": "Note buttons", - "notePosition": 100, + "notePosition": 110, "prefix": null, "isExpanded": false, "type": "text", @@ -1622,7 +1696,7 @@ "4TIF1oA4VQRO" ], "title": "Options", - "notePosition": 110, + "notePosition": 120, "prefix": null, "isExpanded": false, "type": "text", @@ -1650,7 +1724,7 @@ "luNhaphA37EO" ], "title": "Split View", - "notePosition": 120, + "notePosition": 130, "prefix": null, "isExpanded": false, "type": "text", @@ -1662,6 +1736,13 @@ "value": "bx bx-dock-right", "isInheritable": false, "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "3seOhtN8uLIY", + "isInheritable": false, + "position": 20 } ], "format": "markdown", diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Tabs_image.png b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Tabs_image.png new file mode 100644 index 000000000..0be0aadb9 Binary files /dev/null and b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Tabs_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/2_Tabs_image.png b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/2_Tabs_image.png new file mode 100644 index 000000000..2580b7eda Binary files /dev/null and b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/2_Tabs_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.md index 1e4ae61a4..24155c012 100644 --- a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.md +++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.md @@ -9,4 +9,5 @@ In Trilium, is possible to work with two or more notes side-by-side. * It is possible to have as many splits as desired, simply press again the button. * Only horizontal splits are possible, vertical or drag & dropping is not supported. * When at least one split is open, press the ![](https://file+.vscode-resource.vscode-cdn.net/home/elian/UI%20Elements/3_Split%20View_image.png)![](Split%20View_3_Split%20View_im.png) button next to it to close it. -* Use the ![](Split%20View_4_Split%20View_im.png)![](https://file+.vscode-resource.vscode-cdn.net/home/elian/UI%20Elements/4_Split%20View_image.png) or the ![](Split%20View_1_Split%20View_im.png)![](https://file+.vscode-resource.vscode-cdn.net/home/elian/UI%20Elements/1_Split%20View_image.png) button to move around the splits. \ No newline at end of file +* Use the ![](Split%20View_4_Split%20View_im.png)![](https://file+.vscode-resource.vscode-cdn.net/home/elian/UI%20Elements/4_Split%20View_image.png) or the ![](Split%20View_1_Split%20View_im.png)![](https://file+.vscode-resource.vscode-cdn.net/home/elian/UI%20Elements/1_Split%20View_image.png) button to move around the splits. +* Each [tab](Tabs.md) has its own split view configuration (e.g. one tab can have two notes in a split view, whereas the others are one-note views). \ No newline at end of file diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md new file mode 100644 index 000000000..89b72d055 --- /dev/null +++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md @@ -0,0 +1,30 @@ +# Tabs +![](2_Tabs_image.png) + +In Trilium, tabs allow easy switching between notes. + +## Layout + +Depending on the [Vertical and horizontal layout](Vertical%20and%20horizontal%20layout.md): + +* For the vertical layout, the tabs will be placed at the top but to the right of the [Note Tree](Note%20Tree.md). +* For the horizontal layout, the tabs will be placed at the top in full-width, above the [Note Tree](Note%20Tree.md), allowing for more tabs to be comfortably displayed. + +## Interaction + +* To create a new tab, press the ![](1_Tabs_image.png) button that is to the right of the last tab. +* To close a tab, press the corresponding ![](Tabs_image.png) button. +* For multitasking, tabs can be used alongside [Split View](Split%20View.md). Each tab can have one or more notes, displayed horizontally. +* Tabs can be reordered by drag-and-dropping it into a new position. +* An existing tab can be displayed in a new window by dragging the tab upwards or downwards. It is not possible to combine tabs back into another window. + +## Keyboard interaction + +Since tabs are a commonly used feature, there are multiple keyboard shortcuts that can be used: + +* Ctrl+T to open a new tab. +* Ctrl+W to close the current tab. +* Ctrl+Shift+T to reopen the last closed tab. +* Ctrl+Tab and Ctrl+Shift+Tab to go to the next or previous tab. +* Ctrl+1, Ctrl+2, up to Ctrl+9 to activate the first, second and up til ninth tab. +* There is also a shortcut to go to the last tab, but it is not assigned a key by default. \ No newline at end of file diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_image.png b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_image.png new file mode 100644 index 000000000..819891255 Binary files /dev/null and b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/!!!meta.json b/src/public/app/doc_notes/en/User Guide/!!!meta.json index 849576d52..47623834c 100644 --- a/src/public/app/doc_notes/en/User Guide/!!!meta.json +++ b/src/public/app/doc_notes/en/User Guide/!!!meta.json @@ -1426,6 +1426,80 @@ } ] }, + { + "isClone": false, + "noteId": "3seOhtN8uLIY", + "notePath": [ + "pOsGYCXsbNQG", + "gh7bpGYxajRS", + "Vc8PjrjAGuOp", + "3seOhtN8uLIY" + ], + "title": "Tabs", + "notePosition": 50, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-dock-top", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "luNhaphA37EO", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "x0JgW8UqGXvq", + "isInheritable": false, + "position": 30 + }, + { + "type": "relation", + "name": "internalLink", + "value": "oPVyFC7WL2Lp", + "isInheritable": false, + "position": 40 + } + ], + "format": "html", + "dataFileName": "Tabs.html", + "attachments": [ + { + "attachmentId": "b4aCeUxoyA9k", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Tabs_image.png" + }, + { + "attachmentId": "bSaBdT5sH1S7", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Tabs_image.png" + }, + { + "attachmentId": "HffqAHhqe69i", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "2_Tabs_image.png" + } + ] + }, { "isClone": false, "noteId": "xYmIYSP6wE3F", @@ -1436,7 +1510,7 @@ "xYmIYSP6wE3F" ], "title": "Launch Bar", - "notePosition": 80, + "notePosition": 90, "prefix": null, "isExpanded": false, "type": "text", @@ -1529,7 +1603,7 @@ "Ms1nauBra7gq" ], "title": "Quick search", - "notePosition": 90, + "notePosition": 100, "prefix": null, "isExpanded": false, "type": "text", @@ -1557,7 +1631,7 @@ "8YBEPzcpUgxw" ], "title": "Note buttons", - "notePosition": 100, + "notePosition": 110, "prefix": null, "isExpanded": false, "type": "text", @@ -1622,7 +1696,7 @@ "4TIF1oA4VQRO" ], "title": "Options", - "notePosition": 110, + "notePosition": 120, "prefix": null, "isExpanded": false, "type": "text", @@ -1650,7 +1724,7 @@ "luNhaphA37EO" ], "title": "Split View", - "notePosition": 120, + "notePosition": 130, "prefix": null, "isExpanded": false, "type": "text", @@ -1662,6 +1736,13 @@ "value": "bx bx-dock-right", "isInheritable": false, "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "3seOhtN8uLIY", + "isInheritable": false, + "position": 20 } ], "format": "html", diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Tabs_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Tabs_image.png new file mode 100644 index 000000000..0be0aadb9 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/1_Tabs_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/2_Tabs_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/2_Tabs_image.png new file mode 100644 index 000000000..2580b7eda Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/2_Tabs_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html index dc5a7ad7d..da5738b53 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html @@ -44,6 +44,9 @@ button to move around the splits. +
  • Each tab has its own split view configuration (e.g. + one tab can have two notes in a split view, whereas the others are one-note + views).
    • diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html new file mode 100644 index 000000000..f2ec4830c --- /dev/null +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html @@ -0,0 +1,63 @@ + + + + + + + + Tabs + + + +
    +

    Tabs

    + +
    +
    + +
    +

    In Trilium, tabs allow easy switching between notes.

    +

    Layout

    +

    Depending on the Vertical and horizontal layout:

    + +

    Interaction

    + +

    Keyboard interaction

    +

    Since tabs are a commonly used feature, there are multiple keyboard shortcuts + that can be used:

    + +
    +
    + + + \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_image.png new file mode 100644 index 000000000..819891255 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/navigation.html b/src/public/app/doc_notes/en/User Guide/navigation.html index 618b16448..7f1e3d568 100644 --- a/src/public/app/doc_notes/en/User Guide/navigation.html +++ b/src/public/app/doc_notes/en/User Guide/navigation.html @@ -91,6 +91,9 @@
  • Ribbon
    • +
  • Tabs +
  • Launch Bar