From 0f2fe50e811531945ab6dfe67f604c9eddbb6239 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 11 Sep 2019 11:03:39 +0200 Subject: Fix(Todos): Fix Todos Menu --- src/features/todos/store.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/features/todos') diff --git a/src/features/todos/store.js b/src/features/todos/store.js index 05eef4ec1..abf176604 100644 --- a/src/features/todos/store.js +++ b/src/features/todos/store.js @@ -33,7 +33,7 @@ export default class TodoStore extends FeatureStore { @computed get isTodosPanelForceHidden() { const { isAnnouncementShown } = this.stores.announcements; - return delayAppState.isDelayAppScreenVisible || !this.settings.isFeatureEnabledByUser || isAnnouncementShown; + return delayAppState.isDelayAppScreenVisible || !this.isFeatureEnabledByUser || isAnnouncementShown; } @computed get isTodosPanelVisible() { @@ -41,6 +41,10 @@ export default class TodoStore extends FeatureStore { return this.settings.isTodosPanelVisible; } + @computed get isFeatureEnabledByUser() { + return this.settings.isFeatureEnabledByUser; + } + @computed get settings() { return localStorage.getItem('todos') || {}; } -- cgit v1.2.3-54-g00ecf From 7ffcf8cf417e76fe1206b945d417095534b3cad8 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Wed, 11 Sep 2019 13:46:00 +0200 Subject: feat(Todos): Move todos toggle to sidebar --- src/components/layout/Sidebar.js | 28 ++++++++++++ src/features/todos/components/TodosWebview.js | 53 ---------------------- src/i18n/locales/defaultMessages.json | 50 +++++++++++++++----- src/i18n/locales/en-US.json | 6 ++- .../messages/src/components/layout/Sidebar.json | 50 +++++++++++++++----- 5 files changed, 108 insertions(+), 79 deletions(-) (limited to 'src/features/todos') diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 36c1f2e39..128f94959 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -8,6 +8,8 @@ import Tabbar from '../services/tabs/Tabbar'; import { ctrlKey } from '../../environment'; import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces'; import { gaEvent } from '../../lib/analytics'; +import { todosStore, GA_CATEGORY_TODOS } from '../../features/todos'; +import todoActions from '../../features/todos/actions'; const messages = defineMessages({ settings: { @@ -34,6 +36,14 @@ const messages = defineMessages({ id: 'sidebar.closeWorkspaceDrawer', defaultMessage: '!!!Close workspace drawer', }, + openTodosDrawer: { + id: 'sidebar.openTodosDrawer', + defaultMessage: '!!!Open Franz Todos', + }, + closeTodosDrawer: { + id: 'sidebar.closeTodosDrawer', + defaultMessage: '!!!Close Franz Todos', + }, }); export default @observer class Sidebar extends Component { @@ -79,6 +89,10 @@ export default @observer class Sidebar extends Component { toggleWorkspaceDrawer, } = this.props; const { intl } = this.context; + const todosToggleMessage = ( + todosStore.isTodosPanelVisible ? messages.closeTodosDrawer : messages.openTodosDrawer + ); + const workspaceToggleMessage = ( isWorkspaceDrawerOpen ? messages.closeWorkspaceDrawer : messages.openWorkspaceDrawer ); @@ -90,6 +104,20 @@ export default @observer class Sidebar extends Component { enableToolTip={() => this.enableToolTip()} disableToolTip={() => this.disableToolTip()} /> + {todosStore.isFeatureEnabled && todosStore.isFeatureEnabledByUser ? ( + + ) : null} {workspaceStore.isFeatureEnabled ? (
Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json index d67adc96e..837dc54bc 100644 --- a/src/i18n/messages/src/components/layout/Sidebar.json +++ b/src/i18n/messages/src/components/layout/Sidebar.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Settings", "file": "src/components/layout/Sidebar.js", "start": { - "line": 13, + "line": 15, "column": 12 }, "end": { - "line": 16, + "line": 18, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Add new service", "file": "src/components/layout/Sidebar.js", "start": { - "line": 17, + "line": 19, "column": 17 }, "end": { - "line": 20, + "line": 22, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Disable notifications & audio", "file": "src/components/layout/Sidebar.js", "start": { - "line": 21, + "line": 23, "column": 8 }, "end": { - "line": 24, + "line": 26, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Enable notifications & audio", "file": "src/components/layout/Sidebar.js", "start": { - "line": 25, + "line": 27, "column": 10 }, "end": { - "line": 28, + "line": 30, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Open workspace drawer", "file": "src/components/layout/Sidebar.js", "start": { - "line": 29, + "line": 31, "column": 23 }, "end": { - "line": 32, + "line": 34, "column": 3 } }, @@ -69,11 +69,37 @@ "defaultMessage": "!!!Close workspace drawer", "file": "src/components/layout/Sidebar.js", "start": { - "line": 33, + "line": 35, "column": 24 }, "end": { - "line": 36, + "line": 38, + "column": 3 + } + }, + { + "id": "sidebar.openTodosDrawer", + "defaultMessage": "!!!Open Franz Todos", + "file": "src/components/layout/Sidebar.js", + "start": { + "line": 39, + "column": 19 + }, + "end": { + "line": 42, + "column": 3 + } + }, + { + "id": "sidebar.closeTodosDrawer", + "defaultMessage": "!!!Close Franz Todos", + "file": "src/components/layout/Sidebar.js", + "start": { + "line": 43, + "column": 20 + }, + "end": { + "line": 46, "column": 3 } } -- cgit v1.2.3-54-g00ecf From 6b39d67ddd8a160b0154b0e83e5e1ed67ff7265b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 12 Sep 2019 09:46:30 +0200 Subject: fix linting issues --- src/components/layout/Sidebar.js | 2 +- src/features/todos/components/TodosWebview.js | 5 +- src/i18n/locales/defaultMessages.json | 260 ++++++++++----------- src/i18n/locales/en-US.json | 2 +- .../features/todos/components/TodosWebview.json | 12 +- src/i18n/messages/src/lib/Menu.json | 248 ++++++++++---------- src/lib/Menu.js | 1 - 7 files changed, 263 insertions(+), 267 deletions(-) (limited to 'src/features/todos') diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 128f94959..bac57d4dc 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -9,7 +9,7 @@ import { ctrlKey } from '../../environment'; import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces'; import { gaEvent } from '../../lib/analytics'; import { todosStore, GA_CATEGORY_TODOS } from '../../features/todos'; -import todoActions from '../../features/todos/actions'; +import { todoActions } from '../../features/todos/actions'; const messages = defineMessages({ settings: { diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index aed1a8834..d052da6f2 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js @@ -6,14 +6,11 @@ import Webview from 'react-electron-web-view'; import { Icon } from '@meetfranz/ui'; import { defineMessages, intlShape } from 'react-intl'; -import { mdiChevronRight, mdiCheckAll } from '@mdi/js'; +import { mdiCheckAll } from '@mdi/js'; import * as environment from '../../../environment'; import Appear from '../../../components/ui/effects/Appear'; import UpgradeButton from '../../../components/ui/UpgradeButton'; -const OPEN_TODOS_BUTTON_SIZE = 45; -const CLOSE_TODOS_BUTTON_SIZE = 35; - const messages = defineMessages({ premiumInfo: { id: 'feature.todos.premium.info', diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index f2293ead2..1ab8638b3 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -3969,39 +3969,39 @@ "defaultMessage": "!!!Franz Todos are available to premium users now!", "end": { "column": 3, - "line": 21 + "line": 18 }, "file": "src/features/todos/components/TodosWebview.js", "id": "feature.todos.premium.info", "start": { "column": 15, - "line": 18 + "line": 15 } }, { "defaultMessage": "!!!Upgrade Account", "end": { "column": 3, - "line": 25 + "line": 22 }, "file": "src/features/todos/components/TodosWebview.js", "id": "feature.todos.premium.upgrade", "start": { "column": 14, - "line": 22 + "line": 19 } }, { "defaultMessage": "!!!Everyone else will have to wait a little longer.", "end": { "column": 3, - "line": 29 + "line": 26 }, "file": "src/features/todos/components/TodosWebview.js", "id": "feature.todos.premium.rollout", "start": { "column": 15, - "line": 26 + "line": 23 } } ], @@ -4713,806 +4713,806 @@ "defaultMessage": "!!!Edit", "end": { "column": 3, - "line": 21 + "line": 20 }, "file": "src/lib/Menu.js", "id": "menu.edit", "start": { "column": 8, - "line": 18 + "line": 17 } }, { "defaultMessage": "!!!Undo", "end": { "column": 3, - "line": 25 + "line": 24 }, "file": "src/lib/Menu.js", "id": "menu.edit.undo", "start": { "column": 8, - "line": 22 + "line": 21 } }, { "defaultMessage": "!!!Redo", "end": { "column": 3, - "line": 29 + "line": 28 }, "file": "src/lib/Menu.js", "id": "menu.edit.redo", "start": { "column": 8, - "line": 26 + "line": 25 } }, { "defaultMessage": "!!!Cut", "end": { "column": 3, - "line": 33 + "line": 32 }, "file": "src/lib/Menu.js", "id": "menu.edit.cut", "start": { "column": 7, - "line": 30 + "line": 29 } }, { "defaultMessage": "!!!Copy", "end": { "column": 3, - "line": 37 + "line": 36 }, "file": "src/lib/Menu.js", "id": "menu.edit.copy", "start": { "column": 8, - "line": 34 + "line": 33 } }, { "defaultMessage": "!!!Paste", "end": { "column": 3, - "line": 41 + "line": 40 }, "file": "src/lib/Menu.js", "id": "menu.edit.paste", "start": { "column": 9, - "line": 38 + "line": 37 } }, { "defaultMessage": "!!!Paste And Match Style", "end": { "column": 3, - "line": 45 + "line": 44 }, "file": "src/lib/Menu.js", "id": "menu.edit.pasteAndMatchStyle", "start": { "column": 22, - "line": 42 + "line": 41 } }, { "defaultMessage": "!!!Delete", "end": { "column": 3, - "line": 49 + "line": 48 }, "file": "src/lib/Menu.js", "id": "menu.edit.delete", "start": { "column": 10, - "line": 46 + "line": 45 } }, { "defaultMessage": "!!!Select All", "end": { "column": 3, - "line": 53 + "line": 52 }, "file": "src/lib/Menu.js", "id": "menu.edit.selectAll", "start": { "column": 13, - "line": 50 + "line": 49 } }, { "defaultMessage": "!!!Speech", "end": { "column": 3, - "line": 57 + "line": 56 }, "file": "src/lib/Menu.js", "id": "menu.edit.speech", "start": { "column": 10, - "line": 54 + "line": 53 } }, { "defaultMessage": "!!!Start Speaking", "end": { "column": 3, - "line": 61 + "line": 60 }, "file": "src/lib/Menu.js", "id": "menu.edit.startSpeaking", "start": { "column": 17, - "line": 58 + "line": 57 } }, { "defaultMessage": "!!!Stop Speaking", "end": { "column": 3, - "line": 65 + "line": 64 }, "file": "src/lib/Menu.js", "id": "menu.edit.stopSpeaking", "start": { "column": 16, - "line": 62 + "line": 61 } }, { "defaultMessage": "!!!Start Dictation", "end": { "column": 3, - "line": 69 + "line": 68 }, "file": "src/lib/Menu.js", "id": "menu.edit.startDictation", "start": { "column": 18, - "line": 66 + "line": 65 } }, { "defaultMessage": "!!!Emoji & Symbols", "end": { "column": 3, - "line": 73 + "line": 72 }, "file": "src/lib/Menu.js", "id": "menu.edit.emojiSymbols", "start": { "column": 16, - "line": 70 + "line": 69 } }, { "defaultMessage": "!!!Actual Size", "end": { "column": 3, - "line": 77 + "line": 76 }, "file": "src/lib/Menu.js", "id": "menu.view.resetZoom", "start": { "column": 13, - "line": 74 + "line": 73 } }, { "defaultMessage": "!!!Zoom In", "end": { "column": 3, - "line": 81 + "line": 80 }, "file": "src/lib/Menu.js", "id": "menu.view.zoomIn", "start": { "column": 10, - "line": 78 + "line": 77 } }, { "defaultMessage": "!!!Zoom Out", "end": { "column": 3, - "line": 85 + "line": 84 }, "file": "src/lib/Menu.js", "id": "menu.view.zoomOut", "start": { "column": 11, - "line": 82 + "line": 81 } }, { "defaultMessage": "!!!Enter Full Screen", "end": { "column": 3, - "line": 89 + "line": 88 }, "file": "src/lib/Menu.js", "id": "menu.view.enterFullScreen", "start": { "column": 19, - "line": 86 + "line": 85 } }, { "defaultMessage": "!!!Exit Full Screen", "end": { "column": 3, - "line": 93 + "line": 92 }, "file": "src/lib/Menu.js", "id": "menu.view.exitFullScreen", "start": { "column": 18, - "line": 90 + "line": 89 } }, { "defaultMessage": "!!!Toggle Full Screen", "end": { "column": 3, - "line": 97 + "line": 96 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleFullScreen", "start": { "column": 20, - "line": 94 + "line": 93 } }, { "defaultMessage": "!!!Toggle Developer Tools", "end": { "column": 3, - "line": 101 + "line": 100 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleDevTools", "start": { "column": 18, - "line": 98 + "line": 97 } }, { "defaultMessage": "!!!Toggle Todos Developer Tools", "end": { "column": 3, - "line": 105 + "line": 104 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleTodosDevTools", "start": { "column": 23, - "line": 102 + "line": 101 } }, { "defaultMessage": "!!!Toggle Service Developer Tools", "end": { "column": 3, - "line": 109 + "line": 108 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleServiceDevTools", "start": { "column": 25, - "line": 106 + "line": 105 } }, { "defaultMessage": "!!!Reload Service", "end": { "column": 3, - "line": 113 + "line": 112 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadService", "start": { "column": 17, - "line": 110 + "line": 109 } }, { "defaultMessage": "!!!Reload Franz", "end": { "column": 3, - "line": 117 + "line": 116 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadFranz", "start": { "column": 15, - "line": 114 + "line": 113 } }, { "defaultMessage": "!!!Minimize", "end": { "column": 3, - "line": 121 + "line": 120 }, "file": "src/lib/Menu.js", "id": "menu.window.minimize", "start": { "column": 12, - "line": 118 + "line": 117 } }, { "defaultMessage": "!!!Close", "end": { "column": 3, - "line": 125 + "line": 124 }, "file": "src/lib/Menu.js", "id": "menu.window.close", "start": { "column": 9, - "line": 122 + "line": 121 } }, { "defaultMessage": "!!!Learn More", "end": { "column": 3, - "line": 129 + "line": 128 }, "file": "src/lib/Menu.js", "id": "menu.help.learnMore", "start": { "column": 13, - "line": 126 + "line": 125 } }, { "defaultMessage": "!!!Changelog", "end": { "column": 3, - "line": 133 + "line": 132 }, "file": "src/lib/Menu.js", "id": "menu.help.changelog", "start": { "column": 13, - "line": 130 + "line": 129 } }, { "defaultMessage": "!!!Support", "end": { "column": 3, - "line": 137 + "line": 136 }, "file": "src/lib/Menu.js", "id": "menu.help.support", "start": { "column": 11, - "line": 134 + "line": 133 } }, { "defaultMessage": "!!!Copy Debug Information", "end": { "column": 3, - "line": 141 + "line": 140 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfo", "start": { "column": 13, - "line": 138 + "line": 137 } }, { "defaultMessage": "!!!Franz Debug Information", "end": { "column": 3, - "line": 145 + "line": 144 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedHeadline", "start": { "column": 27, - "line": 142 + "line": 141 } }, { "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "end": { "column": 3, - "line": 149 + "line": 148 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedBody", "start": { "column": 23, - "line": 146 + "line": 145 } }, { "defaultMessage": "!!!Terms of Service", "end": { "column": 3, - "line": 153 + "line": 152 }, "file": "src/lib/Menu.js", "id": "menu.help.tos", "start": { "column": 7, - "line": 150 + "line": 149 } }, { "defaultMessage": "!!!Privacy Statement", "end": { "column": 3, - "line": 157 + "line": 156 }, "file": "src/lib/Menu.js", "id": "menu.help.privacy", "start": { "column": 11, - "line": 154 + "line": 153 } }, { "defaultMessage": "!!!File", "end": { "column": 3, - "line": 161 + "line": 160 }, "file": "src/lib/Menu.js", "id": "menu.file", "start": { "column": 8, - "line": 158 + "line": 157 } }, { "defaultMessage": "!!!View", "end": { "column": 3, - "line": 165 + "line": 164 }, "file": "src/lib/Menu.js", "id": "menu.view", "start": { "column": 8, - "line": 162 + "line": 161 } }, { "defaultMessage": "!!!Services", "end": { "column": 3, - "line": 169 + "line": 168 }, "file": "src/lib/Menu.js", "id": "menu.services", "start": { "column": 12, - "line": 166 + "line": 165 } }, { "defaultMessage": "!!!Window", "end": { "column": 3, - "line": 173 + "line": 172 }, "file": "src/lib/Menu.js", "id": "menu.window", "start": { "column": 10, - "line": 170 + "line": 169 } }, { "defaultMessage": "!!!Help", "end": { "column": 3, - "line": 177 + "line": 176 }, "file": "src/lib/Menu.js", "id": "menu.help", "start": { "column": 8, - "line": 174 + "line": 173 } }, { "defaultMessage": "!!!About Franz", "end": { "column": 3, - "line": 181 + "line": 180 }, "file": "src/lib/Menu.js", "id": "menu.app.about", "start": { "column": 9, - "line": 178 + "line": 177 } }, { "defaultMessage": "!!!What's new?", "end": { "column": 3, - "line": 185 + "line": 184 }, "file": "src/lib/Menu.js", "id": "menu.app.announcement", "start": { "column": 16, - "line": 182 + "line": 181 } }, { "defaultMessage": "!!!Settings", "end": { "column": 3, - "line": 189 + "line": 188 }, "file": "src/lib/Menu.js", "id": "menu.app.settings", "start": { "column": 12, - "line": 186 + "line": 185 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 193 + "line": 192 }, "file": "src/lib/Menu.js", "id": "menu.app.checkForUpdates", "start": { "column": 19, - "line": 190 + "line": 189 } }, { "defaultMessage": "!!!Hide", "end": { "column": 3, - "line": 197 + "line": 196 }, "file": "src/lib/Menu.js", "id": "menu.app.hide", "start": { "column": 8, - "line": 194 + "line": 193 } }, { "defaultMessage": "!!!Hide Others", "end": { "column": 3, - "line": 201 + "line": 200 }, "file": "src/lib/Menu.js", "id": "menu.app.hideOthers", "start": { "column": 14, - "line": 198 + "line": 197 } }, { "defaultMessage": "!!!Unhide", "end": { "column": 3, - "line": 205 + "line": 204 }, "file": "src/lib/Menu.js", "id": "menu.app.unhide", "start": { "column": 10, - "line": 202 + "line": 201 } }, { "defaultMessage": "!!!Quit", "end": { "column": 3, - "line": 209 + "line": 208 }, "file": "src/lib/Menu.js", "id": "menu.app.quit", "start": { "column": 8, - "line": 206 + "line": 205 } }, { "defaultMessage": "!!!Add New Service...", "end": { "column": 3, - "line": 213 + "line": 212 }, "file": "src/lib/Menu.js", "id": "menu.services.addNewService", "start": { "column": 17, - "line": 210 + "line": 209 } }, { "defaultMessage": "!!!Add New Workspace...", "end": { "column": 3, - "line": 217 + "line": 216 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.addNewWorkspace", "start": { "column": 19, - "line": 214 + "line": 213 } }, { "defaultMessage": "!!!Open workspace drawer", "end": { "column": 3, - "line": 221 + "line": 220 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.openWorkspaceDrawer", "start": { "column": 23, - "line": 218 + "line": 217 } }, { "defaultMessage": "!!!Close workspace drawer", "end": { "column": 3, - "line": 225 + "line": 224 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.closeWorkspaceDrawer", "start": { "column": 24, - "line": 222 + "line": 221 } }, { "defaultMessage": "!!!Activate next service...", "end": { "column": 3, - "line": 229 + "line": 228 }, "file": "src/lib/Menu.js", "id": "menu.services.setNextServiceActive", "start": { "column": 23, - "line": 226 + "line": 225 } }, { "defaultMessage": "!!!Activate previous service...", "end": { "column": 3, - "line": 233 + "line": 232 }, "file": "src/lib/Menu.js", "id": "menu.services.activatePreviousService", "start": { "column": 27, - "line": 230 + "line": 229 } }, { "defaultMessage": "!!!Disable notifications & audio", "end": { "column": 3, - "line": 237 + "line": 236 }, "file": "src/lib/Menu.js", "id": "sidebar.muteApp", "start": { "column": 11, - "line": 234 + "line": 233 } }, { "defaultMessage": "!!!Enable notifications & audio", "end": { "column": 3, - "line": 241 + "line": 240 }, "file": "src/lib/Menu.js", "id": "sidebar.unmuteApp", "start": { "column": 13, - "line": 238 + "line": 237 } }, { "defaultMessage": "!!!Workspaces", "end": { "column": 3, - "line": 245 + "line": 244 }, "file": "src/lib/Menu.js", "id": "menu.workspaces", "start": { "column": 14, - "line": 242 + "line": 241 } }, { "defaultMessage": "!!!Default", "end": { "column": 3, - "line": 249 + "line": 248 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.defaultWorkspace", "start": { "column": 20, - "line": 246 + "line": 245 } }, { "defaultMessage": "!!!Todos", "end": { "column": 3, - "line": 253 + "line": 252 }, "file": "src/lib/Menu.js", "id": "menu.todos", "start": { "column": 9, - "line": 250 + "line": 249 } }, { "defaultMessage": "!!!Open Todos drawer", "end": { "column": 3, - "line": 257 + "line": 256 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.openTodosDrawer", "start": { "column": 19, - "line": 254 + "line": 253 } }, { "defaultMessage": "!!!Close Todos drawer", "end": { "column": 3, - "line": 261 + "line": 260 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.closeTodosDrawer", "start": { "column": 20, - "line": 258 + "line": 257 } }, { "defaultMessage": "!!!Enable Todos", "end": { "column": 3, - "line": 265 + "line": 264 }, "file": "src/lib/Menu.js", "id": "menu.todos.enableTodos", "start": { "column": 15, - "line": 262 + "line": 261 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index e9f2c9cc1..1fbb2526c 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -382,4 +382,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} +} \ No newline at end of file diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json index 9cc3325d1..7f230e82a 100644 --- a/src/i18n/messages/src/features/todos/components/TodosWebview.json +++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Franz Todos are available to premium users now!", "file": "src/features/todos/components/TodosWebview.js", "start": { - "line": 18, + "line": 15, "column": 15 }, "end": { - "line": 21, + "line": 18, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Upgrade Account", "file": "src/features/todos/components/TodosWebview.js", "start": { - "line": 22, + "line": 19, "column": 14 }, "end": { - "line": 25, + "line": 22, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Everyone else will have to wait a little longer.", "file": "src/features/todos/components/TodosWebview.js", "start": { - "line": 26, + "line": 23, "column": 15 }, "end": { - "line": 29, + "line": 26, "column": 3 } } diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json index 0c0cab33f..26850c5b3 100644 --- a/src/i18n/messages/src/lib/Menu.json +++ b/src/i18n/messages/src/lib/Menu.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Edit", "file": "src/lib/Menu.js", "start": { - "line": 18, + "line": 17, "column": 8 }, "end": { - "line": 21, + "line": 20, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Undo", "file": "src/lib/Menu.js", "start": { - "line": 22, + "line": 21, "column": 8 }, "end": { - "line": 25, + "line": 24, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Redo", "file": "src/lib/Menu.js", "start": { - "line": 26, + "line": 25, "column": 8 }, "end": { - "line": 29, + "line": 28, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Cut", "file": "src/lib/Menu.js", "start": { - "line": 30, + "line": 29, "column": 7 }, "end": { - "line": 33, + "line": 32, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Copy", "file": "src/lib/Menu.js", "start": { - "line": 34, + "line": 33, "column": 8 }, "end": { - "line": 37, + "line": 36, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Paste", "file": "src/lib/Menu.js", "start": { - "line": 38, + "line": 37, "column": 9 }, "end": { - "line": 41, + "line": 40, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Paste And Match Style", "file": "src/lib/Menu.js", "start": { - "line": 42, + "line": 41, "column": 22 }, "end": { - "line": 45, + "line": 44, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Delete", "file": "src/lib/Menu.js", "start": { - "line": 46, + "line": 45, "column": 10 }, "end": { - "line": 49, + "line": 48, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Select All", "file": "src/lib/Menu.js", "start": { - "line": 50, + "line": 49, "column": 13 }, "end": { - "line": 53, + "line": 52, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Speech", "file": "src/lib/Menu.js", "start": { - "line": 54, + "line": 53, "column": 10 }, "end": { - "line": 57, + "line": 56, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Start Speaking", "file": "src/lib/Menu.js", "start": { - "line": 58, + "line": 57, "column": 17 }, "end": { - "line": 61, + "line": 60, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Stop Speaking", "file": "src/lib/Menu.js", "start": { - "line": 62, + "line": 61, "column": 16 }, "end": { - "line": 65, + "line": 64, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Start Dictation", "file": "src/lib/Menu.js", "start": { - "line": 66, + "line": 65, "column": 18 }, "end": { - "line": 69, + "line": 68, "column": 3 } }, @@ -173,11 +173,11 @@ "defaultMessage": "!!!Emoji & Symbols", "file": "src/lib/Menu.js", "start": { - "line": 70, + "line": 69, "column": 16 }, "end": { - "line": 73, + "line": 72, "column": 3 } }, @@ -186,11 +186,11 @@ "defaultMessage": "!!!Actual Size", "file": "src/lib/Menu.js", "start": { - "line": 74, + "line": 73, "column": 13 }, "end": { - "line": 77, + "line": 76, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Zoom In", "file": "src/lib/Menu.js", "start": { - "line": 78, + "line": 77, "column": 10 }, "end": { - "line": 81, + "line": 80, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Zoom Out", "file": "src/lib/Menu.js", "start": { - "line": 82, + "line": 81, "column": 11 }, "end": { - "line": 85, + "line": 84, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!Enter Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 86, + "line": 85, "column": 19 }, "end": { - "line": 89, + "line": 88, "column": 3 } }, @@ -238,11 +238,11 @@ "defaultMessage": "!!!Exit Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 90, + "line": 89, "column": 18 }, "end": { - "line": 93, + "line": 92, "column": 3 } }, @@ -251,11 +251,11 @@ "defaultMessage": "!!!Toggle Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 94, + "line": 93, "column": 20 }, "end": { - "line": 97, + "line": 96, "column": 3 } }, @@ -264,11 +264,11 @@ "defaultMessage": "!!!Toggle Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 98, + "line": 97, "column": 18 }, "end": { - "line": 101, + "line": 100, "column": 3 } }, @@ -277,11 +277,11 @@ "defaultMessage": "!!!Toggle Todos Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 102, + "line": 101, "column": 23 }, "end": { - "line": 105, + "line": 104, "column": 3 } }, @@ -290,11 +290,11 @@ "defaultMessage": "!!!Toggle Service Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 106, + "line": 105, "column": 25 }, "end": { - "line": 109, + "line": 108, "column": 3 } }, @@ -303,11 +303,11 @@ "defaultMessage": "!!!Reload Service", "file": "src/lib/Menu.js", "start": { - "line": 110, + "line": 109, "column": 17 }, "end": { - "line": 113, + "line": 112, "column": 3 } }, @@ -316,11 +316,11 @@ "defaultMessage": "!!!Reload Franz", "file": "src/lib/Menu.js", "start": { - "line": 114, + "line": 113, "column": 15 }, "end": { - "line": 117, + "line": 116, "column": 3 } }, @@ -329,11 +329,11 @@ "defaultMessage": "!!!Minimize", "file": "src/lib/Menu.js", "start": { - "line": 118, + "line": 117, "column": 12 }, "end": { - "line": 121, + "line": 120, "column": 3 } }, @@ -342,11 +342,11 @@ "defaultMessage": "!!!Close", "file": "src/lib/Menu.js", "start": { - "line": 122, + "line": 121, "column": 9 }, "end": { - "line": 125, + "line": 124, "column": 3 } }, @@ -355,11 +355,11 @@ "defaultMessage": "!!!Learn More", "file": "src/lib/Menu.js", "start": { - "line": 126, + "line": 125, "column": 13 }, "end": { - "line": 129, + "line": 128, "column": 3 } }, @@ -368,11 +368,11 @@ "defaultMessage": "!!!Changelog", "file": "src/lib/Menu.js", "start": { - "line": 130, + "line": 129, "column": 13 }, "end": { - "line": 133, + "line": 132, "column": 3 } }, @@ -381,11 +381,11 @@ "defaultMessage": "!!!Support", "file": "src/lib/Menu.js", "start": { - "line": 134, + "line": 133, "column": 11 }, "end": { - "line": 137, + "line": 136, "column": 3 } }, @@ -394,11 +394,11 @@ "defaultMessage": "!!!Copy Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 138, + "line": 137, "column": 13 }, "end": { - "line": 141, + "line": 140, "column": 3 } }, @@ -407,11 +407,11 @@ "defaultMessage": "!!!Franz Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 142, + "line": 141, "column": 27 }, "end": { - "line": 145, + "line": 144, "column": 3 } }, @@ -420,11 +420,11 @@ "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "file": "src/lib/Menu.js", "start": { - "line": 146, + "line": 145, "column": 23 }, "end": { - "line": 149, + "line": 148, "column": 3 } }, @@ -433,11 +433,11 @@ "defaultMessage": "!!!Terms of Service", "file": "src/lib/Menu.js", "start": { - "line": 150, + "line": 149, "column": 7 }, "end": { - "line": 153, + "line": 152, "column": 3 } }, @@ -446,11 +446,11 @@ "defaultMessage": "!!!Privacy Statement", "file": "src/lib/Menu.js", "start": { - "line": 154, + "line": 153, "column": 11 }, "end": { - "line": 157, + "line": 156, "column": 3 } }, @@ -459,11 +459,11 @@ "defaultMessage": "!!!File", "file": "src/lib/Menu.js", "start": { - "line": 158, + "line": 157, "column": 8 }, "end": { - "line": 161, + "line": 160, "column": 3 } }, @@ -472,11 +472,11 @@ "defaultMessage": "!!!View", "file": "src/lib/Menu.js", "start": { - "line": 162, + "line": 161, "column": 8 }, "end": { - "line": 165, + "line": 164, "column": 3 } }, @@ -485,11 +485,11 @@ "defaultMessage": "!!!Services", "file": "src/lib/Menu.js", "start": { - "line": 166, + "line": 165, "column": 12 }, "end": { - "line": 169, + "line": 168, "column": 3 } }, @@ -498,11 +498,11 @@ "defaultMessage": "!!!Window", "file": "src/lib/Menu.js", "start": { - "line": 170, + "line": 169, "column": 10 }, "end": { - "line": 173, + "line": 172, "column": 3 } }, @@ -511,11 +511,11 @@ "defaultMessage": "!!!Help", "file": "src/lib/Menu.js", "start": { - "line": 174, + "line": 173, "column": 8 }, "end": { - "line": 177, + "line": 176, "column": 3 } }, @@ -524,11 +524,11 @@ "defaultMessage": "!!!About Franz", "file": "src/lib/Menu.js", "start": { - "line": 178, + "line": 177, "column": 9 }, "end": { - "line": 181, + "line": 180, "column": 3 } }, @@ -537,11 +537,11 @@ "defaultMessage": "!!!What's new?", "file": "src/lib/Menu.js", "start": { - "line": 182, + "line": 181, "column": 16 }, "end": { - "line": 185, + "line": 184, "column": 3 } }, @@ -550,11 +550,11 @@ "defaultMessage": "!!!Settings", "file": "src/lib/Menu.js", "start": { - "line": 186, + "line": 185, "column": 12 }, "end": { - "line": 189, + "line": 188, "column": 3 } }, @@ -563,11 +563,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/lib/Menu.js", "start": { - "line": 190, + "line": 189, "column": 19 }, "end": { - "line": 193, + "line": 192, "column": 3 } }, @@ -576,11 +576,11 @@ "defaultMessage": "!!!Hide", "file": "src/lib/Menu.js", "start": { - "line": 194, + "line": 193, "column": 8 }, "end": { - "line": 197, + "line": 196, "column": 3 } }, @@ -589,11 +589,11 @@ "defaultMessage": "!!!Hide Others", "file": "src/lib/Menu.js", "start": { - "line": 198, + "line": 197, "column": 14 }, "end": { - "line": 201, + "line": 200, "column": 3 } }, @@ -602,11 +602,11 @@ "defaultMessage": "!!!Unhide", "file": "src/lib/Menu.js", "start": { - "line": 202, + "line": 201, "column": 10 }, "end": { - "line": 205, + "line": 204, "column": 3 } }, @@ -615,11 +615,11 @@ "defaultMessage": "!!!Quit", "file": "src/lib/Menu.js", "start": { - "line": 206, + "line": 205, "column": 8 }, "end": { - "line": 209, + "line": 208, "column": 3 } }, @@ -628,11 +628,11 @@ "defaultMessage": "!!!Add New Service...", "file": "src/lib/Menu.js", "start": { - "line": 210, + "line": 209, "column": 17 }, "end": { - "line": 213, + "line": 212, "column": 3 } }, @@ -641,11 +641,11 @@ "defaultMessage": "!!!Add New Workspace...", "file": "src/lib/Menu.js", "start": { - "line": 214, + "line": 213, "column": 19 }, "end": { - "line": 217, + "line": 216, "column": 3 } }, @@ -654,11 +654,11 @@ "defaultMessage": "!!!Open workspace drawer", "file": "src/lib/Menu.js", "start": { - "line": 218, + "line": 217, "column": 23 }, "end": { - "line": 221, + "line": 220, "column": 3 } }, @@ -667,11 +667,11 @@ "defaultMessage": "!!!Close workspace drawer", "file": "src/lib/Menu.js", "start": { - "line": 222, + "line": 221, "column": 24 }, "end": { - "line": 225, + "line": 224, "column": 3 } }, @@ -680,11 +680,11 @@ "defaultMessage": "!!!Activate next service...", "file": "src/lib/Menu.js", "start": { - "line": 226, + "line": 225, "column": 23 }, "end": { - "line": 229, + "line": 228, "column": 3 } }, @@ -693,11 +693,11 @@ "defaultMessage": "!!!Activate previous service...", "file": "src/lib/Menu.js", "start": { - "line": 230, + "line": 229, "column": 27 }, "end": { - "line": 233, + "line": 232, "column": 3 } }, @@ -706,11 +706,11 @@ "defaultMessage": "!!!Disable notifications & audio", "file": "src/lib/Menu.js", "start": { - "line": 234, + "line": 233, "column": 11 }, "end": { - "line": 237, + "line": 236, "column": 3 } }, @@ -719,11 +719,11 @@ "defaultMessage": "!!!Enable notifications & audio", "file": "src/lib/Menu.js", "start": { - "line": 238, + "line": 237, "column": 13 }, "end": { - "line": 241, + "line": 240, "column": 3 } }, @@ -732,11 +732,11 @@ "defaultMessage": "!!!Workspaces", "file": "src/lib/Menu.js", "start": { - "line": 242, + "line": 241, "column": 14 }, "end": { - "line": 245, + "line": 244, "column": 3 } }, @@ -745,11 +745,11 @@ "defaultMessage": "!!!Default", "file": "src/lib/Menu.js", "start": { - "line": 246, + "line": 245, "column": 20 }, "end": { - "line": 249, + "line": 248, "column": 3 } }, @@ -758,11 +758,11 @@ "defaultMessage": "!!!Todos", "file": "src/lib/Menu.js", "start": { - "line": 250, + "line": 249, "column": 9 }, "end": { - "line": 253, + "line": 252, "column": 3 } }, @@ -771,11 +771,11 @@ "defaultMessage": "!!!Open Todos drawer", "file": "src/lib/Menu.js", "start": { - "line": 254, + "line": 253, "column": 19 }, "end": { - "line": 257, + "line": 256, "column": 3 } }, @@ -784,11 +784,11 @@ "defaultMessage": "!!!Close Todos drawer", "file": "src/lib/Menu.js", "start": { - "line": 258, + "line": 257, "column": 20 }, "end": { - "line": 261, + "line": 260, "column": 3 } }, @@ -797,11 +797,11 @@ "defaultMessage": "!!!Enable Todos", "file": "src/lib/Menu.js", "start": { - "line": 262, + "line": 261, "column": 15 }, "end": { - "line": 265, + "line": 264, "column": 3 } } diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 6ffa007f2..4aa2edaba 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -8,7 +8,6 @@ import { workspaceActions } from '../features/workspaces/actions'; import { gaEvent } from './analytics'; import { announcementActions } from '../features/announcements/actions'; import { announcementsStore } from '../features/announcements'; -import TodoStore from '../features/todos/store'; import { GA_CATEGORY_TODOS, todosStore } from '../features/todos'; import { todoActions } from '../features/todos/actions'; -- cgit v1.2.3-54-g00ecf