From 8ef5380b941a8f1483ee5d30e61a5086e669b12e Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Sat, 15 May 2021 18:34:25 +0530 Subject: Adding DuckDuckGo as an alternative search engine (#1414) * Adding DuckDuckGo as an alternative search engine. * Fixing review comments. * Fixing review comments. --- src/containers/settings/EditSettingsScreen.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 49ef03664..831732940 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -10,7 +10,7 @@ import TodosStore from '../../features/todos/store'; import Form from '../../lib/Form'; import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; import { - DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, TODO_APPS, + DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS, } from '../../config'; import { config as spellcheckerConfig } from '../../features/spellchecker'; @@ -71,6 +71,10 @@ const messages = defineMessages({ id: 'settings.app.form.navigationBarBehaviour', defaultMessage: '!!!Navigation bar behaviour', }, + searchEngine: { + id: 'settings.app.form.searchEngine', + defaultMessage: '!!!Search engine', + }, sentry: { id: 'settings.app.form.sentry', defaultMessage: '!!!Send telemetry data', @@ -241,6 +245,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e privateNotifications: settingsData.privateNotifications, notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage, navigationBarBehaviour: settingsData.navigationBarBehaviour, + searchEngine: settingsData.searchEngine, sentry: settingsData.sentry, hibernate: settingsData.hibernate, hibernateOnStartup: settingsData.hibernateOnStartup, @@ -313,6 +318,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e sort: false, }); + const searchEngines = getSelectOptions({ + locales: SEARCH_ENGINE_NAMES, + sort: false, + }); + const hibernationStrategies = getSelectOptions({ locales: HIBERNATION_STRATEGIES, sort: false, @@ -396,6 +406,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e default: DEFAULT_APP_SETTINGS.navigationBarBehaviour, options: navigationBarBehaviours, }, + searchEngine: { + label: intl.formatMessage(messages.searchEngine), + value: settings.all.app.searchEngine, + default: DEFAULT_APP_SETTINGS.searchEngine, + options: searchEngines, + }, sentry: { label: intl.formatMessage(messages.sentry), value: settings.all.app.sentry, -- cgit v1.2.3-70-g09d2