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

[Mask] Config, View, Controller: overlayとイースターエッグの処理やUIをマスク。

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-04-28 15:41:41 +09:00
parent a4a73c0c9e
commit 799e649e51
6 changed files with 189 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
config.py
View File

@@ -736,57 +736,57 @@ class Config:
self._ENABLE_NOTICE_XSOVERLAY = value self._ENABLE_NOTICE_XSOVERLAY = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property # @property
@json_serializable('OVERLAY_SETTINGS') # @json_serializable('OVERLAY_SETTINGS')
def OVERLAY_SETTINGS(self): # def OVERLAY_SETTINGS(self):
return self._OVERLAY_SETTINGS # return self._OVERLAY_SETTINGS
@OVERLAY_SETTINGS.setter # @OVERLAY_SETTINGS.setter
def OVERLAY_SETTINGS(self, value): # def OVERLAY_SETTINGS(self, value):
if isinstance(value, dict) and set(value.keys()) == set(self.OVERLAY_SETTINGS.keys()): # if isinstance(value, dict) and set(value.keys()) == set(self.OVERLAY_SETTINGS.keys()):
for key, value in value.items(): # for key, value in value.items():
if isinstance(value, float): # if isinstance(value, float):
self._OVERLAY_SETTINGS[key] = value # self._OVERLAY_SETTINGS[key] = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, self.OVERLAY_SETTINGS) # saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, self.OVERLAY_SETTINGS)
@property # @property
@json_serializable('ENABLE_OVERLAY_SMALL_LOG') # @json_serializable('ENABLE_OVERLAY_SMALL_LOG')
def ENABLE_OVERLAY_SMALL_LOG(self): # def ENABLE_OVERLAY_SMALL_LOG(self):
return self._ENABLE_OVERLAY_SMALL_LOG # return self._ENABLE_OVERLAY_SMALL_LOG
@ENABLE_OVERLAY_SMALL_LOG.setter # @ENABLE_OVERLAY_SMALL_LOG.setter
def ENABLE_OVERLAY_SMALL_LOG(self, value): # def ENABLE_OVERLAY_SMALL_LOG(self, value):
if isinstance(value, bool): # if isinstance(value, bool):
self._ENABLE_OVERLAY_SMALL_LOG = value # self._ENABLE_OVERLAY_SMALL_LOG = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) # saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property # @property
@json_serializable('OVERLAY_SMALL_LOG_SETTINGS') # @json_serializable('OVERLAY_SMALL_LOG_SETTINGS')
def OVERLAY_SMALL_LOG_SETTINGS(self): # def OVERLAY_SMALL_LOG_SETTINGS(self):
return self._OVERLAY_SMALL_LOG_SETTINGS # return self._OVERLAY_SMALL_LOG_SETTINGS
@OVERLAY_SMALL_LOG_SETTINGS.setter # @OVERLAY_SMALL_LOG_SETTINGS.setter
def OVERLAY_SMALL_LOG_SETTINGS(self, value): # def OVERLAY_SMALL_LOG_SETTINGS(self, value):
if isinstance(value, dict) and set(value.keys()) == set(self.OVERLAY_SMALL_LOG_SETTINGS.keys()): # if isinstance(value, dict) and set(value.keys()) == set(self.OVERLAY_SMALL_LOG_SETTINGS.keys()):
for key, value in value.items(): # for key, value in value.items():
match (key): # match (key):
case "x_pos" | "y_pos" | "depth": # case "x_pos" | "y_pos" | "depth":
if isinstance(value, float): # if isinstance(value, float):
self._OVERLAY_SMALL_LOG_SETTINGS[key] = value # self._OVERLAY_SMALL_LOG_SETTINGS[key] = value
case "display_duration" | "fadeout_duration": # case "display_duration" | "fadeout_duration":
if isinstance(value, int): # if isinstance(value, int):
self._OVERLAY_SMALL_LOG_SETTINGS[key] = value # self._OVERLAY_SMALL_LOG_SETTINGS[key] = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, self.OVERLAY_SMALL_LOG_SETTINGS) # saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, self.OVERLAY_SMALL_LOG_SETTINGS)
@property # @property
@json_serializable('OVERLAY_UI_TYPE') # @json_serializable('OVERLAY_UI_TYPE')
def OVERLAY_UI_TYPE(self): # def OVERLAY_UI_TYPE(self):
return self._OVERLAY_UI_TYPE # return self._OVERLAY_UI_TYPE
@OVERLAY_UI_TYPE.setter # @OVERLAY_UI_TYPE.setter
def OVERLAY_UI_TYPE(self, value): # def OVERLAY_UI_TYPE(self, value):
if isinstance(value, str): # if isinstance(value, str):
self._OVERLAY_UI_TYPE = value # self._OVERLAY_UI_TYPE = value
# saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) # saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property @property
@@ -1054,18 +1054,18 @@ class Config:
self._ENABLE_SEND_ONLY_TRANSLATED_MESSAGES = False self._ENABLE_SEND_ONLY_TRANSLATED_MESSAGES = False
self._SEND_MESSAGE_BUTTON_TYPE = "show" self._SEND_MESSAGE_BUTTON_TYPE = "show"
self._ENABLE_NOTICE_XSOVERLAY = False self._ENABLE_NOTICE_XSOVERLAY = False
self._OVERLAY_SETTINGS = { # self._OVERLAY_SETTINGS = {
"opacity": 1.0, # "opacity": 1.0,
"ui_scaling": 1.0, # "ui_scaling": 1.0,
} # }
self._ENABLE_OVERLAY_SMALL_LOG = False # self._ENABLE_OVERLAY_SMALL_LOG = False
self._OVERLAY_SMALL_LOG_SETTINGS = { # self._OVERLAY_SMALL_LOG_SETTINGS = {
"x_pos": 0.0, # "x_pos": 0.0,
"y_pos": -0.41, # "y_pos": -0.41,
"depth": 1.0, # "depth": 1.0,
"display_duration": 5, # "display_duration": 5,
"fadeout_duration": 2, # "fadeout_duration": 2,
} # }
self._OVERLAY_UI_TYPE = "default" self._OVERLAY_UI_TYPE = "default"
self._ENABLE_SEND_MESSAGE_TO_VRC = True self._ENABLE_SEND_MESSAGE_TO_VRC = True
self._ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC = False # Speaker2Chatbox self._ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC = False # Speaker2Chatbox

10
controller.py
View File

@@ -27,10 +27,10 @@ def callbackFilepathConfigFile():
def callbackQuitVrct(): def callbackQuitVrct():
setMainWindowGeometry() setMainWindowGeometry()
def callbackEnableEasterEgg(): # def callbackEnableEasterEgg():
config.IS_EASTER_EGG_ENABLED = True # config.IS_EASTER_EGG_ENABLED = True
config.OVERLAY_UI_TYPE = "sakura" # config.OVERLAY_UI_TYPE = "sakura"
view.printToTextbox_enableEasterEgg() # view.printToTextbox_enableEasterEgg()
def setMainWindowGeometry(): def setMainWindowGeometry():
PRE_SCALING_INT = strPctToInt(view.getPreUiScaling()) PRE_SCALING_INT = strPctToInt(view.getPreUiScaling())
@@ -1049,7 +1049,7 @@ def createMainWindow(splash):
# set UI and callback # set UI and callback
view.register( view.register(
common_registers={ common_registers={
"callback_enable_easter_egg": callbackEnableEasterEgg, # "callback_enable_easter_egg": callbackEnableEasterEgg,
"callback_update_software": callbackUpdateSoftware, "callback_update_software": callbackUpdateSoftware,
"callback_restart_software": callbackRestartSoftware, "callback_restart_software": callbackRestartSoftware,

130
view.py
View File

@@ -101,7 +101,7 @@ class View():
self.view_variable = SimpleNamespace( self.view_variable = SimpleNamespace(
# Common # Common
CALLBACK_ENABLE_EASTER_EGG=None, # CALLBACK_ENABLE_EASTER_EGG=None,
CALLBACK_RESTART_SOFTWARE=None, CALLBACK_RESTART_SOFTWARE=None,
CALLBACK_UPDATE_SOFTWARE=None, CALLBACK_UPDATE_SOFTWARE=None,
@@ -140,55 +140,55 @@ class View():
# VR Settings # VR Settings
VAR_VR_SETTINGS=StringVar(value="VR Settings"), # VAR_VR_SETTINGS=StringVar(value="VR Settings"),
CALLBACK_SET_CALLBACK_OPEN_VR_SETTINGS_WINDOW=self._openVrSettingsWindow, # CALLBACK_SET_CALLBACK_OPEN_VR_SETTINGS_WINDOW=self._openVrSettingsWindow,
VAR_LABEL_OVERLAY_OPACITY=StringVar(value="Opacity"), # VAR_LABEL_OVERLAY_OPACITY=StringVar(value="Opacity"),
SLIDER_RANGE_OVERLAY_OPACITY=(0.1, 1.0), # SLIDER_RANGE_OVERLAY_OPACITY=(0.1, 1.0),
NUMBER_OF_STEPS_OVERLAY_OPACITY=18, # NUMBER_OF_STEPS_OVERLAY_OPACITY=18,
VAR_OVERLAY_OPACITY=DoubleVar(value=config.OVERLAY_SETTINGS["opacity"]), # VAR_OVERLAY_OPACITY=DoubleVar(value=config.OVERLAY_SETTINGS["opacity"]),
VAR_CURRENT_VALUE_OVERLAY_OPACITY=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["opacity"])), # VAR_CURRENT_VALUE_OVERLAY_OPACITY=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["opacity"])),
VAR_LABEL_OVERLAY_UI_SCALING=StringVar(value="Ui Scaling"), # VAR_LABEL_OVERLAY_UI_SCALING=StringVar(value="Ui Scaling"),
SLIDER_RANGE_OVERLAY_UI_SCALING=(0.4, 2.0), # SLIDER_RANGE_OVERLAY_UI_SCALING=(0.4, 2.0),
NUMBER_OF_STEPS_OVERLAY_UI_SCALING=16, # NUMBER_OF_STEPS_OVERLAY_UI_SCALING=16,
VAR_OVERLAY_UI_SCALING=DoubleVar(value=config.OVERLAY_SETTINGS["ui_scaling"]), # VAR_OVERLAY_UI_SCALING=DoubleVar(value=config.OVERLAY_SETTINGS["ui_scaling"]),
VAR_CURRENT_VALUE_OVERLAY_UI_SCALING=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["ui_scaling"])), # VAR_CURRENT_VALUE_OVERLAY_UI_SCALING=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["ui_scaling"])),
CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS=None, # CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS=None,
VAR_LABEL_OVERLAY_SMALL_LOG_X_POS=StringVar(value="X_position"), # VAR_LABEL_OVERLAY_SMALL_LOG_X_POS=StringVar(value="X_position"),
SLIDER_RANGE_OVERLAY_SMALL_LOG_X_POS=(-0.5, 0.5), # SLIDER_RANGE_OVERLAY_SMALL_LOG_X_POS=(-0.5, 0.5),
NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_X_POS=100, # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_X_POS=100,
VAR_OVERLAY_SMALL_LOG_X_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]), # VAR_OVERLAY_SMALL_LOG_X_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]),
VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_X_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]), # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_X_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]),
VAR_LABEL_OVERLAY_SMALL_LOG_Y_POS=StringVar(value="Y_position"), # VAR_LABEL_OVERLAY_SMALL_LOG_Y_POS=StringVar(value="Y_position"),
SLIDER_RANGE_OVERLAY_SMALL_LOG_Y_POS=(-0.5, 0.5), # SLIDER_RANGE_OVERLAY_SMALL_LOG_Y_POS=(-0.5, 0.5),
NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_Y_POS=100, # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_Y_POS=100,
VAR_OVERLAY_SMALL_LOG_Y_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]), # VAR_OVERLAY_SMALL_LOG_Y_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]),
VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Y_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]), # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Y_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]),
VAR_LABEL_OVERLAY_SMALL_LOG_DEPTH=StringVar(value="Depth"), # VAR_LABEL_OVERLAY_SMALL_LOG_DEPTH=StringVar(value="Depth"),
SLIDER_RANGE_OVERLAY_SMALL_LOG_DEPTH=(0.5, 1.5), # SLIDER_RANGE_OVERLAY_SMALL_LOG_DEPTH=(0.5, 1.5),
NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DEPTH=100, # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DEPTH=100,
VAR_OVERLAY_SMALL_LOG_DEPTH=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]), # VAR_OVERLAY_SMALL_LOG_DEPTH=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]),
VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DEPTH=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]), # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DEPTH=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]),
VAR_LABEL_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value="Display Duration"), # VAR_LABEL_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value="Display Duration"),
SLIDER_RANGE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=(1, 60), # SLIDER_RANGE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=(1, 60),
NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DISPLAY_DURATION=59, # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DISPLAY_DURATION=59,
VAR_OVERLAY_SMALL_LOG_DISPLAY_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["display_duration"]), # VAR_OVERLAY_SMALL_LOG_DISPLAY_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["display_duration"]),
VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['display_duration']} second(s)"), # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['display_duration']} second(s)"),
VAR_LABEL_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value="Fadeout Duration"), # VAR_LABEL_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value="Fadeout Duration"),
SLIDER_RANGE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=(0, 5), # SLIDER_RANGE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=(0, 5),
NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_FADEOUT_DURATION=5, # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_FADEOUT_DURATION=5,
VAR_OVERLAY_SMALL_LOG_FADEOUT_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["fadeout_duration"]), # VAR_OVERLAY_SMALL_LOG_FADEOUT_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["fadeout_duration"]),
VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['fadeout_duration']} second(s)"), # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['fadeout_duration']} second(s)"),
@@ -477,11 +477,11 @@ class View():
# VR Tab # VR Tab
VAR_LABEL_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.label")), # VAR_LABEL_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.label")),
VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=None, # VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=None,
# VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.desc")), # # VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.desc")),
CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG=None, # CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG=None,
VAR_ENABLE_OVERLAY_SMALL_LOG=BooleanVar(value=config.ENABLE_OVERLAY_SMALL_LOG), # VAR_ENABLE_OVERLAY_SMALL_LOG=BooleanVar(value=config.ENABLE_OVERLAY_SMALL_LOG),
# Others Tab # Others Tab
@@ -628,7 +628,7 @@ class View():
if common_registers is not None: if common_registers is not None:
self.view_variable.CALLBACK_ENABLE_EASTER_EGG=common_registers.get("callback_enable_easter_egg", None) # self.view_variable.CALLBACK_ENABLE_EASTER_EGG=common_registers.get("callback_enable_easter_egg", None)
self.view_variable.CALLBACK_UPDATE_SOFTWARE=common_registers.get("callback_update_software", None) self.view_variable.CALLBACK_UPDATE_SOFTWARE=common_registers.get("callback_update_software", None)
self.view_variable.CALLBACK_RESTART_SOFTWARE=common_registers.get("callback_restart_software", None) self.view_variable.CALLBACK_RESTART_SOFTWARE=common_registers.get("callback_restart_software", None)
@@ -753,11 +753,11 @@ class View():
# VR Tab # VR Tab
# VR Tab (Quick Settings) # VR Tab (Quick Settings)
self.view_variable.CALLBACK_SET_OVERLAY_SETTINGS=config_window_registers.get("callback_set_overlay_settings", None) # self.view_variable.CALLBACK_SET_OVERLAY_SETTINGS=config_window_registers.get("callback_set_overlay_settings", None)
self.view_variable.CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG=config_window_registers.get("callback_set_enable_overlay_small_log", None) # self.view_variable.CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG=config_window_registers.get("callback_set_enable_overlay_small_log", None)
# VR Tab (Quick Settings) # # VR Tab (Quick Settings)
self.view_variable.CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS=config_window_registers.get("callback_set_overlay_small_log_settings", None) # self.view_variable.CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS=config_window_registers.get("callback_set_overlay_small_log_settings", None)
# Others Tab # Others Tab
@@ -855,21 +855,21 @@ class View():
# Set Easter Egg # Set Easter Egg
self.count = 0 # self.count = 0
def clickedCounter(_e): # def clickedCounter(_e):
if self.count < 2: # if self.count < 2:
self.count+=1 # self.count+=1
print("Easter egg count:", self.count) # print("Easter egg count:", self.count)
else: # else:
print("Easter egg count:", self.count, "Easter egg has enabled.") # print("Easter egg count:", self.count, "Easter egg has enabled.")
callFunctionIfCallable(self.view_variable.CALLBACK_ENABLE_EASTER_EGG) # callFunctionIfCallable(self.view_variable.CALLBACK_ENABLE_EASTER_EGG)
print(config.OVERLAY_UI_TYPE) # print(config.OVERLAY_UI_TYPE)
vrct_gui.sidebar_logo.bind( # vrct_gui.sidebar_logo.bind(
"<ButtonRelease>", # "<ButtonRelease>",
clickedCounter, # clickedCounter,
"+" # "+"
) # )
# Insert sample conversation for testing. # Insert sample conversation for testing.
@@ -1828,8 +1828,8 @@ class View():
# Print To Textbox. # Print To Textbox.
def printToTextbox_enableEasterEgg(self): # def printToTextbox_enableEasterEgg(self):
self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_easter_egg")) # self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_easter_egg"))
def printToTextbox_enableTranslation(self): def printToTextbox_enableTranslation(self):
self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_translation")) self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_translation"))

30
vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py
View File

@@ -104,21 +104,21 @@ def createSideMenuAndSettingsBoxContainers(config_window, settings, view_variabl
] ]
}, },
}, },
{ # {
"side_menu_tab_attr_name": "side_menu_tab_vr", # "side_menu_tab_attr_name": "side_menu_tab_vr",
"label_attr_name": "label_vr", # "label_attr_name": "label_vr",
"selected_mark_attr_name": "selected_mark_vr", # "selected_mark_attr_name": "selected_mark_vr",
"textvariable": view_variable.VAR_SIDE_MENU_LABEL_VR, # "textvariable": view_variable.VAR_SIDE_MENU_LABEL_VR,
"setting_box_container_settings": { # "setting_box_container_settings": {
"setting_box_container_attr_name": "setting_box_container_vr", # "setting_box_container_attr_name": "setting_box_container_vr",
"setting_boxes": [ # "setting_boxes": [
{ # {
"var_section_title": None, # "var_section_title": None,
"setting_box": createSettingBox_Vr # "setting_box": createSettingBox_Vr
} # }
] # ]
}, # },
}, # },
{ {
"side_menu_tab_attr_name": "side_menu_tab_others", "side_menu_tab_attr_name": "side_menu_tab_others",
"label_attr_name": "label_others", "label_attr_name": "label_others",

84
vrct_gui/main_window/createMainWindowWidgets.py
View File

@@ -48,59 +48,59 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
# start from 3 # start from 3
main_topbar_column=3 main_topbar_column=3
# VR Settings Button # # VR Settings Button
vrct_gui.vr_settings_container = CTkFrame( # vrct_gui.vr_settings_container = CTkFrame(
vrct_gui.main_topbar_container, # vrct_gui.main_topbar_container,
corner_radius=settings.uism.UPDATE_AVAILABLE_BUTTON_CORNER_RADIUS, # corner_radius=settings.uism.UPDATE_AVAILABLE_BUTTON_CORNER_RADIUS,
fg_color=settings.ctm.MAIN_BG_COLOR, # fg_color=settings.ctm.MAIN_BG_COLOR,
cursor="hand2", # cursor="hand2",
) # )
vrct_gui.vr_settings_container.grid(row=0, column=main_topbar_column, padx=settings.uism.UPDATE_AVAILABLE_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="nsw") # vrct_gui.vr_settings_container.grid(row=0, column=main_topbar_column, padx=settings.uism.UPDATE_AVAILABLE_BUTTON_PADX, pady=settings.uism.TOP_BAR_BUTTON_PADY, sticky="nsw")
# vrct_gui.vr_settings_container.grid_remove() # # vrct_gui.vr_settings_container.grid_remove()
vrct_gui.vr_settings_container.grid_rowconfigure((0,2), weight=1) # vrct_gui.vr_settings_container.grid_rowconfigure((0,2), weight=1)
vrct_gui.vr_settings_icon = CTkLabel( # vrct_gui.vr_settings_icon = CTkLabel(
vrct_gui.vr_settings_container, # vrct_gui.vr_settings_container,
text=None, # text=None,
corner_radius=0, # corner_radius=0,
height=0, # height=0,
image=CTkImage(settings.image_file.CONFIGURATION_ICON, size=settings.uism.UPDATE_AVAILABLE_BUTTON_SIZE) # image=CTkImage(settings.image_file.CONFIGURATION_ICON, size=settings.uism.UPDATE_AVAILABLE_BUTTON_SIZE)
) # )
vrct_gui.vr_settings_icon.grid(row=1, column=0, padx=(settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX, settings.uism.UPDATE_AVAILABLE_PADX_BETWEEN_LABEL_AND_ICON), pady=0) # vrct_gui.vr_settings_icon.grid(row=1, column=0, padx=(settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX, settings.uism.UPDATE_AVAILABLE_PADX_BETWEEN_LABEL_AND_ICON), pady=0)
vrct_gui.vr_settings_label = CTkLabel( # vrct_gui.vr_settings_label = CTkLabel(
vrct_gui.vr_settings_container, # vrct_gui.vr_settings_container,
textvariable=view_variable.VAR_VR_SETTINGS, # textvariable=view_variable.VAR_VR_SETTINGS,
height=0, # height=0,
corner_radius=0, # corner_radius=0,
font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.UPDATE_AVAILABLE_BUTTON_FONT_SIZE, weight="normal"), # font=CTkFont(family=settings.FONT_FAMILY, size=settings.uism.UPDATE_AVAILABLE_BUTTON_FONT_SIZE, weight="normal"),
anchor="e", # anchor="e",
text_color="#fff", # text_color="#fff",
# text_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR, # # text_color=settings.ctm.UPDATE_AVAILABLE_BUTTON_TEXT_COLOR,
) # )
# This "right padx +1" is for fixing a bug that sticks out from the frame. I don't know why that happens... # # This "right padx +1" is for fixing a bug that sticks out from the frame. I don't know why that happens...
vrct_gui.vr_settings_label.grid(row=1, column=1, padx=(0,settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX+1), pady=0) # vrct_gui.vr_settings_label.grid(row=1, column=1, padx=(0,settings.uism.UPDATE_AVAILABLE_BUTTON_IPADX+1), pady=0)
bindButtonFunctionAndColor( # bindButtonFunctionAndColor(
target_widgets=[ # target_widgets=[
vrct_gui.vr_settings_container, # vrct_gui.vr_settings_container,
vrct_gui.vr_settings_label, # vrct_gui.vr_settings_label,
vrct_gui.vr_settings_icon, # vrct_gui.vr_settings_icon,
], # ],
enter_color=settings.ctm.TOP_BAR_BUTTON_HOVERED_BG_COLOR, # enter_color=settings.ctm.TOP_BAR_BUTTON_HOVERED_BG_COLOR,
leave_color=settings.ctm.TOP_BAR_BUTTON_BG_COLOR, # leave_color=settings.ctm.TOP_BAR_BUTTON_BG_COLOR,
clicked_color=settings.ctm.TOP_BAR_BUTTON_CLICKED_BG_COLOR, # clicked_color=settings.ctm.TOP_BAR_BUTTON_CLICKED_BG_COLOR,
buttonReleasedFunction=lambda e: callFunctionIfCallable(view_variable.CALLBACK_SET_CALLBACK_OPEN_VR_SETTINGS_WINDOW), # buttonReleasedFunction=lambda e: callFunctionIfCallable(view_variable.CALLBACK_SET_CALLBACK_OPEN_VR_SETTINGS_WINDOW),
) # )
main_topbar_column+=1 # main_topbar_column+=1
# Update Available Button # Update Available Button
vrct_gui.update_available_container = CTkFrame( vrct_gui.update_available_container = CTkFrame(
vrct_gui.main_topbar_container, vrct_gui.main_topbar_container,

12
vrct_gui/vrct_gui.py
View File

@@ -14,7 +14,7 @@ from ._PrintToTextbox import _PrintToTextbox
from .main_window import createMainWindowWidgets from .main_window import createMainWindowWidgets
from .config_window import ConfigWindow from .config_window import ConfigWindow
from .quick_settings_window import QuickSettingsWindow # from .quick_settings_window import QuickSettingsWindow
from .ui_utils import setDefaultActiveTab, setGeometryToCenterOfScreen, fadeInAnimation from .ui_utils import setDefaultActiveTab, setGeometryToCenterOfScreen, fadeInAnimation
from utils import callFunctionIfCallable from utils import callFunctionIfCallable
@@ -131,11 +131,11 @@ class VRCT_GUI(CTk):
view_variable=self._view_variable view_variable=self._view_variable
) )
self.quick_settings_window = QuickSettingsWindow( # self.quick_settings_window = QuickSettingsWindow(
vrct_gui=self, # vrct_gui=self,
settings=self.settings.config_window, # settings=self.settings.config_window,
view_variable=self._view_variable # view_variable=self._view_variable
) # )
# self.quick_settings_window.show() # self.quick_settings_window.show()
self.selectable_languages_window = _CreateSelectableLanguagesWindow( self.selectable_languages_window = _CreateSelectableLanguagesWindow(