Should fix #530

src/__tests__/__mock__/recurrence.txt

@@ -1,10 +1,10 @@
 
-2023-09-29 Line 1 rec:1d due:2023-09-30
-2023-09-29 Line 1 rec:w due:2023-10-06
-2023-09-29 Line 1 rec:2m due:2023-11-29
-2023-09-29 Line 1 rec:+1d due:2023-10-01
-2023-09-29 Line 1 rec:7w due:2023-11-17
+2023-10-09 Line 1 rec:1d due:2023-10-10
+2023-10-09 Line 1 rec:w due:2023-10-16
+2023-10-09 Line 1 rec:2m due:2023-12-09
+2023-10-09 Line 1 rec:+1d due:2023-10-11
+2023-10-09 Line 1 rec:7w due:2023-11-27
 2023-07-21 Line 1 due:2023-07-24 rec:+1b
 2021-01-01 taxes are due in one year t:2022-03-30 due:2022-04-30 rec:+1y
-2023-09-29 Water plants @home +quick due:2023-10-06 t:2023-09-26 rec:1w
-2023-09-29 Line 1 rec:+1d t:2023-09-20 due:2023-09-30
+2023-10-09 Water plants @home +quick due:2023-10-16 t:2023-10-06 rec:1w
+2023-10-09 Line 1 rec:+1d t:2023-09-20 due:2023-10-10

src/__tests__/__mock__/test.txt

@@ -1,5 +1,5 @@
 Line 1
 Edited line
 New line
-2023-09-29 New line with creation date
+2023-10-09 New line with creation date
 New line with relative threshold date t:June 3rd, 2005

src/main/config.tsx

@@ -7,6 +7,7 @@ import createMenu from './modules/Menu';
 import { createTray } from './modules/Tray';
 import { Sorting, File, ConfigData } from './util';
 import processDataRequest from './modules/ProcessDataRequest';
+import handleTheme from './modules/Theme';
 
 const userDataDirectory = path.join(app.getPath('userData'), 'userData' + app.getVersion());
 if (!fs.existsSync(userDataDirectory)) fs.mkdirSync(userDataDirectory)
@@ -145,18 +146,6 @@ configStorage.onDidChange('tray', () => {
   });
 });
 
-nativeTheme.on('updated', () => {
-  const shouldUseDarkColors = nativeTheme.shouldUseDarkColors;
-
-  configStorage.set('shouldUseDarkColors', shouldUseDarkColors);
-
-  mainWindow!.webContents.send('setShouldUseDarkColors', shouldUseDarkColors);
-
-  createTray().then(result => {
-    console.log('config.ts:', result);
-  }).catch(error => {
-    console.error('config.ts:', error);
-  });
-});
+nativeTheme.on('updated', handleTheme);
 
 export { configStorage, filterStorage };

src/main/main.ts

@@ -11,8 +11,9 @@ import log from 'electron-log';
 import createMenu from './modules/Menu';
 import { resolveHtmlPath, getAssetPath, File } from './util';
 import createFileWatcher from './modules/File/Watcher';
-import { createTray } from './modules/Tray';
+import createTray from './modules/Tray';
 import './modules/Ipc';
+import handleTheme from './modules/Theme';
 
 const files: File[] = (configStorage.get('files') as File[]) || [];
 const windowMaximized: boolean = configStorage.get('windowMaximized');
@@ -116,8 +117,7 @@ const createWindow = async() => {
     });
   }
 
-  const colorTheme = configStorage.get('colorTheme');
-  if(colorTheme) nativeTheme.themeSource = colorTheme;
+  handleTheme();
 
   handleWindowSizeAndPosition();
 

src/main/modules/Menu.tsx

@@ -214,12 +214,6 @@ function createMenu(files: File[]) {
               shell.openExternal('https://github.com/sponsors/ransome1');
             },
           },
-          {
-            label: 'Changelog',
-            click: () => {
-              shell.openExternal('https://github.com/ransome1/sleek/blob/master/CHANGELOG.md');
-            },
-          },
           {
             label: 'sleek on GitHub',
             click: () => {

src/main/modules/Theme.tsx

@@ -0,0 +1,20 @@
+import { nativeTheme } from 'electron';
+import { mainWindow } from '../main';
+import createTray from './Tray';
+import { configStorage } from '../config';
+
+const handleTheme = () => {
+    const shouldUseDarkColors = nativeTheme.shouldUseDarkColors;
+
+    configStorage.set('shouldUseDarkColors', shouldUseDarkColors);
+
+    mainWindow!.webContents.send('setShouldUseDarkColors', shouldUseDarkColors);
+
+    createTray().then(result => {
+		console.log('config.ts:', result);
+    }).catch(error => {
+		console.error('config.ts:', error);
+    });
+}
+
+export default handleTheme;

src/main/modules/Tray.tsx

@@ -74,4 +74,4 @@ function createTray() {
   }
 }
 
-export { createTray };
+export default createTray;