From e8a64e25a08b050b8097da63334d8e4c9d349bd7 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Mon, 24 Feb 2020 17:49:34 +0100 Subject: Add ability to change sidebar width --- src/components/settings/settings/EditSettingsForm.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 6017252bc..5a373be4c 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -468,6 +468,10 @@ export default @observer class EditSettingsForm extends Component {
+ this.submit(e)} -- cgit v1.2.3-54-g00ecf From 8fe27d40f06aedec6a7c752542908d0bc6af091b Mon Sep 17 00:00:00 2001 From: vantezzen Date: Mon, 24 Feb 2020 18:16:08 +0100 Subject: #153 Add ability to change service icon size --- .../settings/settings/EditSettingsForm.js | 2 + src/config.js | 13 ++ src/containers/settings/EditSettingsScreen.js | 20 ++- src/features/appearance/index.js | 26 +++- src/i18n/locales/defaultMessages.json | 145 +++++++++++---------- src/i18n/locales/en-US.json | 1 + .../containers/settings/EditSettingsScreen.json | 145 +++++++++++---------- 7 files changed, 213 insertions(+), 139 deletions(-) (limited to 'src/components') diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 5a373be4c..432a546d9 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -470,6 +470,8 @@ export default @observer class EditSettingsForm extends Component { +
( + settings.all.app.iconSize + ), + () => { + updateStyle(settings.all.app); + }, + ); } diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 2a0965b06..44411cdad 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -4087,429 +4087,442 @@ "defaultMessage": "!!!Launch Ferdi on start", "end": { "column": 3, - "line": 32 + "line": 34 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchOnStart", "start": { "column": 21, - "line": 29 + "line": 31 } }, { "defaultMessage": "!!!Open in background", "end": { "column": 3, - "line": 36 + "line": 38 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.autoLaunchInBackground", "start": { "column": 26, - "line": 33 + "line": 35 } }, { "defaultMessage": "!!!Keep Ferdi in background when closing the window", "end": { "column": 3, - "line": 40 + "line": 42 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.runInBackground", "start": { "column": 19, - "line": 37 + "line": 39 } }, { "defaultMessage": "!!!Start minimized in tray", "end": { "column": 3, - "line": 44 + "line": 46 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.startMinimized", "start": { "column": 18, - "line": 41 + "line": 43 } }, { "defaultMessage": "!!!Always show Ferdi in system tray", "end": { "column": 3, - "line": 48 + "line": 50 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSystemTray", "start": { "column": 20, - "line": 45 + "line": 47 } }, { "defaultMessage": "!!!Minimize Ferdi to system tray", "end": { "column": 3, - "line": 52 + "line": 54 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.minimizeToSystemTray", "start": { "column": 24, - "line": 49 + "line": 51 } }, { "defaultMessage": "!!!Don't show message content in notifications", "end": { "column": 3, - "line": 56 + "line": 58 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.privateNotifications", "start": { "column": 24, - "line": 53 + "line": 55 } }, { "defaultMessage": "!!!Always show service navigation bar", "end": { "column": 3, - "line": 60 + "line": 62 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showServiceNavigationBar", "start": { "column": 28, - "line": 57 + "line": 59 } }, { "defaultMessage": "!!!Send telemetry data", "end": { "column": 3, - "line": 64 + "line": 66 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.sentry", "start": { "column": 10, - "line": 61 + "line": 63 } }, { "defaultMessage": "!!!Enable service hibernation", "end": { "column": 3, - "line": 68 + "line": 70 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernate", "start": { "column": 13, - "line": 65 + "line": 67 } }, { "defaultMessage": "!!!Hibernation strategy", "end": { "column": 3, - "line": 72 + "line": 74 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.hibernationStrategy", "start": { "column": 23, - "line": 69 + "line": 71 } }, { "defaultMessage": "!!!Server", "end": { "column": 3, - "line": 76 + "line": 78 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.server", "start": { "column": 10, - "line": 73 + "line": 75 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 80 + "line": 82 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.todoServer", "start": { "column": 14, - "line": 77 + "line": 79 } }, { "defaultMessage": "!!!Enable Password Lock", "end": { "column": 3, - "line": 84 + "line": 86 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableLock", "start": { "column": 14, - "line": 81 + "line": 83 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 88 + "line": 90 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.lockPassword", "start": { "column": 16, - "line": 85 + "line": 87 } }, { "defaultMessage": "!!!Lock after inactivity", "end": { "column": 3, - "line": 92 + "line": 94 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.inactivityLock", "start": { "column": 18, - "line": 89 + "line": 91 } }, { "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "end": { "column": 3, - "line": 96 + "line": 98 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnabled", "start": { "column": 23, - "line": 93 + "line": 95 } }, { "defaultMessage": "!!!From", "end": { "column": 3, - "line": 100 + "line": 102 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDStart", "start": { "column": 21, - "line": 97 + "line": 99 } }, { "defaultMessage": "!!!To", "end": { "column": 3, - "line": 104 + "line": 106 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.scheduledDNDEnd", "start": { "column": 19, - "line": 101 + "line": 103 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 108 + "line": 110 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 105 + "line": 107 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 112 + "line": 114 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 109 + "line": 111 } }, { "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "end": { "column": 3, - "line": 116 + "line": 118 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.adaptableDarkMode", "start": { "column": 21, - "line": 113 + "line": 115 } }, { "defaultMessage": "!!!Enable universal Dark Mode", "end": { "column": 3, - "line": 120 + "line": 122 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.universalDarkMode", "start": { "column": 21, - "line": 117 + "line": 119 } }, { "defaultMessage": "!!!Sidebar width", "end": { "column": 3, - "line": 124 + "line": 126 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.serviceRibbonWidth", "start": { "column": 22, - "line": 121 + "line": 123 + } + }, + { + "defaultMessage": "!!!Service icon size", + "end": { + "column": 3, + "line": 130 + }, + "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.iconSize", + "start": { + "column": 12, + "line": 127 } }, { "defaultMessage": "!!!Accent color", "end": { "column": 3, - "line": 128 + "line": 134 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.accentColor", "start": { "column": 15, - "line": 125 + "line": 131 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 132 + "line": 138 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 129 + "line": 135 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 136 + "line": 142 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 133 + "line": 139 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 140 + "line": 146 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 137 + "line": 143 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 144 + "line": 150 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 141 + "line": 147 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 148 + "line": 154 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 145 + "line": 151 } }, { "defaultMessage": "!!!Disable updates", "end": { "column": 3, - "line": 152 + "line": 158 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.noUpdates", "start": { "column": 13, - "line": 149 + "line": 155 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 156 + "line": 162 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 153 + "line": 159 } }, { "defaultMessage": "!!!Keep all workspaces loaded", "end": { "column": 3, - "line": 160 + "line": 166 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.keepAllWorkspacesLoaded", "start": { "column": 27, - "line": 157 + "line": 163 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 23733dba0..97be15fed 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -278,6 +278,7 @@ "settings.app.form.enableTodos": "Enable Ferdi Todos", "settings.app.form.hibernate": "Enable service hibernation", "settings.app.form.hibernationStrategy": "Hibernation strategy", + "settings.app.form.iconSize": "Service icon size", "settings.app.form.inactivityLock": "Lock after inactivity", "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded", "settings.app.form.language": "Language", diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index cd5c004d7..98abb0f2b 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Launch Ferdi on start", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 29, + "line": 31, "column": 21 }, "end": { - "line": 32, + "line": 34, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Open in background", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 33, + "line": 35, "column": 26 }, "end": { - "line": 36, + "line": 38, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Keep Ferdi in background when closing the window", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 37, + "line": 39, "column": 19 }, "end": { - "line": 40, + "line": 42, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Start minimized in tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 41, + "line": 43, "column": 18 }, "end": { - "line": 44, + "line": 46, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Always show Ferdi in system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 45, + "line": 47, "column": 20 }, "end": { - "line": 48, + "line": 50, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Minimize Ferdi to system tray", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 49, + "line": 51, "column": 24 }, "end": { - "line": 52, + "line": 54, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Don't show message content in notifications", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 53, + "line": 55, "column": 24 }, "end": { - "line": 56, + "line": 58, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Always show service navigation bar", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 57, + "line": 59, "column": 28 }, "end": { - "line": 60, + "line": 62, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Send telemetry data", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 61, + "line": 63, "column": 10 }, "end": { - "line": 64, + "line": 66, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Enable service hibernation", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 65, + "line": 67, "column": 13 }, "end": { - "line": 68, + "line": 70, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Hibernation strategy", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 69, + "line": 71, "column": 23 }, "end": { - "line": 72, + "line": 74, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 73, + "line": 75, "column": 10 }, "end": { - "line": 76, + "line": 78, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Todo Server", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 77, + "line": 79, "column": 14 }, "end": { - "line": 80, + "line": 82, "column": 3 } }, @@ -173,11 +173,11 @@ "defaultMessage": "!!!Enable Password Lock", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 81, + "line": 83, "column": 14 }, "end": { - "line": 84, + "line": 86, "column": 3 } }, @@ -186,11 +186,11 @@ "defaultMessage": "!!!Password", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 85, + "line": 87, "column": 16 }, "end": { - "line": 88, + "line": 90, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Lock after inactivity", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 89, + "line": 91, "column": 18 }, "end": { - "line": 92, + "line": 94, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Enable scheduled Do-not-Disturb", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 93, + "line": 95, "column": 23 }, "end": { - "line": 96, + "line": 98, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!From", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 97, + "line": 99, "column": 21 }, "end": { - "line": 100, + "line": 102, "column": 3 } }, @@ -238,11 +238,11 @@ "defaultMessage": "!!!To", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 101, + "line": 103, "column": 19 }, "end": { - "line": 104, + "line": 106, "column": 3 } }, @@ -251,11 +251,11 @@ "defaultMessage": "!!!Language", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 105, + "line": 107, "column": 12 }, "end": { - "line": 108, + "line": 110, "column": 3 } }, @@ -264,11 +264,11 @@ "defaultMessage": "!!!Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 109, + "line": 111, "column": 12 }, "end": { - "line": 112, + "line": 114, "column": 3 } }, @@ -277,11 +277,11 @@ "defaultMessage": "!!!Synchronize dark mode with my Mac's dark mode setting", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 113, + "line": 115, "column": 21 }, "end": { - "line": 116, + "line": 118, "column": 3 } }, @@ -290,11 +290,11 @@ "defaultMessage": "!!!Enable universal Dark Mode", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 117, + "line": 119, "column": 21 }, "end": { - "line": 120, + "line": 122, "column": 3 } }, @@ -303,11 +303,24 @@ "defaultMessage": "!!!Sidebar width", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 121, + "line": 123, "column": 22 }, "end": { - "line": 124, + "line": 126, + "column": 3 + } + }, + { + "id": "settings.app.form.iconSize", + "defaultMessage": "!!!Service icon size", + "file": "src/containers/settings/EditSettingsScreen.js", + "start": { + "line": 127, + "column": 12 + }, + "end": { + "line": 130, "column": 3 } }, @@ -316,11 +329,11 @@ "defaultMessage": "!!!Accent color", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 125, + "line": 131, "column": 15 }, "end": { - "line": 128, + "line": 134, "column": 3 } }, @@ -329,11 +342,11 @@ "defaultMessage": "!!!Display disabled services tabs", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 129, + "line": 135, "column": 24 }, "end": { - "line": 132, + "line": 138, "column": 3 } }, @@ -342,11 +355,11 @@ "defaultMessage": "!!!Show unread message badge when notifications are disabled", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 133, + "line": 139, "column": 29 }, "end": { - "line": 136, + "line": 142, "column": 3 } }, @@ -355,11 +368,11 @@ "defaultMessage": "!!!Enable spell checking", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 137, + "line": 143, "column": 23 }, "end": { - "line": 140, + "line": 146, "column": 3 } }, @@ -368,11 +381,11 @@ "defaultMessage": "!!!Enable GPU Acceleration", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 141, + "line": 147, "column": 25 }, "end": { - "line": 144, + "line": 150, "column": 3 } }, @@ -381,11 +394,11 @@ "defaultMessage": "!!!Include beta versions", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 145, + "line": 151, "column": 8 }, "end": { - "line": 148, + "line": 154, "column": 3 } }, @@ -394,11 +407,11 @@ "defaultMessage": "!!!Disable updates", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 149, + "line": 155, "column": 13 }, "end": { - "line": 152, + "line": 158, "column": 3 } }, @@ -407,11 +420,11 @@ "defaultMessage": "!!!Enable Franz Todos", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 153, + "line": 159, "column": 15 }, "end": { - "line": 156, + "line": 162, "column": 3 } }, @@ -420,11 +433,11 @@ "defaultMessage": "!!!Keep all workspaces loaded", "file": "src/containers/settings/EditSettingsScreen.js", "start": { - "line": 157, + "line": 163, "column": 27 }, "end": { - "line": 160, + "line": 166, "column": 3 } } -- cgit v1.2.3-54-g00ecf