From 490ae1c9fda3dd3ea27da330928e832289babfb2 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Thu, 5 Sep 2024 15:09:31 +0800 Subject: [PATCH 1/4] icon improvements --- src/public/app/widgets/buttons/global_menu.js | 18 +++++++++--------- src/public/app/widgets/highlights_list.js | 2 +- src/public/app/widgets/note_tree.js | 2 +- src/public/app/widgets/toc.js | 2 +- src/services/hidden_subtree.ts | 3 ++- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js index e4aed7ba7..de8c618f2 100644 --- a/src/public/app/widgets/buttons/global_menu.js +++ b/src/public/app/widgets/buttons/global_menu.js @@ -126,7 +126,7 @@ const TPL = `
  • - + ${t('global_menu.show_help')}
  • - + ${t('global_menu.about')}
    • diff --git a/src/public/app/widgets/highlights_list.js b/src/public/app/widgets/highlights_list.js index 032ae36ce..671352131 100644 --- a/src/public/app/widgets/highlights_list.js +++ b/src/public/app/widgets/highlights_list.js @@ -49,7 +49,7 @@ export default class HighlightsListWidget extends RightPanelWidget { get widgetButtons() { return [ new OnClickButtonWidget() - .icon("bx-slider") + .icon("bx-cog") .title("Options") .titlePlacement("left") .onClick(() => appContext.tabManager.openContextWithNote('_optionsTextNotes', {activate: true})) diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index 389e6f5cb..0869a03f6 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -106,7 +106,7 @@ const TPL = ` title="Scroll to active note" data-trigger-command="scrollToActiveNote"> - diff --git a/src/public/app/widgets/toc.js b/src/public/app/widgets/toc.js index aaad8bc82..65d2dbe19 100644 --- a/src/public/app/widgets/toc.js +++ b/src/public/app/widgets/toc.js @@ -61,7 +61,7 @@ export default class TocWidget extends RightPanelWidget { get widgetButtons() { return [ new OnClickButtonWidget() - .icon("bx-slider") + .icon("bx-cog") .title("Options") .titlePlacement("left") .onClick(() => appContext.tabManager.openContextWithNote('_optionsTextNotes', {activate: true})) diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts index 563da456f..c2a943041 100644 --- a/src/services/hidden_subtree.ts +++ b/src/services/hidden_subtree.ts @@ -48,7 +48,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = { id: '_hidden', title: 'Hidden Notes', type: 'doc', - icon: 'bx bx-chip', + icon: 'bx bx-hide', // we want to keep the hidden subtree always last, otherwise there will be problems with e.g., keyboard navigation // over tree when it's in the middle notePosition: 999_999_999, @@ -241,6 +241,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = { id: '_options', title: 'Options', type: 'book', + icon: 'bx-cog', children: [ { id: '_optionsAppearance', title: 'Appearance', type: 'contentWidget', icon: 'bx-layout' }, { id: '_optionsShortcuts', title: 'Shortcuts', type: 'contentWidget', icon: 'bxs-keyboard' }, From 89e073bf2817a19ebf3ec39846d776fed1c74953 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Thu, 5 Sep 2024 15:24:37 +0800 Subject: [PATCH 2/4] bx-map-alt->bxl-graphql --- docs/frontend_api/entities_fnote.js.html | 4 ++-- src/public/app/entities/fnote.js | 4 ++-- src/public/app/services/note_types.js | 4 ++-- src/public/app/widgets/ribbon_widgets/note_map.js | 2 +- src/services/hidden_subtree.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/frontend_api/entities_fnote.js.html b/docs/frontend_api/entities_fnote.js.html index 617d42f10..e29371a09 100644 --- a/docs/frontend_api/entities_fnote.js.html +++ b/docs/frontend_api/entities_fnote.js.html @@ -42,9 +42,9 @@ const NOTE_TYPE_ICONS = { "code": "bx bx-code", "render": "bx bx-extension", "search": "bx bx-file-find", - "relationMap": "bx bx-map-alt", + "relationMap": "bx bxl-graphql", "book": "bx bx-book", - "noteMap": "bx bx-map-alt", + "noteMap": "bx bxl-graphql", "mermaid": "bx bx-selection", "canvas": "bx bx-pen", "webView": "bx bx-globe-alt", diff --git a/src/public/app/entities/fnote.js b/src/public/app/entities/fnote.js index 60acdbf29..0850c39f4 100644 --- a/src/public/app/entities/fnote.js +++ b/src/public/app/entities/fnote.js @@ -14,9 +14,9 @@ const NOTE_TYPE_ICONS = { "code": "bx bx-code", "render": "bx bx-extension", "search": "bx bx-file-find", - "relationMap": "bx bx-map-alt", + "relationMap": "bx bxl-graphql", "book": "bx bx-book", - "noteMap": "bx bx-map-alt", + "noteMap": "bx bxl-graphql", "mermaid": "bx bx-selection", "canvas": "bx bx-pen", "webView": "bx bx-globe-alt", diff --git a/src/public/app/services/note_types.js b/src/public/app/services/note_types.js index 73314245d..c04b0a9f1 100644 --- a/src/public/app/services/note_types.js +++ b/src/public/app/services/note_types.js @@ -6,8 +6,8 @@ async function getNoteTypeItems(command) { { title: "Text", command: command, type: "text", uiIcon: "bx bx-note" }, { title: "Code", command: command, type: "code", uiIcon: "bx bx-code" }, { title: "Saved Search", command: command, type: "search", uiIcon: "bx bx-file-find" }, - { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bx-map-alt" }, - { title: "Note Map", command: command, type: "noteMap", uiIcon: "bx bx-map-alt" }, + { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bxl-graphql" }, + { title: "Note Map", command: command, type: "noteMap", uiIcon: "bx bxl-graphql" }, { title: "Render Note", command: command, type: "render", uiIcon: "bx bx-extension" }, { title: "Book", command: command, type: "book", uiIcon: "bx bx-book" }, { title: "Mermaid Diagram", command: command, type: "mermaid", uiIcon: "bx bx-selection" }, diff --git a/src/public/app/widgets/ribbon_widgets/note_map.js b/src/public/app/widgets/ribbon_widgets/note_map.js index b180190b9..25850793c 100644 --- a/src/public/app/widgets/ribbon_widgets/note_map.js +++ b/src/public/app/widgets/ribbon_widgets/note_map.js @@ -52,7 +52,7 @@ export default class NoteMapRibbonWidget extends NoteContextAwareWidget { return { show: this.isEnabled(), title: t("note_map.title"), - icon: 'bx bx-map-alt' + icon: 'bx bxl-graphql' }; } diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts index c2a943041..8d1219853 100644 --- a/src/services/hidden_subtree.ts +++ b/src/services/hidden_subtree.ts @@ -222,7 +222,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = { { id: '_lbJumpTo', title: 'Jump to Note', type: 'launcher', command: 'jumpToNote', icon: 'bx bx-send', attributes: [ { type: 'label', name: 'desktopOnly' } ] }, - { id: '_lbNoteMap', title: 'Note Map', type: 'launcher', targetNoteId: '_globalNoteMap', icon: 'bx bx-map-alt' }, + { id: '_lbNoteMap', title: 'Note Map', type: 'launcher', targetNoteId: '_globalNoteMap', icon: 'bx bxl-graphql' }, { id: '_lbCalendar', title: 'Calendar', type: 'launcher', builtinWidget: 'calendar', icon: 'bx bx-calendar' }, { id: '_lbRecentChanges', title: 'Recent Changes', type: 'launcher', command: 'showRecentChanges', icon: 'bx bx-history', attributes: [ { type: 'label', name: 'desktopOnly' } From 7186222393faf0bca64443a751f683d774dcd348 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Mon, 9 Sep 2024 14:30:22 +0800 Subject: [PATCH 3/4] Merge branch 'develop' into Icon_improvements --- docs/frontend_api/entities_fnote.js.html | 4 ++-- src/public/app/entities/fnote.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/frontend_api/entities_fnote.js.html b/docs/frontend_api/entities_fnote.js.html index e29371a09..628420857 100644 --- a/docs/frontend_api/entities_fnote.js.html +++ b/docs/frontend_api/entities_fnote.js.html @@ -42,7 +42,7 @@ const NOTE_TYPE_ICONS = { "code": "bx bx-code", "render": "bx bx-extension", "search": "bx bx-file-find", - "relationMap": "bx bxl-graphql", + "relationMap": "bx bx-map-alt", "book": "bx bx-book", "noteMap": "bx bxl-graphql", "mermaid": "bx bx-selection", @@ -570,7 +570,7 @@ class FNote { return workspaceIconClass; } else if (this.noteId === 'root') { - return "bx bx-chevrons-right"; + return "bx bx-home-alt-2"; } if (this.noteId === '_share') { return "bx bx-share-alt"; diff --git a/src/public/app/entities/fnote.js b/src/public/app/entities/fnote.js index 0850c39f4..e98a1be7c 100644 --- a/src/public/app/entities/fnote.js +++ b/src/public/app/entities/fnote.js @@ -14,7 +14,7 @@ const NOTE_TYPE_ICONS = { "code": "bx bx-code", "render": "bx bx-extension", "search": "bx bx-file-find", - "relationMap": "bx bxl-graphql", + "relationMap": "bx bx-map-alt", "book": "bx bx-book", "noteMap": "bx bxl-graphql", "mermaid": "bx bx-selection", @@ -543,7 +543,7 @@ class FNote { return workspaceIconClass; } else if (this.noteId === 'root') { - return "bx bx-chevrons-right"; + return "bx bx-home-alt-2"; } if (this.noteId === '_share') { return "bx bx-share-alt"; From 744d95382292f3484ff3d13f51888903fba727d9 Mon Sep 17 00:00:00 2001 From: SiriusXT <1160925501@qq.com> Date: Mon, 9 Sep 2024 20:15:35 +0800 Subject: [PATCH 4/4] icon improvement --- docs/frontend_api/entities_fnote.js.html | 4 ++-- src/public/app/entities/fnote.js | 4 ++-- src/public/app/services/note_types.js | 4 ++-- src/public/app/widgets/ribbon_widgets/note_map.js | 2 +- src/services/hidden_subtree.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/frontend_api/entities_fnote.js.html b/docs/frontend_api/entities_fnote.js.html index 628420857..655101712 100644 --- a/docs/frontend_api/entities_fnote.js.html +++ b/docs/frontend_api/entities_fnote.js.html @@ -42,9 +42,9 @@ const NOTE_TYPE_ICONS = { "code": "bx bx-code", "render": "bx bx-extension", "search": "bx bx-file-find", - "relationMap": "bx bx-map-alt", + "relationMap": "bx bxs-network-chart", "book": "bx bx-book", - "noteMap": "bx bxl-graphql", + "noteMap": "bx bxs-network-chart", "mermaid": "bx bx-selection", "canvas": "bx bx-pen", "webView": "bx bx-globe-alt", diff --git a/src/public/app/entities/fnote.js b/src/public/app/entities/fnote.js index e98a1be7c..b33b63cfd 100644 --- a/src/public/app/entities/fnote.js +++ b/src/public/app/entities/fnote.js @@ -14,9 +14,9 @@ const NOTE_TYPE_ICONS = { "code": "bx bx-code", "render": "bx bx-extension", "search": "bx bx-file-find", - "relationMap": "bx bx-map-alt", + "relationMap": "bx bxs-network-chart", "book": "bx bx-book", - "noteMap": "bx bxl-graphql", + "noteMap": "bx bxs-network-chart", "mermaid": "bx bx-selection", "canvas": "bx bx-pen", "webView": "bx bx-globe-alt", diff --git a/src/public/app/services/note_types.js b/src/public/app/services/note_types.js index 840237c8a..8bc30af6b 100644 --- a/src/public/app/services/note_types.js +++ b/src/public/app/services/note_types.js @@ -7,8 +7,8 @@ async function getNoteTypeItems(command) { { title: t("note_types.text"), command: command, type: "text", uiIcon: "bx bx-note" }, { title: t("note_types.code"), command: command, type: "code", uiIcon: "bx bx-code" }, { title: t("note_types.saved-search"), command: command, type: "search", uiIcon: "bx bx-file-find" }, - { title: t("note_types.relation-map"), command: command, type: "relationMap", uiIcon: "bx bx-map-alt" }, - { title: t("note_types.note-map"), command: command, type: "noteMap", uiIcon: "bx bxl-graphql" }, + { title: t("note_types.relation-map"), command: command, type: "relationMap", uiIcon: "bx bxs-network-chart" }, + { title: t("note_types.note-map"), command: command, type: "noteMap", uiIcon: "bx bxs-network-chart" }, { title: t("note_types.render-note"), command: command, type: "render", uiIcon: "bx bx-extension" }, { title: t("note_types.book"), command: command, type: "book", uiIcon: "bx bx-book" }, { title: t("note_types.mermaid-diagram"), command: command, type: "mermaid", uiIcon: "bx bx-selection" }, diff --git a/src/public/app/widgets/ribbon_widgets/note_map.js b/src/public/app/widgets/ribbon_widgets/note_map.js index 25850793c..63dafca87 100644 --- a/src/public/app/widgets/ribbon_widgets/note_map.js +++ b/src/public/app/widgets/ribbon_widgets/note_map.js @@ -52,7 +52,7 @@ export default class NoteMapRibbonWidget extends NoteContextAwareWidget { return { show: this.isEnabled(), title: t("note_map.title"), - icon: 'bx bxl-graphql' + icon: 'bx bxs-network-chart' }; } diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts index 8d1219853..d7ef45a8b 100644 --- a/src/services/hidden_subtree.ts +++ b/src/services/hidden_subtree.ts @@ -222,7 +222,7 @@ const HIDDEN_SUBTREE_DEFINITION: Item = { { id: '_lbJumpTo', title: 'Jump to Note', type: 'launcher', command: 'jumpToNote', icon: 'bx bx-send', attributes: [ { type: 'label', name: 'desktopOnly' } ] }, - { id: '_lbNoteMap', title: 'Note Map', type: 'launcher', targetNoteId: '_globalNoteMap', icon: 'bx bxl-graphql' }, + { id: '_lbNoteMap', title: 'Note Map', type: 'launcher', targetNoteId: '_globalNoteMap', icon: 'bx bxs-network-chart' }, { id: '_lbCalendar', title: 'Calendar', type: 'launcher', builtinWidget: 'calendar', icon: 'bx bx-calendar' }, { id: '_lbRecentChanges', title: 'Recent Changes', type: 'launcher', command: 'showRecentChanges', icon: 'bx bx-history', attributes: [ { type: 'label', name: 'desktopOnly' }