TagSpaces is an offline, open source, document manager with tagging support
fix menus
sytolk8ecf86820cea
diff --git a/src/renderer/content/links.ts b/assets/links.tssimilarity index 100%rename from src/renderer/content/links.tsrename to assets/links.tsdiff --git a/src/renderer/services/electron-menus.ts b/src/main/electron-menus.tssimilarity index 99%rename from src/renderer/services/electron-menus.tsrename to src/main/electron-menus.tsindex fb02d1d81..e9458920c 100644--- a/src/renderer/services/electron-menus.ts+++ b/src/main/electron-menus.ts@@ -17,7 +17,7 @@*/import { app, Menu, shell } from 'electron';-import Links from '-/content/links';+import Links from '../../assets/links';export default function buildDesktopMenu(props: any, i18n) {function quitApp() {diff --git a/app/electron-tray-menu.ts b/src/main/electron-tray-menu.tssimilarity index 100%rename from app/electron-tray-menu.tsrename to src/main/electron-tray-menu.tsdiff --git a/src/main/main.ts b/src/main/main.tsindex 0b581a951..eaebcb3c9 100644--- a/src/main/main.ts+++ b/src/main/main.ts@@ -22,13 +22,14 @@ import log from 'electron-log';import pm2 from '@elife/pm2';import propertiesReader from 'properties-reader';import fs from 'fs-extra';-import MenuBuilder from './menu';import { resolveHtmlPath } from './util';import windowStateKeeper from 'electron-window-state';import findFreePorts from 'find-free-ports';import settings from '../renderer/settings';import { getExtensions } from '../renderer/utils/extension-utils';import i18nInit from '../renderer/services/i18nInit';+import buildTrayIconMenu from './electron-tray-menu';+import buildDesktopMenu from './electron-menus';class AppUpdater {constructor() {@@ -295,6 +296,56 @@ function createNewWindowInstance(url?) {}}+function buildTrayMenu(i18n) {+ buildTrayIconMenu(+ {+ showTagSpaces,+ resumePlayback,+ createNewWindowInstance,+ openSearch: showSearch,+ toggleNewFileDialog: newTextFile,+ openNextFile: getNextFile,+ openPrevFile: getPreviousFile,+ quitApp: reloadApp,+ },+ i18n,+ process.platform === 'darwin',+ );+}++function buildAppMenu(i18n) {+ buildDesktopMenu(+ {+ showTagSpaces,+ openSearch: showSearch,+ toggleNewFileDialog: newTextFile,+ openNextFile: getNextFile,+ openPrevFile: getPreviousFile,+ quitApp: reloadApp,+ showCreateDirectoryDialog,+ toggleOpenLinkDialog,+ openLocationManagerPanel,+ openTagLibraryPanel,+ goBack,+ goForward,+ setZoomResetApp,+ setZoomInApp,+ setZoomOutApp,+ exitFullscreen,+ toggleSettingsDialog,+ openHelpFeedbackPanel,+ toggleKeysDialog,+ toggleOnboardingDialog,+ openURLExternally,+ toggleLicenseDialog,+ toggleThirdPartyLibsDialog,+ toggleAboutDialog,+ createNewWindowInstance,+ },+ i18n,+ );+}+/*const RESOURCES_PATH = app.isPackaged? path.join(process.resourcesPath, 'assets'): path.join(__dirname, '../../assets');@@ -372,7 +423,7 @@ function startWS() {}}-const createWindow = async () => {+const createWindow = async (i18n) => {let startupParameter = '';if (startupFilePath) {if (startupFilePath.startsWith('./') || startupFilePath.startsWith('.\\')) {@@ -460,8 +511,12 @@ const createWindow = async () => {},);- const menuBuilder = new MenuBuilder(mainWindow);- menuBuilder.buildMenu();+ try {+ buildAppMenu(i18n);+ buildTrayMenu(i18n);+ } catch (ex) {+ console.log('buildMenus', ex);+ }// Open urls in the user's browsermainWindow.webContents.setWindowOpenHandler((edata) => {@@ -511,18 +566,18 @@ app.whenReady().then(() => {return i18nInit().then((i18n) => {- createWindow();+ createWindow(i18n);app.on('activate', () => {// On macOS it's common to re-create a window in the app when the// dock icon is clicked and there are no other windows open.- if (mainWindow === null) createWindow();+ if (mainWindow === null) createWindow(i18n);});i18n.on('languageChanged', (lng) => {try {console.log('languageChanged:' + lng);- //buildAppMenu(i18n);- //buildTrayMenu(i18n);+ buildAppMenu(i18n);+ buildTrayMenu(i18n);} catch (ex) {console.log('languageChanged', ex);}diff --git a/src/main/menu.ts b/src/main/menu.tsdeleted file mode 100644index ba0fb7709..000000000--- a/src/main/menu.ts+++ /dev/null@@ -1,290 +0,0 @@-import {- app,- Menu,- shell,- BrowserWindow,- MenuItemConstructorOptions,-} from 'electron';--interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {- selector?: string;- submenu?: DarwinMenuItemConstructorOptions[] | Menu;-}--export default class MenuBuilder {- mainWindow: BrowserWindow;-- constructor(mainWindow: BrowserWindow) {- this.mainWindow = mainWindow;- }-- buildMenu(): Menu {- if (- process.env.NODE_ENV === 'development' ||- process.env.DEBUG_PROD === 'true'- ) {- this.setupDevelopmentEnvironment();- }-- const template =- process.platform === 'darwin'- ? this.buildDarwinTemplate()- : this.buildDefaultTemplate();-- const menu = Menu.buildFromTemplate(template);- Menu.setApplicationMenu(menu);-- return menu;- }-- setupDevelopmentEnvironment(): void {- this.mainWindow.webContents.on('context-menu', (_, props) => {- const { x, y } = props;-- Menu.buildFromTemplate([- {- label: 'Inspect element',- click: () => {- this.mainWindow.webContents.inspectElement(x, y);- },- },- ]).popup({ window: this.mainWindow });- });- }-- buildDarwinTemplate(): MenuItemConstructorOptions[] {- const subMenuAbout: DarwinMenuItemConstructorOptions = {- label: 'Electron',- submenu: [- {- label: 'About ElectronReact',- selector: 'orderFrontStandardAboutPanel:',- },- { type: 'separator' },- { label: 'Services', submenu: [] },- { type: 'separator' },- {- label: 'Hide ElectronReact',- accelerator: 'Command+H',- selector: 'hide:',- },- {- label: 'Hide Others',- accelerator: 'Command+Shift+H',- selector: 'hideOtherApplications:',- },- { label: 'Show All', selector: 'unhideAllApplications:' },- { type: 'separator' },- {- label: 'Quit',- accelerator: 'Command+Q',- click: () => {- app.quit();- },- },- ],- };- const subMenuEdit: DarwinMenuItemConstructorOptions = {- label: 'Edit',- submenu: [- { label: 'Undo', accelerator: 'Command+Z', selector: 'undo:' },- { label: 'Redo', accelerator: 'Shift+Command+Z', selector: 'redo:' },- { type: 'separator' },- { label: 'Cut', accelerator: 'Command+X', selector: 'cut:' },- { label: 'Copy', accelerator: 'Command+C', selector: 'copy:' },- { label: 'Paste', accelerator: 'Command+V', selector: 'paste:' },- {- label: 'Select All',- accelerator: 'Command+A',- selector: 'selectAll:',- },- ],- };- const subMenuViewDev: MenuItemConstructorOptions = {- label: 'View',- submenu: [- {- label: 'Reload',- accelerator: 'Command+R',- click: () => {- this.mainWindow.webContents.reload();- },- },- {- label: 'Toggle Full Screen',- accelerator: 'Ctrl+Command+F',- click: () => {- this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());- },- },- {- label: 'Toggle Developer Tools',- accelerator: 'Alt+Command+I',- click: () => {- this.mainWindow.webContents.toggleDevTools();- },- },- ],- };- const subMenuViewProd: MenuItemConstructorOptions = {- label: 'View',- submenu: [- {- label: 'Toggle Full Screen',- accelerator: 'Ctrl+Command+F',- click: () => {- this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen());- },- },- ],- };- const subMenuWindow: DarwinMenuItemConstructorOptions = {- label: 'Window',- submenu: [- {- label: 'Minimize',- accelerator: 'Command+M',- selector: 'performMiniaturize:',- },- { label: 'Close', accelerator: 'Command+W', selector: 'performClose:' },- { type: 'separator' },- { label: 'Bring All to Front', selector: 'arrangeInFront:' },- ],- };- const subMenuHelp: MenuItemConstructorOptions = {- label: 'Help',- submenu: [- {- label: 'Learn More',- click() {- shell.openExternal('https://electronjs.org');- },- },- {- label: 'Documentation',- click() {- shell.openExternal(- 'https://github.com/electron/electron/tree/main/docs#readme',- );- },- },- {- label: 'Community Discussions',- click() {- shell.openExternal('https://www.electronjs.org/community');- },- },- {- label: 'Search Issues',- click() {- shell.openExternal('https://github.com/electron/electron/issues');- },- },- ],- };-- const subMenuView =- process.env.NODE_ENV === 'development' ||- process.env.DEBUG_PROD === 'true'- ? subMenuViewDev- : subMenuViewProd;-- return [subMenuAbout, subMenuEdit, subMenuView, subMenuWindow, subMenuHelp];- }-- buildDefaultTemplate() {- const templateDefault = [- {- label: '&File',- submenu: [- {- label: '&Open',- accelerator: 'Ctrl+O',- },- {- label: '&Close',- accelerator: 'Ctrl+W',- click: () => {- this.mainWindow.close();- },- },- ],- },- {- label: '&View',- submenu:- process.env.NODE_ENV === 'development' ||- process.env.DEBUG_PROD === 'true'- ? [- {- label: '&Reload',- accelerator: 'Ctrl+R',- click: () => {- this.mainWindow.webContents.reload();- },- },- {- label: 'Toggle &Full Screen',- accelerator: 'F11',- click: () => {- this.mainWindow.setFullScreen(- !this.mainWindow.isFullScreen(),- );- },- },- {- label: 'Toggle &Developer Tools',- accelerator: 'Alt+Ctrl+I',- click: () => {- this.mainWindow.webContents.toggleDevTools();- },- },- ]- : [- {- label: 'Toggle &Full Screen',- accelerator: 'F11',- click: () => {- this.mainWindow.setFullScreen(- !this.mainWindow.isFullScreen(),- );- },- },- ],- },- {- label: 'Help',- submenu: [- {- label: 'Learn More',- click() {- shell.openExternal('https://electronjs.org');- },- },- {- label: 'Documentation',- click() {- shell.openExternal(- 'https://github.com/electron/electron/tree/main/docs#readme',- );- },- },- {- label: 'Community Discussions',- click() {- shell.openExternal('https://www.electronjs.org/community');- },- },- {- label: 'Search Issues',- click() {- shell.openExternal('https://github.com/electron/electron/issues');- },- },- ],- },- ];-- return templateDefault;- }-}diff --git a/src/renderer/components/HelpFeedbackPanel.tsx b/src/renderer/components/HelpFeedbackPanel.tsxindex b57f0bacd..e7bbaf9e8 100644--- a/src/renderer/components/HelpFeedbackPanel.tsx+++ b/src/renderer/components/HelpFeedbackPanel.tsx@@ -37,7 +37,7 @@ import TwitterIcon from '@mui/icons-material/Twitter';import ForumIcon from '@mui/icons-material/Forum';import ProTeaserIcon from '@mui/icons-material/FlightTakeoff';import { KeyShortcutsIcon, HelpIcon } from '-/components/CommonIcons';-import Links from '-/content/links';+import Links from 'assets/links';import { Pro } from '-/pro';import { openURLExternally } from '-/services/utils-io';import { classes, SidePanel } from '-/components/SidePanels.css';diff --git a/src/renderer/components/HowToStart.tsx b/src/renderer/components/HowToStart.tsxindex dc1117c30..20e44c591 100644--- a/src/renderer/components/HowToStart.tsx+++ b/src/renderer/components/HowToStart.tsx@@ -7,7 +7,7 @@ import StepLabel from '@mui/material/StepLabel';import StepContent from '@mui/material/StepContent';import Paper from '@mui/material/Paper';import Typography from '@mui/material/Typography';-import Links from '-/content/links';+import Links from 'assets/links';import { ProSign } from '-/components/HelperComponents';import { openURLExternally } from '-/services/utils-io';import { useTheme } from '@mui/material/styles';diff --git a/src/renderer/components/ProTeaser.tsx b/src/renderer/components/ProTeaser.tsxindex 274b84874..f88837b0f 100644--- a/src/renderer/components/ProTeaser.tsx+++ b/src/renderer/components/ProTeaser.tsx@@ -24,7 +24,7 @@ import CardContent from '@mui/material/CardContent';import Typography from '@mui/material/Typography';import CloseIcon from '@mui/icons-material/Close';import ProTeaserImage from '-/assets/images/pro-teaser.svg';-import Links from '-/content/links';+import Links from 'assets/links';import { openURLExternally } from '-/services/utils-io';import { useTranslation } from 'react-i18next';diff --git a/src/renderer/components/SearchPopover.tsx b/src/renderer/components/SearchPopover.tsxindex 33238f827..3f84f198a 100644--- a/src/renderer/components/SearchPopover.tsx+++ b/src/renderer/components/SearchPopover.tsx@@ -48,7 +48,7 @@ import { parseGeoLocation, parseLatLon } from '-/utils/geo';import { getSearches } from '-/reducers/searches';import { TS } from '-/tagspaces.namespace';import { ProLabel, BetaLabel, ProTooltip } from '-/components/HelperComponents';-import Links from '-/content/links';+import Links from 'assets/links';import {CreateFileIcon,FolderIcon,diff --git a/src/renderer/components/WelcomePanel.tsx b/src/renderer/components/WelcomePanel.tsxindex 17ddcf7e2..8d9d98244 100644--- a/src/renderer/components/WelcomePanel.tsx+++ b/src/renderer/components/WelcomePanel.tsx@@ -44,7 +44,7 @@ import {} from '-/components/CommonIcons';import { actions as AppActions, AppDispatch } from '-/reducers/app';import { getDesktopMode } from '-/reducers/settings';-import Links from '-/content/links';+import Links from 'assets/links';import { Pro } from '-/pro';import { TS } from '-/tagspaces.namespace';import HowToStart from '-/components/HowToStart';diff --git a/src/renderer/components/dialogs/AboutDialog.tsx b/src/renderer/components/dialogs/AboutDialog.tsxindex 2287c8e3e..f6d473b6b 100644--- a/src/renderer/components/dialogs/AboutDialog.tsx+++ b/src/renderer/components/dialogs/AboutDialog.tsx@@ -32,11 +32,10 @@ import versionMeta from '-/version.json';import { Pro } from '-/pro';import { getLastVersionPromise } from '-/reducers/settings';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';-import Links from '-/content/links';+import Links from 'assets/links';import useMediaQuery from '@mui/material/useMediaQuery';import { useTheme } from '@mui/material/styles';import AppConfig from '-/AppConfig';-import { Fullscreen } from '@mui/icons-material';import { openURLExternally } from '-/services/utils-io';import { useTranslation } from 'react-i18next';diff --git a/src/renderer/components/dialogs/LinkGeneratorDialog.tsx b/src/renderer/components/dialogs/LinkGeneratorDialog.tsxindex f704dc964..db9519970 100644--- a/src/renderer/components/dialogs/LinkGeneratorDialog.tsx+++ b/src/renderer/components/dialogs/LinkGeneratorDialog.tsx@@ -33,8 +33,7 @@ import InputAdornment from '@mui/material/InputAdornment';import TextField from '@mui/material/TextField';import MenuItem from '@mui/material/MenuItem';import PlatformIO from '-/services/platform-facade';-import { actions } from '-/reducers/app';-import Links from '-/content/links';+import Links from 'assets/links';import { useTranslation } from 'react-i18next';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { useNotificationContext } from '-/hooks/useNotificationContext';diff --git a/src/renderer/components/dialogs/OnboardingDialog.tsx b/src/renderer/components/dialogs/OnboardingDialog.tsxindex 228b3a301..05d679e07 100644--- a/src/renderer/components/dialogs/OnboardingDialog.tsx+++ b/src/renderer/components/dialogs/OnboardingDialog.tsx@@ -40,7 +40,7 @@ import {actions as SettingsActions,} from '-/reducers/settings';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';-import Links from '-/content/links';+import Links from 'assets/links';import { useTheme } from '@mui/material/styles';import useMediaQuery from '@mui/material/useMediaQuery';import { openURLExternally } from '-/services/utils-io';diff --git a/src/renderer/components/dialogs/ProTeaserDialog.tsx b/src/renderer/components/dialogs/ProTeaserDialog.tsxindex 9602fd32c..a618bd068 100644--- a/src/renderer/components/dialogs/ProTeaserDialog.tsx+++ b/src/renderer/components/dialogs/ProTeaserDialog.tsx@@ -28,7 +28,7 @@ import useMediaQuery from '@mui/material/useMediaQuery';import { getProTeaserIndex } from '-/reducers/app';import { useSelector } from 'react-redux';import { getProTeaserSlides } from '-/content/ProTeaserSlides';-import Links from '-/content/links';+import Links from 'assets/links';import { openURLExternally } from '-/services/utils-io';import { register } from 'swiper/element/bundle';import { Navigation, Pagination } from 'swiper/modules';diff --git a/src/renderer/components/dialogs/settings/SettingsDialog.tsx b/src/renderer/components/dialogs/settings/SettingsDialog.tsxindex 9d6615813..51bd62986 100644--- a/src/renderer/components/dialogs/settings/SettingsDialog.tsx+++ b/src/renderer/components/dialogs/settings/SettingsDialog.tsx@@ -36,7 +36,7 @@ import SettingsFileTypes from '../settings/SettingsFileTypes';import { clearAllURLParams } from '-/utils/dom';import SettingsAdvanced from '-/components/dialogs/settings/SettingsAdvanced';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';-import Links from '-/content/links';+import Links from 'assets/links';import SettingsExtensions from '-/components/dialogs/settings/SettingsExtensions';import { openURLExternally } from '-/services/utils-io';import { useTranslation } from 'react-i18next';diff --git a/src/renderer/components/menus/LocationManagerMenu.tsx b/src/renderer/components/menus/LocationManagerMenu.tsxindex 8d28896f1..16db3ed03 100644--- a/src/renderer/components/menus/LocationManagerMenu.tsx+++ b/src/renderer/components/menus/LocationManagerMenu.tsx@@ -32,7 +32,7 @@ import { useDispatch } from 'react-redux';import AppConfig from '-/AppConfig';import { Pro } from '../../pro';import { AppDispatch } from '-/reducers/app';-import Links from '-/content/links';+import Links from 'assets/links';import { ProLabel } from '-/components/HelperComponents';import {OpenLinkIcon,diff --git a/src/renderer/components/menus/SearchMenu.tsx b/src/renderer/components/menus/SearchMenu.tsxindex 49edf6e27..a8deee89a 100644--- a/src/renderer/components/menus/SearchMenu.tsx+++ b/src/renderer/components/menus/SearchMenu.tsx@@ -24,7 +24,7 @@ import MenuItem from '@mui/material/MenuItem';import HelpIcon from '@mui/icons-material/Help';import ExportImportIcon from '@mui/icons-material/SwapHoriz';import { Pro } from '../../pro';-import Links from '-/content/links';+import Links from 'assets/links';import { ProLabel } from '-/components/HelperComponents';import { openURLExternally } from '-/services/utils-io';import { useTranslation } from 'react-i18next';diff --git a/src/renderer/components/menus/TagLibraryMenu.tsx b/src/renderer/components/menus/TagLibraryMenu.tsxindex 9a74936d6..a70da68c8 100644--- a/src/renderer/components/menus/TagLibraryMenu.tsx+++ b/src/renderer/components/menus/TagLibraryMenu.tsx@@ -29,7 +29,7 @@ import ReloadIcon from '@mui/icons-material/Sync';import AppConfig from '-/AppConfig';import ImportExportTagGroupsDialog from '../dialogs/ImportExportTagGroupsDialog';import { TS } from '-/tagspaces.namespace';-import Links from '-/content/links';+import Links from 'assets/links';import { ProLabel, ProTooltip } from '-/components/HelperComponents';import { Pro } from '-/pro';import { openURLExternally } from '-/services/utils-io';diff --git a/src/renderer/containers/PageNotification.tsx b/src/renderer/containers/PageNotification.tsxindex d98acfc24..a162bfc5a 100644--- a/src/renderer/containers/PageNotification.tsx+++ b/src/renderer/containers/PageNotification.tsx@@ -31,7 +31,7 @@ import {isUpdateAvailable,} from '../reducers/app';import { Pro } from '../pro';-import Links from '-/content/links';+import Links from 'assets/links';import { openURLExternally } from '-/services/utils-io';import { useTranslation } from 'react-i18next';import { useNotificationContext } from '-/hooks/useNotificationContext';diff --git a/src/renderer/content/ProTeaserSlides.tsx b/src/renderer/content/ProTeaserSlides.tsxindex 1c447e51d..dc28d1e9a 100644--- a/src/renderer/content/ProTeaserSlides.tsx+++ b/src/renderer/content/ProTeaserSlides.tsx@@ -1,4 +1,4 @@-import Links from '-/content/links';+import Links from 'assets/links';import ProTeaserImage from '-/assets/images/pro-teaser.svg';import KanbanImage from '-/assets/images/kanban-perspective.jpg';import GalleryImage from '-/assets/images/gallery-perspective.jpg';diff --git a/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx b/src/renderer/perspectives/grid-perspective/components/MainContainer.tsxindex b7bcf59bd..c070e935b 100644--- a/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx+++ b/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx@@ -39,7 +39,7 @@ import GridSettingsDialog from '-/perspectives/grid-perspective/components/GridSimport AddTagToTagGroupDialog from '-/components/dialogs/AddTagToTagGroupDialog';import { TS } from '-/tagspaces.namespace';import { Pro } from '-/pro';-import Links from '-/content/links';+import Links from 'assets/links';import { defaultSettings } from '../index';import { PerspectiveIDs } from '-/perspectives';import { fileOperationsEnabled } from '-/perspectives/common/main-container';diff --git a/src/renderer/perspectives/list/components/MainContainer.tsx b/src/renderer/perspectives/list/components/MainContainer.tsxindex 410153a67..58e6c3340 100644--- a/src/renderer/perspectives/list/components/MainContainer.tsx+++ b/src/renderer/perspectives/list/components/MainContainer.tsx@@ -39,7 +39,7 @@ import GridSettingsDialog from '-/perspectives/grid-perspective/components/GridSimport AddTagToTagGroupDialog from '-/components/dialogs/AddTagToTagGroupDialog';import { TS } from '-/tagspaces.namespace';import { Pro } from '-/pro';-import Links from '-/content/links';+import Links from 'assets/links';import { defaultSettings } from '../index';import { PerspectiveIDs } from '-/perspectives';import { fileOperationsEnabled } from '-/perspectives/common/main-container';diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.tsindex bce0e9e36..f2678ec7e 100644--- a/src/renderer/reducers/settings.ts+++ b/src/renderer/reducers/settings.ts@@ -20,7 +20,7 @@ import semver from 'semver';import AppConfig from '-/AppConfig';import defaultSettings from './settings-default';import PlatformIO from '-/services/platform-facade';-import Links from '-/content/links';+import Links from 'assets/links';import versionMeta from '-/version.json';import { actions as AppActions } from './app';import { TS } from '-/tagspaces.namespace';