Merge branch 'view' into develop

locales/en.yml

@@ -91,7 +91,7 @@ config_window:
 
   appearance_theme:
     label: Theme
-    desc: Change the color theme. Currently.
+    desc: Change the color theme.
 
   ui_size:
     label: UI Size

vrct_gui/_CreateConfirmationModal.py

@@ -70,7 +70,6 @@ class _CreateConfirmationModal(CTkToplevel):
 
 
         if modal_type == "information":
-            # self.modal_buttons_wrapper.grid_columnconfigure(1, weight=1, minsize=self.settings.uism.BUTTONS_BETWEEN_PADDING)
             self.modal_buttons_wrapper.grid_columnconfigure((0,2), weight=1)
 
 

vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py

@@ -131,7 +131,6 @@ def createSideMenuAndSettingsBoxContainers(config_window, settings, view_variabl
             config_window=config_window,
             settings=settings,
             view_variable=view_variable,
-            # view_variable=view_variable,
             side_menu_settings=sm_and_sbc_setting,
             side_menu_row=side_menu_row,
             all_side_menu_tab_attr_name=all_side_menu_tab_attr_name,

vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py

@@ -203,7 +203,6 @@ class _SettingBoxGenerator():
             variable=variable,
             command=command,
             fg_color=self.settings.ctm.SB__SWITCH_BOX_BG_COLOR,
-            # bg_color="red",
             progress_color=self.settings.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR,
             button_color=self.settings.ctm.SB__SWITCH_BOX_BUTTON_COLOR,
             button_hover_color=self.settings.ctm.SB__SWITCH_BOX_BUTTON_HOVERED_COLOR,
@@ -241,9 +240,6 @@ class _SettingBoxGenerator():
             hover_color=self.settings.ctm.SB__CHECKBOX_HOVER_COLOR,
             checkmark_color=self.settings.ctm.SB__CHECKBOX_CHECKMARK_COLOR,
             fg_color=self.settings.ctm.SB__CHECKBOX_CHECKED_COLOR,
-            # fg_color=self.settings.ctm.SB__SWITCH_BOX_BG_COLOR,
-            # bg_color="red",
-            # progress_color=self.settings.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR,
         )
         setattr(self.config_window, checkbox_attr_name, checkbox_widget)
 
@@ -1077,106 +1073,6 @@ class _SettingBoxGenerator():
 
 
 
-
-
-        # if setting_box_type == "dropdown_menu_x_dropdown_menu":
-        #     self.setting_box_dropdown_menu_x_dropdown_menu = CTkFrame(self.setting_box, corner_radius=0, fg_color=self.settings.ctm.SB__BG_COLOR, width=0, height=0)
-        #     self.setting_box_dropdown_menu_x_dropdown_menu.grid(row=0, column=1, padx=(0, self.settings.uism.SB__RIGHT_PADX), rowspan=2, sticky="e")
-
-
-
-        #     # Labels
-        #     self.optionmenu_label_left = CTkLabel(
-        #         self.setting_box_dropdown_menu_x_dropdown_menu,
-        #         text=kwargs["left_dropdown_menu_label"],
-        #         font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"),
-        #     )
-        #     self.optionmenu_label_left.grid(row=0, column=0)
-
-        #     self.the_space_between_optionmenu = CTkLabel(
-        #         self.setting_box_dropdown_menu_x_dropdown_menu,
-        #         text=None,
-        #     )
-        #     self.the_space_between_optionmenu.grid(row=0, column=1)
-
-
-        #     self.optionmenu_label_right = CTkLabel(
-        #         self.setting_box_dropdown_menu_x_dropdown_menu,
-        #         text=kwargs["right_dropdown_menu_label"],
-        #         font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"),
-        #     )
-        #     self.optionmenu_label_right.grid(row=0, column=2)
-
-
-
-        #     # Option menus
-        #     self.createOption_DropdownMenu(
-        #         setattr_obj,
-        #         self.setting_box_dropdown_menu_x_dropdown_menu,
-        #         kwargs["left_optionmenu_attr_name"],
-        #         kwargs["left_dropdown_menu_attr_name"],
-        #         dropdown_menu_values=kwargs["left_dropdown_menu_values"],
-        #         width=150,
-        #         command=kwargs["left_dropdown_menu_command"],
-        #         variable=kwargs["left_dropdown_menu_variable"],
-        #     )
-        #     getattr(setattr_obj, kwargs["left_optionmenu_attr_name"]).grid(row=1, column=0)
-
-
-
-        #     self.the_label_between_optionmenu = CTkLabel(
-        #         self.setting_box_dropdown_menu_x_dropdown_menu,
-        #         text="-->",
-        #         # anchor="w",
-        #         font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__OPTION_MENU_FONT_SIZE, weight="normal"),
-        #         text_color=self.settings.ctm.LABELS_TEXT_COLOR
-        #     )
-        #     self.the_label_between_optionmenu.grid(row=1, column=1, padx=self.settings.uism.SB__RIGHT_PADX/2)
-
-
-        #     self.createOption_DropdownMenu(
-        #         setattr_obj,
-        #         self.setting_box_dropdown_menu_x_dropdown_menu,
-        #         kwargs["right_optionmenu_attr_name"],
-        #         kwargs["right_dropdown_menu_attr_name"],
-        #         dropdown_menu_values=kwargs["right_dropdown_menu_values"],
-        #         width=150,
-        #         command=kwargs["right_dropdown_menu_command"],
-        #         variable=kwargs["right_dropdown_menu_variable"],
-        #     )
-        #     getattr(setattr_obj, kwargs["right_optionmenu_attr_name"]).grid(row=1, column=2)
-
-
-
-
-        # if setting_box_type == "radio_buttons":
-        #     self.setting_box_radio_buttons_frame = CTkFrame(self.setting_box, corner_radius=0, width=0, height=0)
-        #     self.setting_box_radio_buttons_frame.grid(row=0, column=1, padx=(0, self.settings.uism.SB__RIGHT_PADX), rowspan=2, sticky="e")
-
-        #     RADIO_BUTTON_RIGHT_PAD = 14
-        #     self.setting_box_radio_button_1 = CTkRadioButton(
-        #         self.setting_box_radio_buttons_frame,
-        #         text="lorem ipsum",
-        #         font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal")
-        #     )
-        #     self.setting_box_radio_button_1.grid(row=0, column=0, padx=(0,RADIO_BUTTON_RIGHT_PAD), sticky="e")
-
-        #     self.setting_box_radio_button_2 = CTkRadioButton(
-        #         self.setting_box_radio_buttons_frame,
-        #         text="lorem ipsum",
-        #         font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal")
-        #     )
-        #     self.setting_box_radio_button_2.grid(row=0, column=1, padx=(0,RADIO_BUTTON_RIGHT_PAD), sticky="e")
-
-        #     self.setting_box_radio_button_3 = CTkRadioButton(
-        #         self.setting_box_radio_buttons_frame,
-        #         text="lorem ipsum",
-        #         font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.SB__RADIO_BUTTON_FONT_SIZE, weight="normal")
-        #     )
-        #     self.setting_box_radio_button_3.grid(row=0, column=2, padx=(0,RADIO_BUTTON_RIGHT_PAD), sticky="e")
-
-
-
     def _createPassiveButtonForProgressbarXSlider(self, setting_box_progressbar_x_slider_frame, button_command, button_image_file):
         button_wrapper = createButtonWithImage(
             parent_widget=setting_box_progressbar_x_slider_frame,

vrct_gui/main_window/createMainWindowWidgets.py

@@ -11,13 +11,11 @@ def createMainWindowWidgets(vrct_gui, settings, view_variable):
 
     vrct_gui.iconbitmap(getImagePath("vrct_logo_mark_black.ico"))
     vrct_gui.title("VRCT")
-    # vrct_gui.minsize(200, 200)
 
 
     # Main Container
     vrct_gui.grid_columnconfigure(0, weight=1)
     vrct_gui.grid_rowconfigure(0, weight=1)
-    # vrct_gui.grid_columnconfigure(0, weight=1, minsize=settings.uism.MAIN_AREA_MIN_WIDTH)
 
     vrct_gui.configure(fg_color=settings.ctm.MAIN_BG_COLOR)
 

vrct_gui/splash_window/SplashWindow.py

@@ -12,7 +12,6 @@ class SplashWindow(CTkToplevel):
 
 
         sw=self.winfo_screenwidth()
-        # sh=self.winfo_screenheight()
 
         pw=int(sw/4)