diff --git a/README.ja.md b/README.ja.md index bf89d7de..018f5ead 100644 --- a/README.ja.md +++ b/README.ja.md @@ -3,8 +3,10 @@ ![](docs/vrct_logo.png) [![GitHub release](https://img.shields.io/github/v/release/misyaguziya/VRCT.svg)](https://github.com/misyaguziya/VRCT/releases) [![Downloads](https://img.shields.io/github/downloads/misyaguziya/VRCT/total)](https://github.com/misyaguziya/VRCT/releases) -[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) +[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) [![Booth](https://img.shields.io/badge/Store-Booth.pm-red)](https://misyaguziya.booth.pm/items/5155325) +[![Github Sponsors](https://img.shields.io/badge/GitHub%20Sponsors-30363D?&logo=GitHub-Sponsors&logoColor=EA4AAA)](https://github.com/sponsors/misyaguziya) +[![PIXIV FANBOX](https://img.shields.io/badge/PIXIV%20FANBOX-30363D?)](https://vrct-dev.fanbox.cc/) | [English](./README.md) | **日本語** | [한국어](./README.ko.md) | [繁體中文](./README.zh-Hant.md) | @@ -57,9 +59,14 @@ VRCTはあなたの会話を以下でサポートをします。 ## Author - [みしゃ(misyaguzi)](https://github.com/misyaguziya) (メイン開発) - [しいな(Shiina_12siy)](https://twitter.com/Shiina_12siy) (UI/UX, UI多言語対応) -- [レラ](https://github.com/soumt-r) (翻訳:韓国語) +- [レラ](https://github.com/soumt-r) (テクニカルサポート) - [どね](https://twitter.com/done_vrc) (ロゴデザイン) +## Thanks to our contributors + + + + --- VRCT は VRChat によって承認されておらず、VRChat または VRChat の開発もしくは管理に公式に関与する者の見解や意見が反映されたものではありません。VRChat および関連するすべての財産は 米国VRChat, Incの商標または登録商標です。 \ No newline at end of file diff --git a/README.ko.md b/README.ko.md index ce5ef0f6..824a4c4c 100644 --- a/README.ko.md +++ b/README.ko.md @@ -3,8 +3,10 @@ ![](docs/vrct_logo.png) [![GitHub release](https://img.shields.io/github/v/release/misyaguziya/VRCT.svg)](https://github.com/misyaguziya/VRCT/releases) [![Downloads](https://img.shields.io/github/downloads/misyaguziya/VRCT/total)](https://github.com/misyaguziya/VRCT/releases) -[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) +[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) [![Booth](https://img.shields.io/badge/Store-Booth.pm-red)](https://misyaguziya.booth.pm/items/5155325) +[![Github Sponsors](https://img.shields.io/badge/GitHub%20Sponsors-30363D?&logo=GitHub-Sponsors&logoColor=EA4AAA)](https://github.com/sponsors/misyaguziya) +[![PIXIV FANBOX](https://img.shields.io/badge/PIXIV%20FANBOX-30363D?)](https://vrct-dev.fanbox.cc/) | [English](./README.md) | [日本語](./README.ja.md) | **한국어** | @@ -57,9 +59,14 @@ VRCT는 다음과 같이 당신의 대화를 도와드려요. ## Author - [みしゃ(misyaguzi)](https://github.com/misyaguziya) (주요 개발) - [しいな(Shiina_12siy)](https://twitter.com/Shiina_12siy) (UI/UX, UI 다국어 지원) -- [レラ](https://github.com/soumt-r) (번역: 한국어) +- [レラ](https://github.com/soumt-r) (기술 지원) - [どね](https://twitter.com/done_vrc) (로고 디자인) +## Thanks to our contributors + + + + --- VRCT는 VRChat의 어떠한 승인도 받지 않았으며, VRChat 또는 VRChat의 개발 또는 관리에 공식적으로 관여하는 사람의 견해나 의견을 반영하지 않습니다. VRChat 및 모든 관련 재산은 미국 VRChat, Inc의 상표 또는 등록상표입니다. \ No newline at end of file diff --git a/README.md b/README.md index e31efb95..93a7fa5a 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,10 @@ ![](docs/vrct_logo.png) [![GitHub release](https://img.shields.io/github/v/release/misyaguziya/VRCT.svg)](https://github.com/misyaguziya/VRCT/releases) [![Downloads](https://img.shields.io/github/downloads/misyaguziya/VRCT/total)](https://github.com/misyaguziya/VRCT/releases) -[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) +[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) [![Booth](https://img.shields.io/badge/Store-Booth.pm-red)](https://misyaguziya.booth.pm/items/5155325) +[![Github Sponsors](https://img.shields.io/badge/GitHub%20Sponsors-30363D?&logo=GitHub-Sponsors&logoColor=EA4AAA)](https://github.com/sponsors/misyaguziya) +[![PIXIV FANBOX](https://img.shields.io/badge/PIXIV%20FANBOX-30363D?)](https://vrct-dev.fanbox.cc/) | **English** | [日本語](./README.ja.md) | [한국어](./README.ko.md) | [繁體中文](./README.zh-Hant.md) | @@ -57,9 +59,14 @@ Initial setup, basic functions, and other features are also described. ## Author - [みしゃ(misyaguzi)](https://github.com/misyaguziya) (Main Development) - [しいな(Shiina_12siy)](https://twitter.com/Shiina_12siy) (UI/UX, UI multilingual support) -- [レラ](https://github.com/soumt-r) (Translation:Korean) +- [レラ](https://github.com/soumt-r) (Technical Support) - [どね](https://twitter.com/done_vrc) (Logo Design) +## Thanks to our contributors + + + + --- VRCT is not endorsed by VRChat and does not reflect the views or opinions of VRChat or anyone officially involved in producing or managing VRChat properties. VRChat and all associated properties are trademarks or registered trademarks of VRChat Inc. VRChat © VRChat Inc. \ No newline at end of file diff --git a/README.zh-Hant.md b/README.zh-Hant.md index c0c40d94..4cf5bb36 100644 --- a/README.zh-Hant.md +++ b/README.zh-Hant.md @@ -3,8 +3,10 @@ ![](docs/vrct_logo.png) [![GitHub release](https://img.shields.io/github/v/release/misyaguziya/VRCT.svg)](https://github.com/misyaguziya/VRCT/releases) [![Downloads](https://img.shields.io/github/downloads/misyaguziya/VRCT/total)](https://github.com/misyaguziya/VRCT/releases) -[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) +[![Licence](https://img.shields.io/github/license/misyaguziya/VRCT)](https://github.com/misyaguziya/VRCT/blob/master/LICENSE) [![Booth](https://img.shields.io/badge/Store-Booth.pm-red)](https://misyaguziya.booth.pm/items/5155325) +[![Github Sponsors](https://img.shields.io/badge/GitHub%20Sponsors-30363D?&logo=GitHub-Sponsors&logoColor=EA4AAA)](https://github.com/sponsors/misyaguziya) +[![PIXIV FANBOX](https://img.shields.io/badge/PIXIV%20FANBOX-30363D?)](https://vrct-dev.fanbox.cc/) | [English](./README.md) | [日本語](./README.ja.md) | [한국어](./README.ko.md) | **繁體中文** | @@ -56,9 +58,14 @@ VRCT 可以: ## 作者 - [みしゃ(misyaguzi)](https://github.com/misyaguziya) (主要開發) - [しいな(Shiina_12siy)](https://twitter.com/Shiina_12siy) (UI/UX, UI 多語系支援) -- [レラ](https://github.com/soumt-r) (韓語翻譯) +- [レラ](https://github.com/soumt-r) (技術支援) - [どね](https://twitter.com/done_vrc) (Logo 設計) +## Thanks to our contributors + + + + --- VRCT 未得到 VRChat 的認可,也不反映 VRChat 或正式參與製作或管理 VRChat 財產的任何人的觀點或意見。VRChat 和所有相關財產均為 VRChat Inc. 的商標或註冊商標。 \ No newline at end of file diff --git a/config.py b/config.py index 01874819..f5f89b49 100644 --- a/config.py +++ b/config.py @@ -953,7 +953,7 @@ class Config: def init_config(self): # Read Only - self._VERSION = "2.2.8" + self._VERSION = "2.2.9" self._ENABLE_SPEAKER2CHATBOX = False # Speaker2Chatbox self._ENABLE_SPEAKER2CHATBOX_PASS_CONFIRMATION = "VRCT=0YEN" self._PATH_LOCAL = os_path.dirname(sys.argv[0]) @@ -1142,9 +1142,8 @@ class Config: old_message_format = config[key] setattr(self, key, config[key]) - if key == "ENABLE_SPEAKER2CHATBOX_PASS": - if self.ENABLE_SPEAKER2CHATBOX_PASS_CONFIRMATION == config[key]: - self.ENABLE_SPEAKER2CHATBOX = True + # Force to Enable Speaker2Chatbox + self.ENABLE_SPEAKER2CHATBOX = True if old_message_format is not None: setattr(self, "SEND_MESSAGE_FORMAT_WITH_T", old_message_format) diff --git a/img/about_vrct/dev_misya.png b/img/about_vrct/dev_misya.png index 60317fff..6df2b467 100644 Binary files a/img/about_vrct/dev_misya.png and b/img/about_vrct/dev_misya.png differ diff --git a/img/about_vrct/dev_shiina.png b/img/about_vrct/dev_shiina.png index 63b5785e..cfef057a 100644 Binary files a/img/about_vrct/dev_shiina.png and b/img/about_vrct/dev_shiina.png differ diff --git a/img/about_vrct/localization_members.png b/img/about_vrct/localization_members.png index 32681555..b12cd838 100644 Binary files a/img/about_vrct/localization_members.png and b/img/about_vrct/localization_members.png differ diff --git a/img/about_vrct/poster_showcase_section_title.png b/img/about_vrct/poster_showcase_section_title.png index 5a4b00fa..83b1f21f 100644 Binary files a/img/about_vrct/poster_showcase_section_title.png and b/img/about_vrct/poster_showcase_section_title.png differ diff --git a/img/about_vrct/poster_tell_us_message_en.png b/img/about_vrct/poster_tell_us_message_en.png deleted file mode 100644 index 1078b42f..00000000 Binary files a/img/about_vrct/poster_tell_us_message_en.png and /dev/null differ diff --git a/img/about_vrct/poster_tell_us_message_ja.png b/img/about_vrct/poster_tell_us_message_ja.png deleted file mode 100644 index 8e2b096d..00000000 Binary files a/img/about_vrct/poster_tell_us_message_ja.png and /dev/null differ diff --git a/img/about_vrct/special_thanks_tell_us_message_en.png b/img/about_vrct/special_thanks_tell_us_message_en.png deleted file mode 100644 index c213e5bc..00000000 Binary files a/img/about_vrct/special_thanks_tell_us_message_en.png and /dev/null differ diff --git a/img/about_vrct/special_thanks_tell_us_message_ja.png b/img/about_vrct/special_thanks_tell_us_message_ja.png deleted file mode 100644 index f3274966..00000000 Binary files a/img/about_vrct/special_thanks_tell_us_message_ja.png and /dev/null differ diff --git a/locales/en.yml b/locales/en.yml index 0a3e3f92..2f5cdd0a 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -286,7 +286,7 @@ config_window: # Speaker2Chatbox send_received_message_to_vrc: label: "Send Received Message To VRChat" - desc: "Send the message you received from the speaker's sound to VRChat's chatbox. However, this feature is intended for users who genuinely need it. Please consult with the developer." + desc: "Send the message you received from the speaker's sound to VRChat's chatbox." # Speaker2Chatbox diff --git a/model.py b/model.py index df5bc8ba..58b587a4 100644 --- a/model.py +++ b/model.py @@ -8,8 +8,9 @@ from logging import getLogger, FileHandler, Formatter, INFO from time import sleep from queue import Queue from threading import Thread -from requests import get as requests_get +from packaging.version import parse +from requests import get as requests_get from flashtext import KeywordProcessor from models.translation.translation_translator import Translator from models.transcription.transcription_utils import getInputDevices, getOutputDevices @@ -304,10 +305,16 @@ class Model: # check update update_flag = False response = requests_get(config.GITHUB_URL) - new_version = response.json()["name"] - if new_version != config.VERSION: - update_flag = True - print("software version", "now:", config.VERSION, "new:", new_version) + json_data = response.json() + + version = json_data.get("name", None) + if isinstance(version, str): + new_version = parse(version) + current_version = parse(config.VERSION) + if new_version > current_version: + update_flag = True + print("software version", "now:", config.VERSION, "new:", version) + return update_flag @staticmethod diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py index 59708e14..aeb2e629 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py @@ -73,20 +73,6 @@ def createSettingBox_AboutVrct(setting_box_wrapper, config_window, settings, vie ) return frame - def createTellUsButton(parent_frame, image_file_name, callback): - tell_us_button_frame = settings.about_vrct.embedImageButtonCTkLabel( - parent_frame=parent_frame, - image_file_name=image_file_name, - callback=callback, - corner_radius=about_vrct_uism.TELL_US_BUTTON_CORNER_RADIUS, - ) - tell_us_button_frame.img_label.grid(padx=about_vrct_uism.TELL_US_BUTTON_PADX, pady=about_vrct_uism.TELL_US_BUTTON_PADY, sticky="nsew") - - tell_us_button_frame.configure(border_width=about_vrct_uism.TELL_US_BUTTON_BORDER_WIDTH, border_color=settings.ctm.ABOUT_VRCT_TELL_US_BUTTON_BORDER_COLOR) - - return tell_us_button_frame - - section_row=0 @@ -279,17 +265,6 @@ def createSettingBox_AboutVrct(setting_box_wrapper, config_window, settings, vie special_thanks_message = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, settings.about_vrct.image_file.SPECIAL_THANKS_MESSAGE) special_thanks_message.grid(column=0, row=1, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_BOTTOM_PADY), sticky="nsew") - # special_thanks_message_and_you = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, "special_thanks_message_and_you.png") - # special_thanks_message_and_you.grid(column=0, row=2, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_AND_YOU_BOTTOM_PADY), sticky="nsw") - - # special_thanks_tell_us_message = createTellUsButton( - # parent_frame=special_thanks_contents_wrapper, - # image_file_name=settings.about_vrct.image_file.SPECIAL_THANKS_TELL_US_MESSAGE, - # callback=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_OPEN_WEBPAGE_ABOUT_VRCT, "SUPPORTER_REGISTRATION"), - # ) - # special_thanks_tell_us_message.grid(column=0, row=3) - - section_row+=1 @@ -601,26 +576,6 @@ def createSettingBox_AboutVrct(setting_box_wrapper, config_window, settings, vie - - - - poster_tell_us_message = createTellUsButton( - parent_frame=poster_showcase_contents_wrapper, - image_file_name=settings.about_vrct.image_file.POSTER_TELL_US_MESSAGE, - callback=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_OPEN_WEBPAGE_ABOUT_VRCT, "POSTER_CONTACT_US"), - ) - poster_tell_us_message.grid(column=0, row=1, columnspan=2, padx=0, pady=(about_vrct_uism.POSTER_TELL_US_MESSAGE_TOP_PADY,0), sticky="nse") - - - - - - - - - - - section_row+=1 # VRChat disclaimer ---------------------------------- vrchat_disclaimer, vrchat_disclaimer_contents_wrapper = createSectionContainer( diff --git a/vrct_gui/ui_managers/AboutVrctManager.py b/vrct_gui/ui_managers/AboutVrctManager.py index 733eaacd..f81abf99 100644 --- a/vrct_gui/ui_managers/AboutVrctManager.py +++ b/vrct_gui/ui_managers/AboutVrctManager.py @@ -75,18 +75,12 @@ class AboutVrctManager(): if ui_language == "ja": self.image_file.SPECIAL_THANKS_MESSAGE = "special_thanks_message_ja.png" - self.image_file.SPECIAL_THANKS_TELL_US_MESSAGE = "special_thanks_tell_us_message_ja.png" - self.image_file.POSTER_IMAGES_AUTHOR = "poster_images_authors_ja.png" self.image_file.POSTER_IMAGES_AUTHOR_M = "poster_images_authors_m_ja.png" - self.image_file.POSTER_TELL_US_MESSAGE = "poster_tell_us_message_ja.png" else: self.image_file.SPECIAL_THANKS_MESSAGE = "special_thanks_message_en.png" - self.image_file.SPECIAL_THANKS_TELL_US_MESSAGE = "special_thanks_tell_us_message_en.png" - self.image_file.POSTER_IMAGES_AUTHOR = "poster_images_authors_en.png" self.image_file.POSTER_IMAGES_AUTHOR_M = "poster_images_authors_m_en.png" - self.image_file.POSTER_TELL_US_MESSAGE = "poster_tell_us_message_en.png" poster_showcase_pagination_button_image = getImageFileFromUiUtils_AboutVrct("poster_showcase_pagination_button.png")