From b317136aa3484ebbac97303fd5a55495d91d0195 Mon Sep 17 00:00:00 2001 From: eigenmiao Date: Sun, 16 Jul 2023 20:50:35 +0800 Subject: [PATCH] Update default font family name --- CHANGELOG.md | 7 +++++++ README.md | 8 ++++---- SECURITY.md | 3 ++- rickrack/rickrack.py | 2 +- setup.py | 2 +- src/build/settings/base.json | 2 +- src/main/python/main.py | 2 +- src/main/python/ricore/args.py | 8 ++++---- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 017952d..35d1279 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -123,3 +123,10 @@ 8. Update interface theme colors. 9. Upgrade ersion of PyQt5 from 5.12.1 to 5.15.6. 10. Upgrade version of settings.json from 2 to 3 (x3d3s3). + +# v2.8.36-x3d3s3 +* Date: July 16, 2023 +* Tag: https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.36 +* Comments: +1. Update default font family name. +2. Fix default document directory on Linux. diff --git a/README.md b/README.md index 3952a2e..7423420 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ In the age of digital creativity, the color palette has become an indispensable Rickrack (**R**e**a**l-t**i**me **C**olor **K**it) is a free and user-friendly color editor. It is designed to generate a set of harmonious colors from the color wheel or other places. You can share these colors with your friends, or apply them into your creative works. What’s more, you can export them into individual files and import them into other softwares such as Adobe Photoshop, GIMP, Krita, Pencil 2D and Clip Studio Paint. Rickrack can run normally on operating systems such as Windows, Linux, and macOS. -[:rocket: v2.8.35 Update Notes](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.35) +[:rocket: v2.8.36 Update Notes](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.36) [:house: Rickrack](https://eigenmiao.com/rickrack) @@ -24,7 +24,7 @@ Rickrack (**R**e**a**l-t**i**me **C**olor **K**it) is a free and user-friendly c 焰火十二卷（实时色彩工具箱）是一款免费且实用的色彩编辑器。它可以帮助你从色轮或者其他地方生成一组和谐的色彩。你可以将这些色彩分享给其他人，或者应用到你自己的创作当中。此外，你也可以将色彩组或者色库导出为单独的色彩文档并导入其他软件中（如 Adobe Photoshop、GIMP、Krita、Pencil 2D 以及优动漫 Paint 等）。焰火十二卷可以在 Windows、Linux、macOS 等操作系统上正常运行。 -[:rocket: v2.8.35 更新说明](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.35) +[:rocket: v2.8.36 更新说明](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.36) [:house: 焰火十二卷](https://eigenmiao.com/yanhuo) @@ -196,7 +196,7 @@ Support the continuous development of Rickrack! # Installation ## Current Release -The latest preview version is [v2.8.35](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.35). +The latest preview version is [v2.8.36](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.36). ## Install Software ### Recommend: Install on Windows 10 or 11 via WinGet tool @@ -205,7 +205,7 @@ winget install rickrack ``` ## Install on other platforms -Download Software from [Github](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.35) or [Sourceforge](https://sourceforge.net/projects/rickrack/files/v2.8.35/). The installation steps are presented in [tutorials](https://eigenmiao.com/2021/12/12/rickrack-tutorial-en-v2.3.4/#Installation). +Download Software from [Github](https://github.com/eigenmiao/Rickrack/releases/tag/v2.8.36) or [Sourceforge](https://sourceforge.net/projects/rickrack/files/v2.8.36/). The installation steps are presented in [tutorials](https://eigenmiao.com/2021/12/12/rickrack-tutorial-en-v2.3.4/#Installation). Here is a [video tutorial](https://www.bilibili.com/video/BV17r4y1L7R6/). diff --git a/SECURITY.md b/SECURITY.md index 8066cef..a26e407 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,7 +4,8 @@ These versions of Rickrack are currently being supported with security updates. | Version | Supported | | --------------------- | ------------------ | -| v2.8.35-x3d3s3-pre | :white_check_mark: | +| v2.8.36-x3d3s3-pre | :white_check_mark: | +| v2.8.35-x3d3s3-pre | :x: | | v2.8.27-x2d3s3-pre | :x: | | v2.8.5-x2d3s3-pre | :x: | | v2.7.26-x2d3s3-stable | :white_check_mark: | diff --git a/rickrack/rickrack.py b/rickrack/rickrack.py index 8d602d8..ac5aa76 100644 --- a/rickrack/rickrack.py +++ b/rickrack/rickrack.py @@ -17,7 +17,7 @@ """ __VERSION__ = """ -v2.8.35-x3d3s3-pre +v2.8.36-x3d3s3-pre """ __AUTHOR__ = """ diff --git a/setup.py b/setup.py index 9e86a45..fa44ba0 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name="Rickrack", - version="2.8.35", + version="2.8.36", author="Eigenmiao", author_email="eigenmiao@outlook.com", description="Generate harmonious colors freely.", diff --git a/src/build/settings/base.json b/src/build/settings/base.json index 5e2c767..aa05f03 100644 --- a/src/build/settings/base.json +++ b/src/build/settings/base.json @@ -2,5 +2,5 @@ "app_name": "Rickrack", "author": "Eigenmiao", "main_module": "src/main/python/main.py", - "version": "2.8.35" + "version": "2.8.36" } \ No newline at end of file diff --git a/src/main/python/main.py b/src/main/python/main.py index 230d9c5..a7c34c2 100644 --- a/src/main/python/main.py +++ b/src/main/python/main.py @@ -17,7 +17,7 @@ """ __VERSION__ = """ -v2.8.35-x3d3s3-pre +v2.8.36-x3d3s3-pre """ __AUTHOR__ = """ diff --git a/src/main/python/ricore/args.py b/src/main/python/ricore/args.py index 6a560bb..27e3d6b 100644 --- a/src/main/python/ricore/args.py +++ b/src/main/python/ricore/args.py @@ -26,8 +26,8 @@ class Args(object): def __init__(self, resources, resetall=False, uselang=""): - self.info_version_zh = "v2.8.35-x3d3s3-预览版" - self.info_version_en = "v2.8.35-x3d3s3-pre" + self.info_version_zh = "v2.8.36-x3d3s3-预览版" + self.info_version_en = "v2.8.36-x3d3s3-pre" self.info_date_zh = "2023年7月16日" self.info_date_en = "July 16, 2023" self.global_temp_dir = None @@ -101,7 +101,7 @@ def __init__(self, resources, resetall=False, uselang=""): self.home_dir = os.path.expanduser('~') self.doc_name = "Documents" self.pic_name = "Pictures" - if not os.path.isfile(os.sep.join([self.home_dir, ".config", "user-dirs.dirs"])): + if os.path.isfile(os.sep.join([self.home_dir, ".config", "user-dirs.dirs"])): try: with open(os.sep.join([self.home_dir, ".config", "user-dirs.dirs"]), "r") as f: data = f.read().split() @@ -444,7 +444,7 @@ def load_settings(self, settings_file): if vid < 3: uss["circle_dist"] = 16 uss["font_size"] = 16 - uss["font_family"] = ["Noto Sans", ", Noto Sans SC", "Noto Sans TC", "Noto Sans JP"] + uss["font_family"] = ["Noto Sans", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP"] if vid == 0 or vid > 3: self.load_settings_failed = 2 self.backup_settings(settings_file)