Merge branch 'icon' into UI_2.0

main.py

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

models/xsoverlay/notification.py

@@ -18,6 +18,7 @@
 import socket
 import json
 import base64
+from os import path as os_path
 
 def XSOverlay(
     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",
         content=content,
         useBase64Icon=True,
-        icon="./img/xsoverlay.png",
+        icon=os_path.join(os_path.dirname(__file__), "img", "xsoverlay2.png"),
         sourceApp="VRCT"
     )
     return response

vrct_gui/config_window/ConfigWindow.py

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

vrct_gui/main_window/createMainWindowWidgets.py

@@ -9,7 +9,7 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
     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.geometry(f"{880}x{640}")
     vrct_gui.minsize(400, 175)