Merge remote-tracking branch 'upstream/beta' into add-flatpak

.github/FUNDING.yml

@@ -1,12 +1,12 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
+patreon: L0drex # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: daehruoydeef
+liberapay: # liberapay user name
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: # Replace with a single custom sponsorship URL

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,75 @@
+name: Bug Report
+description: File a bug report
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of Yin & Yang are you running?
+    validations:
+      required: true
+  - type: dropdown
+    id: source
+    attributes:
+      label: How did you install Yin & Yang?
+      options:
+        - Git clone + running install script
+        - AUR
+        - Flatpak
+    validations:
+      required: true
+  - type: dropdown
+    id: desktop
+    attributes:
+      label: What desktop environments are you seeing the problem on?
+      multiple: true
+      options:
+        - KDE
+        - Gnome
+        - Xfce
+        - Mate
+        - Cinnamon
+        - other
+  - type: dropdown
+    id: plugins
+    attributes:
+      label: Which plugin causes the issue?
+      options:
+        - Atom
+        - Brave
+        - Colors
+        - Custom Script
+        - Firefox
+        - Gedit
+        - GTK
+        - Konsole
+        - Kvantum
+        - Only Office
+        - System
+        - VSCode
+        - Wallpaper
+  - type: input
+    id: plugin_version
+    attributes:
+      label: What software version do you use?
+      description: For example, if you see a problem with the VSCode plugin, this would refer to the version of VSCode you have installed.
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# Basic `dependabot.yml` file
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    target-branch: "beta"
+    labels:
+      - "update"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    labels:
+      - "update"
+    target-branch: "beta"

README.md

@@ -11,7 +11,7 @@ and also themes your favourite editors like VSCode or Atom.
 
 You might also want to take a look at our [**discussions page**](https://github.com/oskarsh/Yin-Yang/discussions), where we talk about the future of the app and other cool stuff!
 
-> Translations: [🇨🇳](README_zh.md)
+> Translations:[🇹🇼](README_zh_TW.md) [🇨🇳](README_zh_CN.md)
 
 ![Visualization](.github/images/header.png)
 ![App configuration](.github/images/settings.png)
@@ -49,19 +49,19 @@ Yin-Yang depends on `python-systemd` and `pyside6` from pypi. `python-systemd` r
 
 For CentOS, RHEL, and Fedora:
 ```bash
-sudo dnf install gcc systemd-devel python3-devel
+sudo dnf install gcc systemd-devel python3-devel libnotify
 ``` 
 
 For OpenSUSE:
 ```bash
 sudo zypper refresh
-sudo zypper install gcc systemd-devel
+sudo zypper install gcc systemd-devel libnotify
 ```
 
 For Debian, Ubuntu, etc.
 ```bash
 sudo apt update
-sudo apt install libsystemd-dev gcc pkg-config python3-dev
+sudo apt install libsystemd-dev gcc pkg-config python3-dev libnotify-bin
 ```
 
 Then you can install Yin-Yang in a python virtual environment:

README_zh_TW.md

@@ -0,0 +1,119 @@
+# ![Yin & Yang logo](resources/logo.svg) Yin-Yang
+
+![](https://img.shields.io/github/v/release/oskarsh/yin-yang)
+![](https://img.shields.io/github/v/release/oskarsh/yin-yang?include_prereleases)
+![](https://img.shields.io/github/downloads/oskarsh/yin-yang/total)
+![](https://img.shields.io/badge/Build%20with-Python-yellow)
+![](https://img.shields.io/github/license/oskarsh/yin-yang)
+
+Linux 的自動化主題管理員，支援 KDE、Gnome、Budgie 等桌面環境 
+還可以自動設定 VSCode、Atom 等應用程式的主題。
+
+安裝後可以查看我們的[**論壇**](https://github.com/oskarsh/Yin-Yang/discussions)，會有好康的！
+
+> 翻譯：[ 🇺🇸](README.md) [🇨🇳](README_zh_CN.md)
+
+![Visualization](.github/images/header.png)
+![App configuration](.github/images/settings.png)
+
+## 功能
+
+* 在自訂時間或是依照日出日落自動切換主題
+* 支援的桌面環境：
+  * Gnome
+  * Budgie
+  * KDE Plasma
+* 支援的應用程式：
+  * VSCode、Atom、gedit
+  * Firefox、Brave
+  * Kvantum
+  * Konsole
+  * OnlyOffice
+  * 等等...
+* 其他
+  * 自動更換桌布
+  * 自動推送通知
+  * 切換主題時播放聲音
+  * 自動執行腳本
+
+> 想看 ETA 的人可以查看[進度](https://github.com/oskarsh/Yin-Yang/projects?type=classic).
+
+## 安裝
+
+### Arch（BTW）系列
+Yin-Yang 可從 AUR 套件 [`yin-yang`](https://aur.archlinux.org/packages/yin-yang) 安裝
+
+
+### 自行編譯
+Yin-Yang 依賴 `python-systemd` 以及 `pyside6` 等 Pypi。`python-systemd` 依賴 systemd-headers 以及 `python3-devel` 等。
+
+CentOS、RHEL、Fedora：
+```bash
+sudo dnf install gcc systemd-devel python3-devel libnotify
+``` 
+
+OpenSUSE：
+```bash
+sudo zypper refresh
+sudo zypper install gcc systemd-devel libnotify
+```
+
+Debian 系列：
+```bash
+sudo apt update
+sudo apt install libsystemd-dev gcc pkg-config python3-dev libnotify-bin
+```
+
+接下來請安裝 Yin-Yang 至虛擬 python 環境：
+```bash
+# bash 是建議的 shell
+bash
+# 克隆原始碼
+git clone https://github.com/oskarsh/Yin-Yang.git
+cd Yin-Yang
+# 安裝 Yin-Yang
+./scripts/install.sh
+```
+
+開發者請略過安裝並且在家目錄中建立 vnev 資料夾
+```bash
+python -m venv .venv
+source .venv/bin/activate  # 此腳本是為了 bash 設計，若使用其他殼層，請在同個資料夾中尋找相容的腳本
+pip install -r requirements.txt
+```
+
+## 說明
+
+想要為此軟體貢獻？請查看維基尋找如何翻譯此軟體、或擴充功能等等！
+
+[![Generic badge](https://img.shields.io/badge/Visit-Wiki-BLUE.svg)](<https://github.com/oskarsh/Yin-Yang/wiki>)
+
+## 其他相似軟體
+
+- Windows 的自動暗黑模式[Windows Auto Night Mode](https://github.com/AutoDarkMode/Windows-Auto-Night-Mode)
+- Gnome 的自動暗黑模式[Night Theme Switcher](https://extensions.gnome.org/extension/2236/night-theme-switcher/)
+- Jetbrains IDE 自動暗黑模式 [Auto Dark Mode](https://github.com/weisJ/auto-dark-mode)
+- 自動化 KDE 藍光濾鏡 [Knight Adjuster](https://github.com/adrium/knightadjuster)
+- [darkman](https://gitlab.com/WhyNotHugo/darkman)
+- Firefox 的自動暗黑模式 [dark reader](https://darkreader.org/)
+
+## 感謝所有貢獻者！
+
+### 軟體貢獻者
+
+感謝你們！因為有這些貢獻者才有這個軟體的出現！[[貢獻](https://github.com/oskarsh/Yin-Yang/wiki/Contributing)].
+
+[![](https://opencollective.com/Yin-Yang/contributors.svg?button=false)](https://github.com/oskarsh/Yin-Yang/graphs/contributors)
+
+### 捐獻
+
+<a href="https://opencollective.com/Yin-Yang/organization/0/website"><img src="https://opencollective.com/Yin-Yang/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/1/website"><img src="https://opencollective.com/Yin-Yang/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/2/website"><img src="https://opencollective.com/Yin-Yang/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/3/website"><img src="https://opencollective.com/Yin-Yang/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/4/website"><img src="https://opencollective.com/Yin-Yang/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/5/website"><img src="https://opencollective.com/Yin-Yang/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/6/website"><img src="https://opencollective.com/Yin-Yang/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/7/website"><img src="https://opencollective.com/Yin-Yang/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/8/website"><img src="https://opencollective.com/Yin-Yang/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/Yin-Yang/organization/9/website"><img src="https://opencollective.com/Yin-Yang/organization/9/avatar.svg"></a>

designer/main_window.ui

@@ -296,13 +296,6 @@
           </layout>
          </widget>
         </item>
-        <item>
-         <widget class="QCheckBox" name="toggle_sound">
-          <property name="text">
-           <string>Make a sound when switching the theme</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QCheckBox" name="toggle_notification">
           <property name="text">
@@ -374,8 +367,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>518</width>
-             <height>88</height>
+             <width>501</width>
+             <height>86</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="plugins_scroll_content_layout">

requirements.txt

@@ -1,7 +1,7 @@
-psutil==5.9.5
+psutil==5.9.7
 PySide6-Essentials==6.6.1
 shiboken6==6.6.1
 PySide6-Addons==6.6.1
 suntime==1.2.5
 systemd-python==235
-requests~=2.28.2
+requests~=2.31.0

resources/translations/yin_yang.de_DE.ts

@@ -60,51 +60,46 @@
     </message>
     <message>
         <location filename="../../designer/main_window.ui" line="302"/>
-        <source>Make a sound when switching the theme</source>
-        <translation>Mache ein Geräusch, wenn das Thema geändert wird</translation>
-    </message>
-    <message>
-        <location filename="../../designer/main_window.ui" line="309"/>
         <source>Send a notification</source>
         <translation>Sende eine Benachrichtigung</translation>
     </message>
     <message>
-        <location filename="../../designer/main_window.ui" line="318"/>
+        <location filename="../../designer/main_window.ui" line="311"/>
         <source>Time to wait until the system finished booting. Default value is 10 seconds.</source>
         <translation>Zeit die gewartet werden soll während das System startet. Standardwert ist 10 Sekunden.</translation>
     </message>
     <message>
-        <location filename="../../designer/main_window.ui" line="321"/>
+        <location filename="../../designer/main_window.ui" line="314"/>
         <source>Delay after boot:</source>
         <translation>Verzögerung nach Start</translation>
     </message>
     <message>
-        <location filename="../../designer/main_window.ui" line="328"/>
+        <location filename="../../designer/main_window.ui" line="321"/>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../designer/main_window.ui" line="361"/>
+        <location filename="../../designer/main_window.ui" line="354"/>
         <source>Plugins</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>systray</name>
     <message>
-        <location filename="../../yin_yang/__main__.py" line="120"/>
+        <location filename="../../yin_yang/__main__.py" line="127"/>
         <source>Open Yin Yang</source>
         <comment>Context menu action in the systray</comment>
         <translation>Yin Yang öffnen</translation>
     </message>
     <message>
-        <location filename="../../yin_yang/__main__.py" line="121"/>
+        <location filename="../../yin_yang/__main__.py" line="130"/>
         <source>Toggle theme</source>
         <comment>Context menu action in the systray</comment>
         <translation type="unfinished">Farbschema wechseln</translation>
     </message>
     <message>
-        <location filename="../../yin_yang/__main__.py" line="122"/>
+        <location filename="../../yin_yang/__main__.py" line="133"/>
         <source>Quit</source>
         <comment>Context menu action in the systray</comment>
         <translation>Beenden</translation>