Skip to content

Commit

Permalink
Update default font family name
Browse files Browse the repository at this point in the history
  • Loading branch information
eigenmiao committed Jul 16, 2023
1 parent fdf8abf commit b317136
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 13 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down Expand Up @@ -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
Expand All @@ -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/).

Expand Down
3 changes: 2 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion rickrack/rickrack.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"""

__VERSION__ = """
v2.8.35-x3d3s3-pre
v2.8.36-x3d3s3-pre
"""

__AUTHOR__ = """
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name="Rickrack",
version="2.8.35",
version="2.8.36",
author="Eigenmiao",
author_email="[email protected]",
description="Generate harmonious colors freely.",
Expand Down
2 changes: 1 addition & 1 deletion src/build/settings/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"app_name": "Rickrack",
"author": "Eigenmiao",
"main_module": "src/main/python/main.py",
"version": "2.8.35"
"version": "2.8.36"
}
2 changes: 1 addition & 1 deletion src/main/python/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"""

__VERSION__ = """
v2.8.35-x3d3s3-pre
v2.8.36-x3d3s3-pre
"""

__AUTHOR__ = """
Expand Down
8 changes: 4 additions & 4 deletions src/main/python/ricore/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b317136

Please sign in to comment.