aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-06-05 16:28:52 +0530
committerLibravatar GitHub <noreply@github.com>2021-06-05 12:58:52 +0200
commit079765bad8a577d140166098e8dd0b7fe0660e4e (patch)
tree4a157a1e5fd0eb3b6a2ce71229a0aed7165dddb3
parentRemoved hardcoded strings and reused constants defined in config.js (#1499) (diff)
downloadferdi-079765bad8a577d140166098e8dd0b7fe0660e4e.tar.gz
ferdi-079765bad8a577d140166098e8dd0b7fe0660e4e.tar.zst
ferdi-079765bad8a577d140166098e8dd0b7fe0660e4e.zip
Added ability to turn off notifications for clipboard events generated by context menu actions (#1494)
-rw-r--r--src/components/settings/settings/EditSettingsForm.js1
-rw-r--r--src/config.js1
-rw-r--r--src/containers/settings/EditSettingsScreen.js10
-rw-r--r--src/i18n/locales/defaultMessages.json149
-rw-r--r--src/i18n/locales/en-US.json1
-rw-r--r--src/i18n/messages/src/containers/settings/EditSettingsScreen.json149
-rw-r--r--src/stores/ServicesStore.js5
-rw-r--r--src/webview/contextMenu.js4
-rw-r--r--src/webview/contextMenuBuilder.js17
-rw-r--r--src/webview/recipe.js1
10 files changed, 193 insertions, 145 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 08e5efa2..8a362d3c 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -504,6 +504,7 @@ export default @observer class EditSettingsForm extends Component {
504 { this.state.activeSetttingsTab === 'privacy' && ( 504 { this.state.activeSetttingsTab === 'privacy' && (
505 <div> 505 <div>
506 <Toggle field={form.$('privateNotifications')} /> 506 <Toggle field={form.$('privateNotifications')} />
507 <Toggle field={form.$('clipboardNotifications')} />
507 {(isWindows || isMac) && ( 508 {(isWindows || isMac) && (
508 <Toggle field={form.$('notifyTaskBarOnMessage')} />)} 509 <Toggle field={form.$('notifyTaskBarOnMessage')} />)}
509 510
diff --git a/src/config.js b/src/config.js
index d3749b43..da2eff0c 100644
--- a/src/config.js
+++ b/src/config.js
@@ -106,6 +106,7 @@ export const DEFAULT_APP_SETTINGS = {
106 minimizeToSystemTray: false, 106 minimizeToSystemTray: false,
107 closeToSystemTray: false, 107 closeToSystemTray: false,
108 privateNotifications: false, 108 privateNotifications: false,
109 clipboardNotifications: true,
109 notifyTaskBarOnMessage: false, 110 notifyTaskBarOnMessage: false,
110 showDisabledServices: true, 111 showDisabledServices: true,
111 showMessageBadgeWhenMuted: true, 112 showMessageBadgeWhenMuted: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index ff22bc45..245fd8a6 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -68,6 +68,10 @@ const messages = defineMessages({
68 id: 'settings.app.form.privateNotifications', 68 id: 'settings.app.form.privateNotifications',
69 defaultMessage: '!!!Don\'t show message content in notifications', 69 defaultMessage: '!!!Don\'t show message content in notifications',
70 }, 70 },
71 clipboardNotifications: {
72 id: 'settings.app.form.clipboardNotifications',
73 defaultMessage: '!!!Don\'t show notifications for clipboard events',
74 },
71 notifyTaskBarOnMessage: { 75 notifyTaskBarOnMessage: {
72 id: 'settings.app.form.notifyTaskBarOnMessage', 76 id: 'settings.app.form.notifyTaskBarOnMessage',
73 defaultMessage: '!!!Notify TaskBar/Dock on new message', 77 defaultMessage: '!!!Notify TaskBar/Dock on new message',
@@ -248,6 +252,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
248 minimizeToSystemTray: settingsData.minimizeToSystemTray, 252 minimizeToSystemTray: settingsData.minimizeToSystemTray,
249 closeToSystemTray: settingsData.closeToSystemTray, 253 closeToSystemTray: settingsData.closeToSystemTray,
250 privateNotifications: settingsData.privateNotifications, 254 privateNotifications: settingsData.privateNotifications,
255 clipboardNotifications: settingsData.clipboardNotifications,
251 notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage, 256 notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage,
252 navigationBarBehaviour: settingsData.navigationBarBehaviour, 257 navigationBarBehaviour: settingsData.navigationBarBehaviour,
253 searchEngine: settingsData.searchEngine, 258 searchEngine: settingsData.searchEngine,
@@ -400,6 +405,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
400 value: settings.all.app.privateNotifications, 405 value: settings.all.app.privateNotifications,
401 default: DEFAULT_APP_SETTINGS.privateNotifications, 406 default: DEFAULT_APP_SETTINGS.privateNotifications,
402 }, 407 },
408 clipboardNotifications: {
409 label: intl.formatMessage(messages.clipboardNotifications),
410 value: settings.all.app.clipboardNotifications,
411 default: DEFAULT_APP_SETTINGS.clipboardNotifications,
412 },
403 notifyTaskBarOnMessage: { 413 notifyTaskBarOnMessage: {
404 label: intl.formatMessage(messages.notifyTaskBarOnMessage), 414 label: intl.formatMessage(messages.notifyTaskBarOnMessage),
405 value: settings.all.app.notifyTaskBarOnMessage, 415 value: settings.all.app.notifyTaskBarOnMessage,
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index a72d5c89..2f998a2c 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -5029,445 +5029,458 @@
5029 } 5029 }
5030 }, 5030 },
5031 { 5031 {
5032 "defaultMessage": "!!!Notify TaskBar/Dock on new message", 5032 "defaultMessage": "!!!Don't show notifications for clipboard events",
5033 "end": { 5033 "end": {
5034 "column": 3, 5034 "column": 3,
5035 "line": 74 5035 "line": 74
5036 }, 5036 },
5037 "file": "src/containers/settings/EditSettingsScreen.js", 5037 "file": "src/containers/settings/EditSettingsScreen.js",
5038 "id": "settings.app.form.notifyTaskBarOnMessage", 5038 "id": "settings.app.form.clipboardNotifications",
5039 "start": { 5039 "start": {
5040 "column": 26, 5040 "column": 26,
5041 "line": 71 5041 "line": 71
5042 } 5042 }
5043 }, 5043 },
5044 { 5044 {
5045 "defaultMessage": "!!!Navigation bar behaviour", 5045 "defaultMessage": "!!!Notify TaskBar/Dock on new message",
5046 "end": { 5046 "end": {
5047 "column": 3, 5047 "column": 3,
5048 "line": 78 5048 "line": 78
5049 }, 5049 },
5050 "file": "src/containers/settings/EditSettingsScreen.js", 5050 "file": "src/containers/settings/EditSettingsScreen.js",
5051 "id": "settings.app.form.navigationBarBehaviour", 5051 "id": "settings.app.form.notifyTaskBarOnMessage",
5052 "start": { 5052 "start": {
5053 "column": 26, 5053 "column": 26,
5054 "line": 75 5054 "line": 75
5055 } 5055 }
5056 }, 5056 },
5057 { 5057 {
5058 "defaultMessage": "!!!Search engine", 5058 "defaultMessage": "!!!Navigation bar behaviour",
5059 "end": { 5059 "end": {
5060 "column": 3, 5060 "column": 3,
5061 "line": 82 5061 "line": 82
5062 }, 5062 },
5063 "file": "src/containers/settings/EditSettingsScreen.js", 5063 "file": "src/containers/settings/EditSettingsScreen.js",
5064 "id": "settings.app.form.navigationBarBehaviour",
5065 "start": {
5066 "column": 26,
5067 "line": 79
5068 }
5069 },
5070 {
5071 "defaultMessage": "!!!Search engine",
5072 "end": {
5073 "column": 3,
5074 "line": 86
5075 },
5076 "file": "src/containers/settings/EditSettingsScreen.js",
5064 "id": "settings.app.form.searchEngine", 5077 "id": "settings.app.form.searchEngine",
5065 "start": { 5078 "start": {
5066 "column": 16, 5079 "column": 16,
5067 "line": 79 5080 "line": 83
5068 } 5081 }
5069 }, 5082 },
5070 { 5083 {
5071 "defaultMessage": "!!!Send telemetry data", 5084 "defaultMessage": "!!!Send telemetry data",
5072 "end": { 5085 "end": {
5073 "column": 3, 5086 "column": 3,
5074 "line": 86 5087 "line": 90
5075 }, 5088 },
5076 "file": "src/containers/settings/EditSettingsScreen.js", 5089 "file": "src/containers/settings/EditSettingsScreen.js",
5077 "id": "settings.app.form.sentry", 5090 "id": "settings.app.form.sentry",
5078 "start": { 5091 "start": {
5079 "column": 10, 5092 "column": 10,
5080 "line": 83 5093 "line": 87
5081 } 5094 }
5082 }, 5095 },
5083 { 5096 {
5084 "defaultMessage": "!!!Enable service hibernation", 5097 "defaultMessage": "!!!Enable service hibernation",
5085 "end": { 5098 "end": {
5086 "column": 3, 5099 "column": 3,
5087 "line": 90 5100 "line": 94
5088 }, 5101 },
5089 "file": "src/containers/settings/EditSettingsScreen.js", 5102 "file": "src/containers/settings/EditSettingsScreen.js",
5090 "id": "settings.app.form.hibernate", 5103 "id": "settings.app.form.hibernate",
5091 "start": { 5104 "start": {
5092 "column": 13, 5105 "column": 13,
5093 "line": 87 5106 "line": 91
5094 } 5107 }
5095 }, 5108 },
5096 { 5109 {
5097 "defaultMessage": "!!!Keep services in hibernation on startup", 5110 "defaultMessage": "!!!Keep services in hibernation on startup",
5098 "end": { 5111 "end": {
5099 "column": 3, 5112 "column": 3,
5100 "line": 94 5113 "line": 98
5101 }, 5114 },
5102 "file": "src/containers/settings/EditSettingsScreen.js", 5115 "file": "src/containers/settings/EditSettingsScreen.js",
5103 "id": "settings.app.form.hibernateOnStartup", 5116 "id": "settings.app.form.hibernateOnStartup",
5104 "start": { 5117 "start": {
5105 "column": 22, 5118 "column": 22,
5106 "line": 91 5119 "line": 95
5107 } 5120 }
5108 }, 5121 },
5109 { 5122 {
5110 "defaultMessage": "!!!Hibernation strategy", 5123 "defaultMessage": "!!!Hibernation strategy",
5111 "end": { 5124 "end": {
5112 "column": 3, 5125 "column": 3,
5113 "line": 98 5126 "line": 102
5114 }, 5127 },
5115 "file": "src/containers/settings/EditSettingsScreen.js", 5128 "file": "src/containers/settings/EditSettingsScreen.js",
5116 "id": "settings.app.form.hibernationStrategy", 5129 "id": "settings.app.form.hibernationStrategy",
5117 "start": { 5130 "start": {
5118 "column": 23, 5131 "column": 23,
5119 "line": 95 5132 "line": 99
5120 } 5133 }
5121 }, 5134 },
5122 { 5135 {
5123 "defaultMessage": "!!!Todo Server", 5136 "defaultMessage": "!!!Todo Server",
5124 "end": { 5137 "end": {
5125 "column": 3, 5138 "column": 3,
5126 "line": 102 5139 "line": 106
5127 }, 5140 },
5128 "file": "src/containers/settings/EditSettingsScreen.js", 5141 "file": "src/containers/settings/EditSettingsScreen.js",
5129 "id": "settings.app.form.predefinedTodoServer", 5142 "id": "settings.app.form.predefinedTodoServer",
5130 "start": { 5143 "start": {
5131 "column": 24, 5144 "column": 24,
5132 "line": 99 5145 "line": 103
5133 } 5146 }
5134 }, 5147 },
5135 { 5148 {
5136 "defaultMessage": "!!!Custom TodoServer", 5149 "defaultMessage": "!!!Custom TodoServer",
5137 "end": { 5150 "end": {
5138 "column": 3, 5151 "column": 3,
5139 "line": 106 5152 "line": 110
5140 }, 5153 },
5141 "file": "src/containers/settings/EditSettingsScreen.js", 5154 "file": "src/containers/settings/EditSettingsScreen.js",
5142 "id": "settings.app.form.customTodoServer", 5155 "id": "settings.app.form.customTodoServer",
5143 "start": { 5156 "start": {
5144 "column": 20, 5157 "column": 20,
5145 "line": 103 5158 "line": 107
5146 } 5159 }
5147 }, 5160 },
5148 { 5161 {
5149 "defaultMessage": "!!!Enable Password Lock", 5162 "defaultMessage": "!!!Enable Password Lock",
5150 "end": { 5163 "end": {
5151 "column": 3, 5164 "column": 3,
5152 "line": 110 5165 "line": 114
5153 }, 5166 },
5154 "file": "src/containers/settings/EditSettingsScreen.js", 5167 "file": "src/containers/settings/EditSettingsScreen.js",
5155 "id": "settings.app.form.enableLock", 5168 "id": "settings.app.form.enableLock",
5156 "start": { 5169 "start": {
5157 "column": 14, 5170 "column": 14,
5158 "line": 107 5171 "line": 111
5159 } 5172 }
5160 }, 5173 },
5161 { 5174 {
5162 "defaultMessage": "!!!Password", 5175 "defaultMessage": "!!!Password",
5163 "end": { 5176 "end": {
5164 "column": 3, 5177 "column": 3,
5165 "line": 114 5178 "line": 118
5166 }, 5179 },
5167 "file": "src/containers/settings/EditSettingsScreen.js", 5180 "file": "src/containers/settings/EditSettingsScreen.js",
5168 "id": "settings.app.form.lockPassword", 5181 "id": "settings.app.form.lockPassword",
5169 "start": { 5182 "start": {
5170 "column": 16, 5183 "column": 16,
5171 "line": 111 5184 "line": 115
5172 } 5185 }
5173 }, 5186 },
5174 { 5187 {
5175 "defaultMessage": "!!!Allow using Touch ID to unlock", 5188 "defaultMessage": "!!!Allow using Touch ID to unlock",
5176 "end": { 5189 "end": {
5177 "column": 3, 5190 "column": 3,
5178 "line": 118 5191 "line": 122
5179 }, 5192 },
5180 "file": "src/containers/settings/EditSettingsScreen.js", 5193 "file": "src/containers/settings/EditSettingsScreen.js",
5181 "id": "settings.app.form.useTouchIdToUnlock", 5194 "id": "settings.app.form.useTouchIdToUnlock",
5182 "start": { 5195 "start": {
5183 "column": 22, 5196 "column": 22,
5184 "line": 115 5197 "line": 119
5185 } 5198 }
5186 }, 5199 },
5187 { 5200 {
5188 "defaultMessage": "!!!Lock after inactivity", 5201 "defaultMessage": "!!!Lock after inactivity",
5189 "end": { 5202 "end": {
5190 "column": 3, 5203 "column": 3,
5191 "line": 122 5204 "line": 126
5192 }, 5205 },
5193 "file": "src/containers/settings/EditSettingsScreen.js", 5206 "file": "src/containers/settings/EditSettingsScreen.js",
5194 "id": "settings.app.form.inactivityLock", 5207 "id": "settings.app.form.inactivityLock",
5195 "start": { 5208 "start": {
5196 "column": 18, 5209 "column": 18,
5197 "line": 119 5210 "line": 123
5198 } 5211 }
5199 }, 5212 },
5200 { 5213 {
5201 "defaultMessage": "!!!Enable scheduled Do-not-Disturb", 5214 "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
5202 "end": { 5215 "end": {
5203 "column": 3, 5216 "column": 3,
5204 "line": 126 5217 "line": 130
5205 }, 5218 },
5206 "file": "src/containers/settings/EditSettingsScreen.js", 5219 "file": "src/containers/settings/EditSettingsScreen.js",
5207 "id": "settings.app.form.scheduledDNDEnabled", 5220 "id": "settings.app.form.scheduledDNDEnabled",
5208 "start": { 5221 "start": {
5209 "column": 23, 5222 "column": 23,
5210 "line": 123 5223 "line": 127
5211 } 5224 }
5212 }, 5225 },
5213 { 5226 {
5214 "defaultMessage": "!!!From", 5227 "defaultMessage": "!!!From",
5215 "end": { 5228 "end": {
5216 "column": 3, 5229 "column": 3,
5217 "line": 130 5230 "line": 134
5218 }, 5231 },
5219 "file": "src/containers/settings/EditSettingsScreen.js", 5232 "file": "src/containers/settings/EditSettingsScreen.js",
5220 "id": "settings.app.form.scheduledDNDStart", 5233 "id": "settings.app.form.scheduledDNDStart",
5221 "start": { 5234 "start": {
5222 "column": 21, 5235 "column": 21,
5223 "line": 127 5236 "line": 131
5224 } 5237 }
5225 }, 5238 },
5226 { 5239 {
5227 "defaultMessage": "!!!To", 5240 "defaultMessage": "!!!To",
5228 "end": { 5241 "end": {
5229 "column": 3, 5242 "column": 3,
5230 "line": 134 5243 "line": 138
5231 }, 5244 },
5232 "file": "src/containers/settings/EditSettingsScreen.js", 5245 "file": "src/containers/settings/EditSettingsScreen.js",
5233 "id": "settings.app.form.scheduledDNDEnd", 5246 "id": "settings.app.form.scheduledDNDEnd",
5234 "start": { 5247 "start": {
5235 "column": 19, 5248 "column": 19,
5236 "line": 131 5249 "line": 135
5237 } 5250 }
5238 }, 5251 },
5239 { 5252 {
5240 "defaultMessage": "!!!Language", 5253 "defaultMessage": "!!!Language",
5241 "end": { 5254 "end": {
5242 "column": 3, 5255 "column": 3,
5243 "line": 138 5256 "line": 142
5244 }, 5257 },
5245 "file": "src/containers/settings/EditSettingsScreen.js", 5258 "file": "src/containers/settings/EditSettingsScreen.js",
5246 "id": "settings.app.form.language", 5259 "id": "settings.app.form.language",
5247 "start": { 5260 "start": {
5248 "column": 12, 5261 "column": 12,
5249 "line": 135 5262 "line": 139
5250 } 5263 }
5251 }, 5264 },
5252 { 5265 {
5253 "defaultMessage": "!!!Dark Mode", 5266 "defaultMessage": "!!!Dark Mode",
5254 "end": { 5267 "end": {
5255 "column": 3, 5268 "column": 3,
5256 "line": 142 5269 "line": 146
5257 }, 5270 },
5258 "file": "src/containers/settings/EditSettingsScreen.js", 5271 "file": "src/containers/settings/EditSettingsScreen.js",
5259 "id": "settings.app.form.darkMode", 5272 "id": "settings.app.form.darkMode",
5260 "start": { 5273 "start": {
5261 "column": 12, 5274 "column": 12,
5262 "line": 139 5275 "line": 143
5263 } 5276 }
5264 }, 5277 },
5265 { 5278 {
5266 "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting", 5279 "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
5267 "end": { 5280 "end": {
5268 "column": 3, 5281 "column": 3,
5269 "line": 146 5282 "line": 150
5270 }, 5283 },
5271 "file": "src/containers/settings/EditSettingsScreen.js", 5284 "file": "src/containers/settings/EditSettingsScreen.js",
5272 "id": "settings.app.form.adaptableDarkMode", 5285 "id": "settings.app.form.adaptableDarkMode",
5273 "start": { 5286 "start": {
5274 "column": 21, 5287 "column": 21,
5275 "line": 143 5288 "line": 147
5276 } 5289 }
5277 }, 5290 },
5278 { 5291 {
5279 "defaultMessage": "!!!Enable universal Dark Mode", 5292 "defaultMessage": "!!!Enable universal Dark Mode",
5280 "end": { 5293 "end": {
5281 "column": 3, 5294 "column": 3,
5282 "line": 150 5295 "line": 154
5283 }, 5296 },
5284 "file": "src/containers/settings/EditSettingsScreen.js", 5297 "file": "src/containers/settings/EditSettingsScreen.js",
5285 "id": "settings.app.form.universalDarkMode", 5298 "id": "settings.app.form.universalDarkMode",
5286 "start": { 5299 "start": {
5287 "column": 21, 5300 "column": 21,
5288 "line": 147 5301 "line": 151
5289 } 5302 }
5290 }, 5303 },
5291 { 5304 {
5292 "defaultMessage": "!!!Sidebar width", 5305 "defaultMessage": "!!!Sidebar width",
5293 "end": { 5306 "end": {
5294 "column": 3, 5307 "column": 3,
5295 "line": 154 5308 "line": 158
5296 }, 5309 },
5297 "file": "src/containers/settings/EditSettingsScreen.js", 5310 "file": "src/containers/settings/EditSettingsScreen.js",
5298 "id": "settings.app.form.serviceRibbonWidth", 5311 "id": "settings.app.form.serviceRibbonWidth",
5299 "start": { 5312 "start": {
5300 "column": 22, 5313 "column": 22,
5301 "line": 151 5314 "line": 155
5302 } 5315 }
5303 }, 5316 },
5304 { 5317 {
5305 "defaultMessage": "!!!Service icon size", 5318 "defaultMessage": "!!!Service icon size",
5306 "end": { 5319 "end": {
5307 "column": 3, 5320 "column": 3,
5308 "line": 158 5321 "line": 162
5309 }, 5322 },
5310 "file": "src/containers/settings/EditSettingsScreen.js", 5323 "file": "src/containers/settings/EditSettingsScreen.js",
5311 "id": "settings.app.form.iconSize", 5324 "id": "settings.app.form.iconSize",
5312 "start": { 5325 "start": {
5313 "column": 12, 5326 "column": 12,
5314 "line": 155 5327 "line": 159
5315 } 5328 }
5316 }, 5329 },
5317 { 5330 {
5318 "defaultMessage": "!!!Use vertical style", 5331 "defaultMessage": "!!!Use vertical style",
5319 "end": { 5332 "end": {
5320 "column": 3, 5333 "column": 3,
5321 "line": 162 5334 "line": 166
5322 }, 5335 },
5323 "file": "src/containers/settings/EditSettingsScreen.js", 5336 "file": "src/containers/settings/EditSettingsScreen.js",
5324 "id": "settings.app.form.useVerticalStyle", 5337 "id": "settings.app.form.useVerticalStyle",
5325 "start": { 5338 "start": {
5326 "column": 20, 5339 "column": 20,
5327 "line": 159 5340 "line": 163
5328 } 5341 }
5329 }, 5342 },
5330 { 5343 {
5331 "defaultMessage": "!!!Always show workspace drawer", 5344 "defaultMessage": "!!!Always show workspace drawer",
5332 "end": { 5345 "end": {
5333 "column": 3, 5346 "column": 3,
5334 "line": 166 5347 "line": 170
5335 }, 5348 },
5336 "file": "src/containers/settings/EditSettingsScreen.js", 5349 "file": "src/containers/settings/EditSettingsScreen.js",
5337 "id": "settings.app.form.alwaysShowWorkspaces", 5350 "id": "settings.app.form.alwaysShowWorkspaces",
5338 "start": { 5351 "start": {
5339 "column": 24, 5352 "column": 24,
5340 "line": 163 5353 "line": 167
5341 } 5354 }
5342 }, 5355 },
5343 { 5356 {
5344 "defaultMessage": "!!!Accent color", 5357 "defaultMessage": "!!!Accent color",
5345 "end": { 5358 "end": {
5346 "column": 3, 5359 "column": 3,
5347 "line": 170 5360 "line": 174
5348 }, 5361 },
5349 "file": "src/containers/settings/EditSettingsScreen.js", 5362 "file": "src/containers/settings/EditSettingsScreen.js",
5350 "id": "settings.app.form.accentColor", 5363 "id": "settings.app.form.accentColor",
5351 "start": { 5364 "start": {
5352 "column": 15, 5365 "column": 15,
5353 "line": 167 5366 "line": 171
5354 } 5367 }
5355 }, 5368 },
5356 { 5369 {
5357 "defaultMessage": "!!!Display disabled services tabs", 5370 "defaultMessage": "!!!Display disabled services tabs",
5358 "end": { 5371 "end": {
5359 "column": 3, 5372 "column": 3,
5360 "line": 174 5373 "line": 178
5361 }, 5374 },
5362 "file": "src/containers/settings/EditSettingsScreen.js", 5375 "file": "src/containers/settings/EditSettingsScreen.js",
5363 "id": "settings.app.form.showDisabledServices", 5376 "id": "settings.app.form.showDisabledServices",
5364 "start": { 5377 "start": {
5365 "column": 24, 5378 "column": 24,
5366 "line": 171 5379 "line": 175
5367 } 5380 }
5368 }, 5381 },
5369 { 5382 {
5370 "defaultMessage": "!!!Show unread message badge when notifications are disabled", 5383 "defaultMessage": "!!!Show unread message badge when notifications are disabled",
5371 "end": { 5384 "end": {
5372 "column": 3, 5385 "column": 3,
5373 "line": 178 5386 "line": 182
5374 }, 5387 },
5375 "file": "src/containers/settings/EditSettingsScreen.js", 5388 "file": "src/containers/settings/EditSettingsScreen.js",
5376 "id": "settings.app.form.showMessagesBadgesWhenMuted", 5389 "id": "settings.app.form.showMessagesBadgesWhenMuted",
5377 "start": { 5390 "start": {
5378 "column": 29, 5391 "column": 29,
5379 "line": 175 5392 "line": 179
5380 } 5393 }
5381 }, 5394 },
5382 { 5395 {
5383 "defaultMessage": "!!!Show draggable area on window", 5396 "defaultMessage": "!!!Show draggable area on window",
5384 "end": { 5397 "end": {
5385 "column": 3, 5398 "column": 3,
5386 "line": 182 5399 "line": 186
5387 }, 5400 },
5388 "file": "src/containers/settings/EditSettingsScreen.js", 5401 "file": "src/containers/settings/EditSettingsScreen.js",
5389 "id": "settings.app.form.showDragArea", 5402 "id": "settings.app.form.showDragArea",
5390 "start": { 5403 "start": {
5391 "column": 16, 5404 "column": 16,
5392 "line": 179 5405 "line": 183
5393 } 5406 }
5394 }, 5407 },
5395 { 5408 {
5396 "defaultMessage": "!!!Enable spell checking", 5409 "defaultMessage": "!!!Enable spell checking",
5397 "end": { 5410 "end": {
5398 "column": 3, 5411 "column": 3,
5399 "line": 186 5412 "line": 190
5400 }, 5413 },
5401 "file": "src/containers/settings/EditSettingsScreen.js", 5414 "file": "src/containers/settings/EditSettingsScreen.js",
5402 "id": "settings.app.form.enableSpellchecking", 5415 "id": "settings.app.form.enableSpellchecking",
5403 "start": { 5416 "start": {
5404 "column": 23, 5417 "column": 23,
5405 "line": 183 5418 "line": 187
5406 } 5419 }
5407 }, 5420 },
5408 { 5421 {
5409 "defaultMessage": "!!!Enable GPU Acceleration", 5422 "defaultMessage": "!!!Enable GPU Acceleration",
5410 "end": { 5423 "end": {
5411 "column": 3, 5424 "column": 3,
5412 "line": 190 5425 "line": 194
5413 }, 5426 },
5414 "file": "src/containers/settings/EditSettingsScreen.js", 5427 "file": "src/containers/settings/EditSettingsScreen.js",
5415 "id": "settings.app.form.enableGPUAcceleration", 5428 "id": "settings.app.form.enableGPUAcceleration",
5416 "start": { 5429 "start": {
5417 "column": 25, 5430 "column": 25,
5418 "line": 187 5431 "line": 191
5419 } 5432 }
5420 }, 5433 },
5421 { 5434 {
5422 "defaultMessage": "!!!Include beta versions", 5435 "defaultMessage": "!!!Include beta versions",
5423 "end": { 5436 "end": {
5424 "column": 3, 5437 "column": 3,
5425 "line": 194 5438 "line": 198
5426 }, 5439 },
5427 "file": "src/containers/settings/EditSettingsScreen.js", 5440 "file": "src/containers/settings/EditSettingsScreen.js",
5428 "id": "settings.app.form.beta", 5441 "id": "settings.app.form.beta",
5429 "start": { 5442 "start": {
5430 "column": 8, 5443 "column": 8,
5431 "line": 191 5444 "line": 195
5432 } 5445 }
5433 }, 5446 },
5434 { 5447 {
5435 "defaultMessage": "!!!Enable updates", 5448 "defaultMessage": "!!!Enable updates",
5436 "end": { 5449 "end": {
5437 "column": 3, 5450 "column": 3,
5438 "line": 198 5451 "line": 202
5439 }, 5452 },
5440 "file": "src/containers/settings/EditSettingsScreen.js", 5453 "file": "src/containers/settings/EditSettingsScreen.js",
5441 "id": "settings.app.form.automaticUpdates", 5454 "id": "settings.app.form.automaticUpdates",
5442 "start": { 5455 "start": {
5443 "column": 20, 5456 "column": 20,
5444 "line": 195 5457 "line": 199
5445 } 5458 }
5446 }, 5459 },
5447 { 5460 {
5448 "defaultMessage": "!!!Enable Franz Todos", 5461 "defaultMessage": "!!!Enable Franz Todos",
5449 "end": { 5462 "end": {
5450 "column": 3, 5463 "column": 3,
5451 "line": 202 5464 "line": 206
5452 }, 5465 },
5453 "file": "src/containers/settings/EditSettingsScreen.js", 5466 "file": "src/containers/settings/EditSettingsScreen.js",
5454 "id": "settings.app.form.enableTodos", 5467 "id": "settings.app.form.enableTodos",
5455 "start": { 5468 "start": {
5456 "column": 15, 5469 "column": 15,
5457 "line": 199 5470 "line": 203
5458 } 5471 }
5459 }, 5472 },
5460 { 5473 {
5461 "defaultMessage": "!!!Keep all workspaces loaded", 5474 "defaultMessage": "!!!Keep all workspaces loaded",
5462 "end": { 5475 "end": {
5463 "column": 3, 5476 "column": 3,
5464 "line": 206 5477 "line": 210
5465 }, 5478 },
5466 "file": "src/containers/settings/EditSettingsScreen.js", 5479 "file": "src/containers/settings/EditSettingsScreen.js",
5467 "id": "settings.app.form.keepAllWorkspacesLoaded", 5480 "id": "settings.app.form.keepAllWorkspacesLoaded",
5468 "start": { 5481 "start": {
5469 "column": 27, 5482 "column": 27,
5470 "line": 203 5483 "line": 207
5471 } 5484 }
5472 } 5485 }
5473 ], 5486 ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ef1da3d0..415af9a7 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -293,6 +293,7 @@
293 "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", 293 "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
294 "settings.app.form.automaticUpdates": "Enable updates", 294 "settings.app.form.automaticUpdates": "Enable updates",
295 "settings.app.form.beta": "Include beta versions", 295 "settings.app.form.beta": "Include beta versions",
296 "settings.app.form.clipboardNotifications": "Don't show notifications for clipboard events",
296 "settings.app.form.closeToSystemTray": "Close Ferdi to system tray", 297 "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
297 "settings.app.form.customTodoServer": "Custom Todo Server", 298 "settings.app.form.customTodoServer": "Custom Todo Server",
298 "settings.app.form.darkMode": "Enable dark mode", 299 "settings.app.form.darkMode": "Enable dark mode",
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 55cb3ba1..cd5462b5 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -130,8 +130,8 @@
130 } 130 }
131 }, 131 },
132 { 132 {
133 "id": "settings.app.form.notifyTaskBarOnMessage", 133 "id": "settings.app.form.clipboardNotifications",
134 "defaultMessage": "!!!Notify TaskBar/Dock on new message", 134 "defaultMessage": "!!!Don't show notifications for clipboard events",
135 "file": "src/containers/settings/EditSettingsScreen.js", 135 "file": "src/containers/settings/EditSettingsScreen.js",
136 "start": { 136 "start": {
137 "line": 71, 137 "line": 71,
@@ -143,8 +143,8 @@
143 } 143 }
144 }, 144 },
145 { 145 {
146 "id": "settings.app.form.navigationBarBehaviour", 146 "id": "settings.app.form.notifyTaskBarOnMessage",
147 "defaultMessage": "!!!Navigation bar behaviour", 147 "defaultMessage": "!!!Notify TaskBar/Dock on new message",
148 "file": "src/containers/settings/EditSettingsScreen.js", 148 "file": "src/containers/settings/EditSettingsScreen.js",
149 "start": { 149 "start": {
150 "line": 75, 150 "line": 75,
@@ -156,15 +156,28 @@
156 } 156 }
157 }, 157 },
158 { 158 {
159 "id": "settings.app.form.navigationBarBehaviour",
160 "defaultMessage": "!!!Navigation bar behaviour",
161 "file": "src/containers/settings/EditSettingsScreen.js",
162 "start": {
163 "line": 79,
164 "column": 26
165 },
166 "end": {
167 "line": 82,
168 "column": 3
169 }
170 },
171 {
159 "id": "settings.app.form.searchEngine", 172 "id": "settings.app.form.searchEngine",
160 "defaultMessage": "!!!Search engine", 173 "defaultMessage": "!!!Search engine",
161 "file": "src/containers/settings/EditSettingsScreen.js", 174 "file": "src/containers/settings/EditSettingsScreen.js",
162 "start": { 175 "start": {
163 "line": 79, 176 "line": 83,
164 "column": 16 177 "column": 16
165 }, 178 },
166 "end": { 179 "end": {
167 "line": 82, 180 "line": 86,
168 "column": 3 181 "column": 3
169 } 182 }
170 }, 183 },
@@ -173,11 +186,11 @@
173 "defaultMessage": "!!!Send telemetry data", 186 "defaultMessage": "!!!Send telemetry data",
174 "file": "src/containers/settings/EditSettingsScreen.js", 187 "file": "src/containers/settings/EditSettingsScreen.js",
175 "start": { 188 "start": {
176 "line": 83, 189 "line": 87,
177 "column": 10 190 "column": 10
178 }, 191 },
179 "end": { 192 "end": {
180 "line": 86, 193 "line": 90,
181 "column": 3 194 "column": 3
182 } 195 }
183 }, 196 },
@@ -186,11 +199,11 @@
186 "defaultMessage": "!!!Enable service hibernation", 199 "defaultMessage": "!!!Enable service hibernation",
187 "file": "src/containers/settings/EditSettingsScreen.js", 200 "file": "src/containers/settings/EditSettingsScreen.js",
188 "start": { 201 "start": {
189 "line": 87, 202 "line": 91,
190 "column": 13 203 "column": 13
191 }, 204 },
192 "end": { 205 "end": {
193 "line": 90, 206 "line": 94,
194 "column": 3 207 "column": 3
195 } 208 }
196 }, 209 },
@@ -199,11 +212,11 @@
199 "defaultMessage": "!!!Keep services in hibernation on startup", 212 "defaultMessage": "!!!Keep services in hibernation on startup",
200 "file": "src/containers/settings/EditSettingsScreen.js", 213 "file": "src/containers/settings/EditSettingsScreen.js",
201 "start": { 214 "start": {
202 "line": 91, 215 "line": 95,
203 "column": 22 216 "column": 22
204 }, 217 },
205 "end": { 218 "end": {
206 "line": 94, 219 "line": 98,
207 "column": 3 220 "column": 3
208 } 221 }
209 }, 222 },
@@ -212,11 +225,11 @@
212 "defaultMessage": "!!!Hibernation strategy", 225 "defaultMessage": "!!!Hibernation strategy",
213 "file": "src/containers/settings/EditSettingsScreen.js", 226 "file": "src/containers/settings/EditSettingsScreen.js",
214 "start": { 227 "start": {
215 "line": 95, 228 "line": 99,
216 "column": 23 229 "column": 23
217 }, 230 },
218 "end": { 231 "end": {
219 "line": 98, 232 "line": 102,
220 "column": 3 233 "column": 3
221 } 234 }
222 }, 235 },
@@ -225,11 +238,11 @@
225 "defaultMessage": "!!!Todo Server", 238 "defaultMessage": "!!!Todo Server",
226 "file": "src/containers/settings/EditSettingsScreen.js", 239 "file": "src/containers/settings/EditSettingsScreen.js",
227 "start": { 240 "start": {
228 "line": 99, 241 "line": 103,
229 "column": 24 242 "column": 24
230 }, 243 },
231 "end": { 244 "end": {
232 "line": 102, 245 "line": 106,
233 "column": 3 246 "column": 3
234 } 247 }
235 }, 248 },
@@ -238,11 +251,11 @@
238 "defaultMessage": "!!!Custom TodoServer", 251 "defaultMessage": "!!!Custom TodoServer",
239 "file": "src/containers/settings/EditSettingsScreen.js", 252 "file": "src/containers/settings/EditSettingsScreen.js",
240 "start": { 253 "start": {
241 "line": 103, 254 "line": 107,
242 "column": 20 255 "column": 20
243 }, 256 },
244 "end": { 257 "end": {
245 "line": 106, 258 "line": 110,
246 "column": 3 259 "column": 3
247 } 260 }
248 }, 261 },
@@ -251,11 +264,11 @@
251 "defaultMessage": "!!!Enable Password Lock", 264 "defaultMessage": "!!!Enable Password Lock",
252 "file": "src/containers/settings/EditSettingsScreen.js", 265 "file": "src/containers/settings/EditSettingsScreen.js",
253 "start": { 266 "start": {
254 "line": 107, 267 "line": 111,
255 "column": 14 268 "column": 14
256 }, 269 },
257 "end": { 270 "end": {
258 "line": 110, 271 "line": 114,
259 "column": 3 272 "column": 3
260 } 273 }
261 }, 274 },
@@ -264,11 +277,11 @@
264 "defaultMessage": "!!!Password", 277 "defaultMessage": "!!!Password",
265 "file": "src/containers/settings/EditSettingsScreen.js", 278 "file": "src/containers/settings/EditSettingsScreen.js",
266 "start": { 279 "start": {
267 "line": 111, 280 "line": 115,
268 "column": 16 281 "column": 16
269 }, 282 },
270 "end": { 283 "end": {
271 "line": 114, 284 "line": 118,
272 "column": 3 285 "column": 3
273 } 286 }
274 }, 287 },
@@ -277,11 +290,11 @@
277 "defaultMessage": "!!!Allow using Touch ID to unlock", 290 "defaultMessage": "!!!Allow using Touch ID to unlock",
278 "file": "src/containers/settings/EditSettingsScreen.js", 291 "file": "src/containers/settings/EditSettingsScreen.js",
279 "start": { 292 "start": {
280 "line": 115, 293 "line": 119,
281 "column": 22 294 "column": 22
282 }, 295 },
283 "end": { 296 "end": {
284 "line": 118, 297 "line": 122,
285 "column": 3 298 "column": 3
286 } 299 }
287 }, 300 },
@@ -290,11 +303,11 @@
290 "defaultMessage": "!!!Lock after inactivity", 303 "defaultMessage": "!!!Lock after inactivity",
291 "file": "src/containers/settings/EditSettingsScreen.js", 304 "file": "src/containers/settings/EditSettingsScreen.js",
292 "start": { 305 "start": {
293 "line": 119, 306 "line": 123,
294 "column": 18 307 "column": 18
295 }, 308 },
296 "end": { 309 "end": {
297 "line": 122, 310 "line": 126,
298 "column": 3 311 "column": 3
299 } 312 }
300 }, 313 },
@@ -303,11 +316,11 @@
303 "defaultMessage": "!!!Enable scheduled Do-not-Disturb", 316 "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
304 "file": "src/containers/settings/EditSettingsScreen.js", 317 "file": "src/containers/settings/EditSettingsScreen.js",
305 "start": { 318 "start": {
306 "line": 123, 319 "line": 127,
307 "column": 23 320 "column": 23
308 }, 321 },
309 "end": { 322 "end": {
310 "line": 126, 323 "line": 130,
311 "column": 3 324 "column": 3
312 } 325 }
313 }, 326 },
@@ -316,11 +329,11 @@
316 "defaultMessage": "!!!From", 329 "defaultMessage": "!!!From",
317 "file": "src/containers/settings/EditSettingsScreen.js", 330 "file": "src/containers/settings/EditSettingsScreen.js",
318 "start": { 331 "start": {
319 "line": 127, 332 "line": 131,
320 "column": 21 333 "column": 21
321 }, 334 },
322 "end": { 335 "end": {
323 "line": 130, 336 "line": 134,
324 "column": 3 337 "column": 3
325 } 338 }
326 }, 339 },
@@ -329,11 +342,11 @@
329 "defaultMessage": "!!!To", 342 "defaultMessage": "!!!To",
330 "file": "src/containers/settings/EditSettingsScreen.js", 343 "file": "src/containers/settings/EditSettingsScreen.js",
331 "start": { 344 "start": {
332 "line": 131, 345 "line": 135,
333 "column": 19 346 "column": 19
334 }, 347 },
335 "end": { 348 "end": {
336 "line": 134, 349 "line": 138,
337 "column": 3 350 "column": 3
338 } 351 }
339 }, 352 },
@@ -342,11 +355,11 @@
342 "defaultMessage": "!!!Language", 355 "defaultMessage": "!!!Language",
343 "file": "src/containers/settings/EditSettingsScreen.js", 356 "file": "src/containers/settings/EditSettingsScreen.js",
344 "start": { 357 "start": {
345 "line": 135, 358 "line": 139,
346 "column": 12 359 "column": 12
347 }, 360 },
348 "end": { 361 "end": {
349 "line": 138, 362 "line": 142,
350 "column": 3 363 "column": 3
351 } 364 }
352 }, 365 },
@@ -355,11 +368,11 @@
355 "defaultMessage": "!!!Dark Mode", 368 "defaultMessage": "!!!Dark Mode",
356 "file": "src/containers/settings/EditSettingsScreen.js", 369 "file": "src/containers/settings/EditSettingsScreen.js",
357 "start": { 370 "start": {
358 "line": 139, 371 "line": 143,
359 "column": 12 372 "column": 12
360 }, 373 },
361 "end": { 374 "end": {
362 "line": 142, 375 "line": 146,
363 "column": 3 376 "column": 3
364 } 377 }
365 }, 378 },
@@ -368,11 +381,11 @@
368 "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting", 381 "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
369 "file": "src/containers/settings/EditSettingsScreen.js", 382 "file": "src/containers/settings/EditSettingsScreen.js",
370 "start": { 383 "start": {
371 "line": 143, 384 "line": 147,
372 "column": 21 385 "column": 21
373 }, 386 },
374 "end": { 387 "end": {
375 "line": 146, 388 "line": 150,
376 "column": 3 389 "column": 3
377 } 390 }
378 }, 391 },
@@ -381,11 +394,11 @@
381 "defaultMessage": "!!!Enable universal Dark Mode", 394 "defaultMessage": "!!!Enable universal Dark Mode",
382 "file": "src/containers/settings/EditSettingsScreen.js", 395 "file": "src/containers/settings/EditSettingsScreen.js",
383 "start": { 396 "start": {
384 "line": 147, 397 "line": 151,
385 "column": 21 398 "column": 21
386 }, 399 },
387 "end": { 400 "end": {
388 "line": 150, 401 "line": 154,
389 "column": 3 402 "column": 3
390 } 403 }
391 }, 404 },
@@ -394,11 +407,11 @@
394 "defaultMessage": "!!!Sidebar width", 407 "defaultMessage": "!!!Sidebar width",
395 "file": "src/containers/settings/EditSettingsScreen.js", 408 "file": "src/containers/settings/EditSettingsScreen.js",
396 "start": { 409 "start": {
397 "line": 151, 410 "line": 155,
398 "column": 22 411 "column": 22
399 }, 412 },
400 "end": { 413 "end": {
401 "line": 154, 414 "line": 158,
402 "column": 3 415 "column": 3
403 } 416 }
404 }, 417 },
@@ -407,11 +420,11 @@
407 "defaultMessage": "!!!Service icon size", 420 "defaultMessage": "!!!Service icon size",
408 "file": "src/containers/settings/EditSettingsScreen.js", 421 "file": "src/containers/settings/EditSettingsScreen.js",
409 "start": { 422 "start": {
410 "line": 155, 423 "line": 159,
411 "column": 12 424 "column": 12
412 }, 425 },
413 "end": { 426 "end": {
414 "line": 158, 427 "line": 162,
415 "column": 3 428 "column": 3
416 } 429 }
417 }, 430 },
@@ -420,11 +433,11 @@
420 "defaultMessage": "!!!Use vertical style", 433 "defaultMessage": "!!!Use vertical style",
421 "file": "src/containers/settings/EditSettingsScreen.js", 434 "file": "src/containers/settings/EditSettingsScreen.js",
422 "start": { 435 "start": {
423 "line": 159, 436 "line": 163,
424 "column": 20 437 "column": 20
425 }, 438 },
426 "end": { 439 "end": {
427 "line": 162, 440 "line": 166,
428 "column": 3 441 "column": 3
429 } 442 }
430 }, 443 },
@@ -433,11 +446,11 @@
433 "defaultMessage": "!!!Always show workspace drawer", 446 "defaultMessage": "!!!Always show workspace drawer",
434 "file": "src/containers/settings/EditSettingsScreen.js", 447 "file": "src/containers/settings/EditSettingsScreen.js",
435 "start": { 448 "start": {
436 "line": 163, 449 "line": 167,
437 "column": 24 450 "column": 24
438 }, 451 },
439 "end": { 452 "end": {
440 "line": 166, 453 "line": 170,
441 "column": 3 454 "column": 3
442 } 455 }
443 }, 456 },
@@ -446,11 +459,11 @@
446 "defaultMessage": "!!!Accent color", 459 "defaultMessage": "!!!Accent color",
447 "file": "src/containers/settings/EditSettingsScreen.js", 460 "file": "src/containers/settings/EditSettingsScreen.js",
448 "start": { 461 "start": {
449 "line": 167, 462 "line": 171,
450 "column": 15 463 "column": 15
451 }, 464 },
452 "end": { 465 "end": {
453 "line": 170, 466 "line": 174,
454 "column": 3 467 "column": 3
455 } 468 }
456 }, 469 },
@@ -459,11 +472,11 @@
459 "defaultMessage": "!!!Display disabled services tabs", 472 "defaultMessage": "!!!Display disabled services tabs",
460 "file": "src/containers/settings/EditSettingsScreen.js", 473 "file": "src/containers/settings/EditSettingsScreen.js",
461 "start": { 474 "start": {
462 "line": 171, 475 "line": 175,
463 "column": 24 476 "column": 24
464 }, 477 },
465 "end": { 478 "end": {
466 "line": 174, 479 "line": 178,
467 "column": 3 480 "column": 3
468 } 481 }
469 }, 482 },
@@ -472,11 +485,11 @@
472 "defaultMessage": "!!!Show unread message badge when notifications are disabled", 485 "defaultMessage": "!!!Show unread message badge when notifications are disabled",
473 "file": "src/containers/settings/EditSettingsScreen.js", 486 "file": "src/containers/settings/EditSettingsScreen.js",
474 "start": { 487 "start": {
475 "line": 175, 488 "line": 179,
476 "column": 29 489 "column": 29
477 }, 490 },
478 "end": { 491 "end": {
479 "line": 178, 492 "line": 182,
480 "column": 3 493 "column": 3
481 } 494 }
482 }, 495 },
@@ -485,11 +498,11 @@
485 "defaultMessage": "!!!Show draggable area on window", 498 "defaultMessage": "!!!Show draggable area on window",
486 "file": "src/containers/settings/EditSettingsScreen.js", 499 "file": "src/containers/settings/EditSettingsScreen.js",
487 "start": { 500 "start": {
488 "line": 179, 501 "line": 183,
489 "column": 16 502 "column": 16
490 }, 503 },
491 "end": { 504 "end": {
492 "line": 182, 505 "line": 186,
493 "column": 3 506 "column": 3
494 } 507 }
495 }, 508 },
@@ -498,11 +511,11 @@
498 "defaultMessage": "!!!Enable spell checking", 511 "defaultMessage": "!!!Enable spell checking",
499 "file": "src/containers/settings/EditSettingsScreen.js", 512 "file": "src/containers/settings/EditSettingsScreen.js",
500 "start": { 513 "start": {
501 "line": 183, 514 "line": 187,
502 "column": 23 515 "column": 23
503 }, 516 },
504 "end": { 517 "end": {
505 "line": 186, 518 "line": 190,
506 "column": 3 519 "column": 3
507 } 520 }
508 }, 521 },
@@ -511,11 +524,11 @@
511 "defaultMessage": "!!!Enable GPU Acceleration", 524 "defaultMessage": "!!!Enable GPU Acceleration",
512 "file": "src/containers/settings/EditSettingsScreen.js", 525 "file": "src/containers/settings/EditSettingsScreen.js",
513 "start": { 526 "start": {
514 "line": 187, 527 "line": 191,
515 "column": 25 528 "column": 25
516 }, 529 },
517 "end": { 530 "end": {
518 "line": 190, 531 "line": 194,
519 "column": 3 532 "column": 3
520 } 533 }
521 }, 534 },
@@ -524,11 +537,11 @@
524 "defaultMessage": "!!!Include beta versions", 537 "defaultMessage": "!!!Include beta versions",
525 "file": "src/containers/settings/EditSettingsScreen.js", 538 "file": "src/containers/settings/EditSettingsScreen.js",
526 "start": { 539 "start": {
527 "line": 191, 540 "line": 195,
528 "column": 8 541 "column": 8
529 }, 542 },
530 "end": { 543 "end": {
531 "line": 194, 544 "line": 198,
532 "column": 3 545 "column": 3
533 } 546 }
534 }, 547 },
@@ -537,11 +550,11 @@
537 "defaultMessage": "!!!Enable updates", 550 "defaultMessage": "!!!Enable updates",
538 "file": "src/containers/settings/EditSettingsScreen.js", 551 "file": "src/containers/settings/EditSettingsScreen.js",
539 "start": { 552 "start": {
540 "line": 195, 553 "line": 199,
541 "column": 20 554 "column": 20
542 }, 555 },
543 "end": { 556 "end": {
544 "line": 198, 557 "line": 202,
545 "column": 3 558 "column": 3
546 } 559 }
547 }, 560 },
@@ -550,11 +563,11 @@
550 "defaultMessage": "!!!Enable Franz Todos", 563 "defaultMessage": "!!!Enable Franz Todos",
551 "file": "src/containers/settings/EditSettingsScreen.js", 564 "file": "src/containers/settings/EditSettingsScreen.js",
552 "start": { 565 "start": {
553 "line": 199, 566 "line": 203,
554 "column": 15 567 "column": 15
555 }, 568 },
556 "end": { 569 "end": {
557 "line": 202, 570 "line": 206,
558 "column": 3 571 "column": 3
559 } 572 }
560 }, 573 },
@@ -563,11 +576,11 @@
563 "defaultMessage": "!!!Keep all workspaces loaded", 576 "defaultMessage": "!!!Keep all workspaces loaded",
564 "file": "src/containers/settings/EditSettingsScreen.js", 577 "file": "src/containers/settings/EditSettingsScreen.js",
565 "start": { 578 "start": {
566 "line": 203, 579 "line": 207,
567 "column": 27 580 "column": 27
568 }, 581 },
569 "end": { 582 "end": {
570 "line": 206, 583 "line": 210,
571 "column": 3 584 "column": 3
572 } 585 }
573 } 586 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 11915bc4..48b12896 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -134,6 +134,11 @@ export default class ServicesStore extends Store {
134 () => this.stores.settings.app.searchEngine, 134 () => this.stores.settings.app.searchEngine,
135 () => this._shareSettingsWithServiceProcess(), 135 () => this._shareSettingsWithServiceProcess(),
136 ); 136 );
137
138 reaction(
139 () => this.stores.settings.app.clipboardNotifications,
140 () => this._shareSettingsWithServiceProcess(),
141 );
137 } 142 }
138 143
139 initialize() { 144 initialize() {
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index f19d863e..567a2d47 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -3,7 +3,7 @@ import ContextMenuBuilder from './contextMenuBuilder';
3 3
4const webContents = getCurrentWebContents(); 4const webContents = getCurrentWebContents();
5 5
6export default async function setupContextMenu(isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage, getSearchEngine) { 6export default async function setupContextMenu(isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage, getSearchEngine, getClipboardNotifications) {
7 const contextMenuBuilder = new ContextMenuBuilder( 7 const contextMenuBuilder = new ContextMenuBuilder(
8 webContents, 8 webContents,
9 ); 9 );
@@ -11,7 +11,7 @@ export default async function setupContextMenu(isSpellcheckEnabled, getDefaultSp
11 webContents.on('context-menu', (e, props) => { 11 webContents.on('context-menu', (e, props) => {
12 // TODO?: e.preventDefault(); 12 // TODO?: e.preventDefault();
13 contextMenuBuilder.showPopupMenu( 13 contextMenuBuilder.showPopupMenu(
14 { ...props, searchEngine: getSearchEngine() }, 14 { ...props, searchEngine: getSearchEngine(), clipboardNotifications: getClipboardNotifications() },
15 isSpellcheckEnabled(), 15 isSpellcheckEnabled(),
16 getDefaultSpellcheckerLanguage(), 16 getDefaultSpellcheckerLanguage(),
17 getSpellcheckerLanguage(), 17 getSpellcheckerLanguage(),
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 7c178145..c26f192f 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -161,7 +161,7 @@ module.exports = class ContextMenuBuilder {
161 // Omit the mailto: portion of the link; we just want the address 161 // Omit the mailto: portion of the link; we just want the address
162 const url = isEmailAddress ? menuInfo.linkText : menuInfo.linkURL; 162 const url = isEmailAddress ? menuInfo.linkText : menuInfo.linkURL;
163 clipboard.writeText(url); 163 clipboard.writeText(url);
164 this.sendNotificationOnClipboardEvent(`Link URL copied: ${url}`); 164 this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Link URL copied: ${url}`);
165 }, 165 },
166 }); 166 });
167 167
@@ -321,7 +321,7 @@ module.exports = class ContextMenuBuilder {
321 const result = this.convertImageToBase64(menuInfo.srcURL, 321 const result = this.convertImageToBase64(menuInfo.srcURL,
322 dataURL => clipboard.writeImage(nativeImage.createFromDataURL(dataURL))); 322 dataURL => clipboard.writeImage(nativeImage.createFromDataURL(dataURL)));
323 323
324 this.sendNotificationOnClipboardEvent(`Image copied from URL: ${menuInfo.srcURL}`); 324 this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image copied from URL: ${menuInfo.srcURL}`);
325 return result; 325 return result;
326 }, 326 },
327 }); 327 });
@@ -332,7 +332,7 @@ module.exports = class ContextMenuBuilder {
332 label: this.stringTable.copyImageUrl(), 332 label: this.stringTable.copyImageUrl(),
333 click: () => { 333 click: () => {
334 const result = clipboard.writeText(menuInfo.srcURL); 334 const result = clipboard.writeText(menuInfo.srcURL);
335 this.sendNotificationOnClipboardEvent(`Image URL copied: ${menuInfo.srcURL}`); 335 this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image URL copied: ${menuInfo.srcURL}`);
336 return result; 336 return result;
337 }, 337 },
338 }); 338 });
@@ -357,7 +357,7 @@ module.exports = class ContextMenuBuilder {
357 }, 357 },
358 }); 358 });
359 }); 359 });
360 this.sendNotificationOnClipboardEvent(`Image downloaded: ${urlWithoutBlob}`); 360 this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Image downloaded: ${urlWithoutBlob}`);
361 }, 361 },
362 }); 362 });
363 363
@@ -520,7 +520,7 @@ module.exports = class ContextMenuBuilder {
520 enabled: true, 520 enabled: true,
521 click: () => { 521 click: () => {
522 clipboard.writeText(window.location.href); 522 clipboard.writeText(window.location.href);
523 this.sendNotificationOnClipboardEvent(`Page URL copied: ${window.location.href}`); 523 this._sendNotificationOnClipboardEvent(menu.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
524 }, 524 },
525 })); 525 }));
526 526
@@ -560,11 +560,14 @@ module.exports = class ContextMenuBuilder {
560 return menu; 560 return menu;
561 } 561 }
562 562
563 sendNotificationOnClipboardEvent(notificationText) { 563 _sendNotificationOnClipboardEvent(isDisabled, notificationText) {
564 if (isDisabled) {
565 return;
566 }
564 // eslint-disable-next-line no-new 567 // eslint-disable-next-line no-new
565 new window.Notification('Data copied into Clipboard', 568 new window.Notification('Data copied into Clipboard',
566 { 569 {
567 body: notificationText, 570 body: notificationText(),
568 }); 571 });
569 } 572 }
570}; 573};
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 5a24effa..6c382d38 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -92,6 +92,7 @@ class RecipeController {
92 () => this.settings.app.spellcheckerLanguage, 92 () => this.settings.app.spellcheckerLanguage,
93 () => this.spellcheckerLanguage, 93 () => this.spellcheckerLanguage,
94 () => this.settings.app.searchEngine, 94 () => this.settings.app.searchEngine,
95 () => this.settings.app.clipboardNotifications,
95 ); 96 );
96 97
97 autorun(() => this.update()); 98 autorun(() => this.update());