every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'icon' into UI_2.0

Browse Source
This commit is contained in:
misyaguziya
2023-09-14 02:24:07 +09:00
parent bbfbb5e5dc 7b15aff02e
commit d5dfe2219e
7 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/vrct_logo_mark_black.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 KiB

BIN
img/vrct_logo_mark_black_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
img/xsoverlay2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

8
main.py
View File

@@ -336,7 +336,7 @@ def callbackCheckMicThreshold(is_turned_on):
def callbackSetMicRecordTimeout(value): def callbackSetMicRecordTimeout(value):
print("callbackSetMicRecordTimeout", value) print("callbackSetMicRecordTimeout", value)
try: try:
if int(value) < 0: raise ValueError() if int(value) < 0 or int(value) > config.INPUT_MIC_PHRASE_TIMEOUT: raise ValueError()
except: except:
view.setGuiVariable_MicRecordTimeout(delete=True) view.setGuiVariable_MicRecordTimeout(delete=True)
return return
@@ -346,7 +346,7 @@ def callbackSetMicRecordTimeout(value):
def callbackSetMicPhraseTimeout(value): def callbackSetMicPhraseTimeout(value):
print("callbackSetMicPhraseTimeout", value) print("callbackSetMicPhraseTimeout", value)
try: try:
if int(value) < 0: raise ValueError() if int(value) < 0 or int(value) < config.INPUT_MIC_RECORD_TIMEOUT: raise ValueError()
except: except:
view.setGuiVariable_MicPhraseTimeout(delete=True) view.setGuiVariable_MicPhraseTimeout(delete=True)
return return
@@ -429,7 +429,7 @@ def callbackCheckSpeakerThreshold(is_turned_on):
def callbackSetSpeakerRecordTimeout(value): def callbackSetSpeakerRecordTimeout(value):
print("callbackSetSpeakerRecordTimeout", value) print("callbackSetSpeakerRecordTimeout", value)
try: try:
if int(value) < 0: raise ValueError() if int(value) < 0 or int(value) > config.INPUT_SPEAKER_PHRASE_TIMEOUT: raise ValueError()
except: except:
view.setGuiVariable_SpeakerRecordTimeout(delete=True) view.setGuiVariable_SpeakerRecordTimeout(delete=True)
return return
@@ -439,7 +439,7 @@ def callbackSetSpeakerRecordTimeout(value):
def callbackSetSpeakerPhraseTimeout(value): def callbackSetSpeakerPhraseTimeout(value):
print("callbackSetSpeakerPhraseTimeout", value) print("callbackSetSpeakerPhraseTimeout", value)
try: try:
if int(value) < 0: raise ValueError() if int(value) < 0 or int(value) < config.INPUT_SPEAKER_RECORD_TIMEOUT: raise ValueError()
except: except:
view.setGuiVariable_SpeakerPhraseTimeout(delete=True) view.setGuiVariable_SpeakerPhraseTimeout(delete=True)
return return

3
models/xsoverlay/notification.py
View File

@@ -18,6 +18,7 @@
import socket import socket
import json import json
import base64 import base64
from os import path as os_path
def XSOverlay( def XSOverlay(
endpoint:tuple=("127.0.0.1", 42069), messageType:int=1, index:int=0, timeout:float=2, endpoint:tuple=("127.0.0.1", 42069), messageType:int=1, index:int=0, timeout:float=2,
@@ -63,7 +64,7 @@ def xsoverlayForVRCT(content:str="") -> int:
title="VRCT", title="VRCT",
content=content, content=content,
useBase64Icon=True, useBase64Icon=True,
icon="./img/xsoverlay.png", icon=os_path.join(os_path.dirname(__file__), "img", "xsoverlay2.png"),
sourceApp="VRCT" sourceApp="VRCT"
) )
return response return response

3
vrct_gui/config_window/ConfigWindow.py
View File

@@ -3,6 +3,8 @@ from .widgets import createConfigWindowTitle, createSideMenuAndSettingsBoxContai
from customtkinter import CTkToplevel from customtkinter import CTkToplevel
from ..ui_utils import getImagePath
class ConfigWindow(CTkToplevel): class ConfigWindow(CTkToplevel):
def __init__(self, vrct_gui, settings, view_variable): def __init__(self, vrct_gui, settings, view_variable):
super().__init__() super().__init__()
@@ -10,6 +12,7 @@ class ConfigWindow(CTkToplevel):
# configure window # configure window
self.after(200, lambda: self.iconbitmap(getImagePath("vrct_logo_mark_black.ico")))
self.title("test config_window.py") self.title("test config_window.py")
self.geometry(f"{1080}x{680}") self.geometry(f"{1080}x{680}")

2
vrct_gui/main_window/createMainWindowWidgets.py
View File

@@ -9,7 +9,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
vrct_gui.protocol("WM_DELETE_WINDOW", vrct_gui.quitVRCT) vrct_gui.protocol("WM_DELETE_WINDOW", vrct_gui.quitVRCT)
vrct_gui.iconbitmap(getImagePath("app.ico")) vrct_gui.iconbitmap(getImagePath("vrct_logo_mark_black.ico"))
vrct_gui.title("VRCT") vrct_gui.title("VRCT")
vrct_gui.geometry(f"{880}x{640}") vrct_gui.geometry(f"{880}x{640}")
vrct_gui.minsize(400, 175) vrct_gui.minsize(400, 175)