diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 86a91047a..4e9150ea8 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -12,8 +12,10 @@ + + @@ -42,6 +44,7 @@ import WindowFactoryMain from "@/components/windowFactory/Main"; import FooterMain from "@/components/footer/Main"; import ContextMenuMain from "@/components/context_menu/Main"; + import DocumentationMain from "@/components/documentation/Main"; import UpdateWindow from "./windows/UpdateApp"; import SETTINGS from "./store/Settings"; @@ -58,7 +61,8 @@ WindowFactoryMain, FooterMain, ContextMenuMain, - JsonEditorHoverCard + JsonEditorHoverCard, + DocumentationMain }, created() { SETTINGS.setup(); diff --git a/src/renderer/components/documentation/Main.vue b/src/renderer/components/documentation/Main.vue new file mode 100644 index 000000000..6939b09a2 --- /dev/null +++ b/src/renderer/components/documentation/Main.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/renderer/components/editor_shell/JsonEditor/HoverCard.vue b/src/renderer/components/editor_shell/JsonEditor/HoverCard.vue index 5ba847b50..7a504a9d3 100644 --- a/src/renderer/components/editor_shell/JsonEditor/HoverCard.vue +++ b/src/renderer/components/editor_shell/JsonEditor/HoverCard.vue @@ -23,26 +23,29 @@ - - - + - {{ btn.icon }} - - {{ btn.title }} - - + + {{ btn.icon }} + + {{ btn.title }} + + @@ -53,6 +56,7 @@ import TabSystem from "../../../scripts/TabSystem"; import { clipboard } from "electron"; import { JSONAction } from "../../../scripts/TabSystem/CommonHistory"; import EventBus from '../../../scripts/EventBus'; +import { DOC_WINDOW } from '../../../scripts/documentation/main'; export default { name: "json-editor-hover-card", @@ -66,6 +70,17 @@ export default { return { current_comment: "", buttons: [ + { + title: "Documentation", + icon: "mdi-book-open-page-variant", + color: "orange", + action: () => { + DOC_WINDOW.open("entities"); + let e = document.getElementById(TabSystem.getCurrentNavContent()); + window.setTimeout(() => { if(e) e.scrollIntoView() }, 1000); + } + }, + "space", { title: "Move Down", icon: "mdi-chevron-down", diff --git a/src/renderer/components/editor_shell/JsonEditor/JsonInput.vue b/src/renderer/components/editor_shell/JsonEditor/JsonInput.vue index 811928072..620dea042 100644 --- a/src/renderer/components/editor_shell/JsonEditor/JsonInput.vue +++ b/src/renderer/components/editor_shell/JsonEditor/JsonInput.vue @@ -16,7 +16,7 @@ :label="label" :items="items" :auto-select-first="true" - :menu-props="{ maxHeight: 130, top: true }" + :menu-props="{ maxHeight: 130, top: false }" :hide-no-data="true" dense class="json-input-menu" diff --git a/src/renderer/components/editor_shell/JsonEditor/Main.vue b/src/renderer/components/editor_shell/JsonEditor/Main.vue index c9a8317d1..3f1cb6482 100644 --- a/src/renderer/components/editor_shell/JsonEditor/Main.vue +++ b/src/renderer/components/editor_shell/JsonEditor/Main.vue @@ -130,7 +130,7 @@ computed: { element_style() { if(this.first) { - return `height: ${this.available_height - 40}px; overflow: auto;` + return `height: ${this.available_height - 110}px; overflow: auto;` } return ""; }, diff --git a/src/renderer/components/sidebar/Content.vue b/src/renderer/components/sidebar/Content.vue index 531912c34..36f7e4219 100644 --- a/src/renderer/components/sidebar/Content.vue +++ b/src/renderer/components/sidebar/Content.vue @@ -2,6 +2,7 @@
+
@@ -9,6 +10,7 @@ \ No newline at end of file diff --git a/src/renderer/components/sidebar/content/Documentation.vue b/src/renderer/components/sidebar/content/Documentation.vue new file mode 100644 index 000000000..4419f602d --- /dev/null +++ b/src/renderer/components/sidebar/content/Documentation.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/components/sidebar/content/Explorer.vue b/src/renderer/components/sidebar/content/Explorer.vue index dc1ee8eef..82f44edd4 100644 --- a/src/renderer/components/sidebar/content/Explorer.vue +++ b/src/renderer/components/sidebar/content/Explorer.vue @@ -1,35 +1,35 @@