From b8e82696fd229598eba56b9391258e604d03ed1b Mon Sep 17 00:00:00 2001 From: ransome1 Date: Mon, 11 Dec 2023 17:42:15 +0100 Subject: [PATCH] Changed item in window menu for reasons of consistency, upgraded dependencies --- flatpak/com.github.ransome1.sleek.appdata.xml | 2 +- flatpak/com.github.ransome1.sleek.desktop | 2 +- package.json | 2 +- release/app/package.json | 2 +- snap/snapcraft.yaml | 2 +- src/__tests__/__mock__/recurrence.txt | 18 +++++++++--------- src/main/modules/Menu.tsx | 3 ++- yarn.lock | 9 ++++----- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flatpak/com.github.ransome1.sleek.appdata.xml b/flatpak/com.github.ransome1.sleek.appdata.xml index 6324459a..407c1830 100755 --- a/flatpak/com.github.ransome1.sleek.appdata.xml +++ b/flatpak/com.github.ransome1.sleek.appdata.xml @@ -9,7 +9,7 @@ Robin Ahle - + https://github.com/ransome1/sleek https://github.com/ransome1/sleek/issues diff --git a/flatpak/com.github.ransome1.sleek.desktop b/flatpak/com.github.ransome1.sleek.desktop index b2bfedfb..6cbc4114 100755 --- a/flatpak/com.github.ransome1.sleek.desktop +++ b/flatpak/com.github.ransome1.sleek.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=2.0.3-rc.5 +Version=2.0.3 Name=sleek Exec=sleek Type=Application diff --git a/package.json b/package.json index cea75188..30f24855 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sleek", - "version": "2.0.3-rc.5", + "version": "2.0.3", "main": "./src/main/main.ts", "scripts": { "build": "concurrently \"yarn run peggy\" \"yarn run build:main\" \"yarn run build:renderer\"", diff --git a/release/app/package.json b/release/app/package.json index 8bc2ef03..c57e1f74 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -1,6 +1,6 @@ { "name": "sleek", - "version": "2.0.3-rc.5", + "version": "2.0.3", "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)", "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)", "keywords": [ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3f1ecd4e..d09c011e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: sleek base: core20 -version: "2.0.3-rc.5" +version: "2.0.3" summary: todo.txt manager for Linux, free and open-source (FOSS) description: | sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. Stripped down to only the most necessary features, and with a clean and simple interface, sleek aims to help you focus on getting things done. diff --git a/src/__tests__/__mock__/recurrence.txt b/src/__tests__/__mock__/recurrence.txt index 3c5e2537..f04b88b0 100644 --- a/src/__tests__/__mock__/recurrence.txt +++ b/src/__tests__/__mock__/recurrence.txt @@ -1,12 +1,12 @@ -2023-12-10 Line 1 rec:1d due:2023-12-11 -2023-12-10 Line 1 rec:w due:2023-12-17 -2023-12-10 Line 1 rec:2m due:2024-02-10 -2023-12-10 Line 1 rec:+1d due:2023-12-12 -2023-12-10 Line 1 rec:7w due:2024-01-28 +2023-12-11 Line 1 rec:1d due:2023-12-12 +2023-12-11 Line 1 rec:w due:2023-12-18 +2023-12-11 Line 1 rec:2m due:2024-02-11 +2023-12-11 Line 1 rec:+1d due:2023-12-13 +2023-12-11 Line 1 rec:7w due:2024-01-29 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-12-10 Water plants @home +quick due:2023-12-17 t:2023-12-07 rec:1w -2023-12-10 Line 1 rec:+1d t:2023-09-20 -2023-12-10 Line 1 rec:1d pri:A due:2023-12-11 -2023-12-10 (A) Do something rec:d t:2023-12-11 @SomeContext \ No newline at end of file +2023-12-11 Water plants @home +quick due:2023-12-18 t:2023-12-18 rec:1w +2023-12-11 Line 1 rec:+1d t:2023-09-20 +2023-12-11 Line 1 rec:1d pri:A due:2023-12-12 +2023-12-11 (A) Do something rec:d t:2023-12-12 @SomeContext \ No newline at end of file diff --git a/src/main/modules/Menu.tsx b/src/main/modules/Menu.tsx index 313c13a9..ac393e2c 100644 --- a/src/main/modules/Menu.tsx +++ b/src/main/modules/Menu.tsx @@ -1,5 +1,6 @@ import { app, Menu, dialog, shell } from 'electron'; import { setFile } from './File/File'; +import { getActiveFile } from './File/Active'; import { mainWindow } from '../main'; import { openFile, createFile } from './File/Dialog'; import { configStorage, filterStorage } from '../config'; @@ -93,7 +94,7 @@ function createMenu(files: File[]) { : []), { type: 'separator' }, { - label: 'Close Window', + label: 'Close window', accelerator: 'CmdOrCtrl+W', role: 'close', }, diff --git a/yarn.lock b/yarn.lock index 25984ce1..8c793077 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1109,14 +1109,13 @@ fs-extra "^9.0.1" promise-retry "^2.0.1" -"@electron/notarize@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.0.tgz#40455f9d8ca8098a74567aa4613b709089d82657" - integrity sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg== +"@electron/notarize@^1.2.3": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.4.tgz#a7d38773f4cad40df111a5edc64037e5d768ea1e" + integrity sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg== dependencies: debug "^4.1.1" fs-extra "^9.0.1" - promise-retry "^2.0.1" "@electron/osx-sign@1.0.5": version "1.0.5"