Merge branch 'view' into develop
This commit is contained in:
@@ -593,6 +593,8 @@ def callbackDeleteMicWordFilter(value):
|
|||||||
new_input_mic_word_filter_list.remove(str(value))
|
new_input_mic_word_filter_list.remove(str(value))
|
||||||
config.INPUT_MIC_WORD_FILTER = new_input_mic_word_filter_list
|
config.INPUT_MIC_WORD_FILTER = new_input_mic_word_filter_list
|
||||||
view.setLatestConfigVariable("MicMicWordFilter")
|
view.setLatestConfigVariable("MicMicWordFilter")
|
||||||
|
model.resetKeywordProcessor()
|
||||||
|
model.addKeywords()
|
||||||
except Exception:
|
except Exception:
|
||||||
print("There was no the target word in config.INPUT_MIC_WORD_FILTER")
|
print("There was no the target word in config.INPUT_MIC_WORD_FILTER")
|
||||||
|
|
||||||
|
|||||||
9
view.py
9
view.py
@@ -852,8 +852,15 @@ class View():
|
|||||||
|
|
||||||
# Widget Control
|
# Widget Control
|
||||||
# Common
|
# Common
|
||||||
|
|
||||||
|
# Note: The difference between _clearEntryBox and _clearTextBox
|
||||||
|
# idk why, but in CTkEntry and CTkTextbox, the first argument for the delete function is different. Otherwise, it throws an error.
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _clearEntryBox(entry_widget):
|
def _clearEntryBox(entry_widget):
|
||||||
|
entry_widget.delete(0, "end")
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _clearTextBox(entry_widget):
|
||||||
entry_widget.delete("1.0", "end")
|
entry_widget.delete("1.0", "end")
|
||||||
|
|
||||||
def clearErrorMessage(self):
|
def clearErrorMessage(self):
|
||||||
@@ -1508,7 +1515,7 @@ class View():
|
|||||||
return vrct_gui.entry_message_box.get('1.0', "end-1c")
|
return vrct_gui.entry_message_box.get('1.0', "end-1c")
|
||||||
|
|
||||||
def clearMessageBox(self):
|
def clearMessageBox(self):
|
||||||
self._clearEntryBox(vrct_gui.entry_message_box)
|
self._clearTextBox(vrct_gui.entry_message_box)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -355,6 +355,7 @@ class _SettingBoxGenerator():
|
|||||||
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
||||||
button_image_file=self.settings.image_file.FOLDER_OPEN_ICON,
|
button_image_file=self.settings.image_file.FOLDER_OPEN_ICON,
|
||||||
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
||||||
|
corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS,
|
||||||
button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
|
button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
|
||||||
button_command=button_command,
|
button_command=button_command,
|
||||||
)
|
)
|
||||||
@@ -941,7 +942,8 @@ class _SettingBoxGenerator():
|
|||||||
button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR,
|
button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR,
|
||||||
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
||||||
button_image_file=button_image,
|
button_image_file=button_image,
|
||||||
button_image_size=self.settings.uism.SB__OPEN_CONFIG_FILE_BUTTON_ICON_SIZE,
|
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
||||||
|
corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS,
|
||||||
button_ipadxy=self.settings.uism.SB__OPEN_CONFIG_FILE_BUTTON_IPADXY,
|
button_ipadxy=self.settings.uism.SB__OPEN_CONFIG_FILE_BUTTON_IPADXY,
|
||||||
button_command=button_command,
|
button_command=button_command,
|
||||||
)
|
)
|
||||||
@@ -987,6 +989,7 @@ class _SettingBoxGenerator():
|
|||||||
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
||||||
button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270),
|
button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270),
|
||||||
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
||||||
|
corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS,
|
||||||
button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
|
button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
|
||||||
button_command=open_command,
|
button_command=open_command,
|
||||||
)
|
)
|
||||||
@@ -1001,6 +1004,7 @@ class _SettingBoxGenerator():
|
|||||||
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
|
||||||
button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90),
|
button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90),
|
||||||
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
|
||||||
|
corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS,
|
||||||
button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
|
button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
|
||||||
button_command=close_command,
|
button_command=close_command,
|
||||||
)
|
)
|
||||||
@@ -1216,6 +1220,7 @@ class _SettingBoxGenerator():
|
|||||||
button_clicked_color=self.settings.ctm.SB__ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CLICKED_BG_COLOR,
|
button_clicked_color=self.settings.ctm.SB__ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CLICKED_BG_COLOR,
|
||||||
button_image_file=self.settings.image_file.CANCEL_ICON,
|
button_image_file=self.settings.image_file.CANCEL_ICON,
|
||||||
button_image_size=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE,
|
button_image_size=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE,
|
||||||
|
corner_radius=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CORNER_RADIUS,
|
||||||
button_ipadxy=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY,
|
button_ipadxy=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY,
|
||||||
button_command=lambda _e: pressedDeleteButtonCommand(_e, delete_button, redo_button),
|
button_command=lambda _e: pressedDeleteButtonCommand(_e, delete_button, redo_button),
|
||||||
)
|
)
|
||||||
@@ -1228,6 +1233,7 @@ class _SettingBoxGenerator():
|
|||||||
button_clicked_color=self.settings.ctm.SB__ADD_AND_DELETE_ABLE_LIST__VALUES_DELETED_BUTTON_CLICKED_BG_COLOR,
|
button_clicked_color=self.settings.ctm.SB__ADD_AND_DELETE_ABLE_LIST__VALUES_DELETED_BUTTON_CLICKED_BG_COLOR,
|
||||||
button_image_file=self.settings.image_file.REDO_ICON,
|
button_image_file=self.settings.image_file.REDO_ICON,
|
||||||
button_image_size=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE,
|
button_image_size=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE,
|
||||||
|
corner_radius=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CORNER_RADIUS,
|
||||||
button_ipadxy=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY,
|
button_ipadxy=self.settings.uism.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY,
|
||||||
button_command=lambda _e: pressedRedoButtonCommand(_e, delete_button, redo_button),
|
button_command=lambda _e: pressedRedoButtonCommand(_e, delete_button, redo_button),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -307,6 +307,7 @@ class UiScalingManager():
|
|||||||
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_TEXT_IPADX = (self._calculateUiSize(8), 0)
|
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_TEXT_IPADX = (self._calculateUiSize(8), 0)
|
||||||
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_TEXT_IPADY = self._calculateUiSize(6)
|
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_TEXT_IPADY = self._calculateUiSize(6)
|
||||||
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE = self._calculateUiSize(14)
|
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IMG_SIZE = self._calculateUiSize(14)
|
||||||
|
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_CORNER_RADIUS = self._calculateUiSize(4)
|
||||||
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY = self._calculateUiSize(6)
|
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_IPADXY = self._calculateUiSize(6)
|
||||||
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_PADX = (self._calculateUiSize(6), self._calculateUiSize(8))
|
self.config_window.ADD_AND_DELETE_ABLE_LIST__VALUES_ACTION_BUTTON_PADX = (self._calculateUiSize(6), self._calculateUiSize(8))
|
||||||
|
|
||||||
@@ -333,9 +334,9 @@ class UiScalingManager():
|
|||||||
|
|
||||||
self.config_window.SB__BUTTON_IPADXY = self._calculateUiSize(16)
|
self.config_window.SB__BUTTON_IPADXY = self._calculateUiSize(16)
|
||||||
self.config_window.SB__BUTTON_ICON_SIZE = self._calculateUiSize(24)
|
self.config_window.SB__BUTTON_ICON_SIZE = self._calculateUiSize(24)
|
||||||
|
self.config_window.SB__BUTTON_CORNER_RADIUS = self.config_window.BUTTONS_CORNER_RADIUS
|
||||||
|
|
||||||
self.config_window.SB__OPEN_CONFIG_FILE_BUTTON_IPADXY = self._calculateUiSize(10)
|
self.config_window.SB__OPEN_CONFIG_FILE_BUTTON_IPADXY = self._calculateUiSize(10)
|
||||||
self.config_window.SB__OPEN_CONFIG_FILE_BUTTON_ICON_SIZE = self._calculateUiSize(20)
|
|
||||||
|
|
||||||
|
|
||||||
def _calculateUiSize(self, default_size, is_allowed_odd:bool=False, is_zero_allowed:bool=False):
|
def _calculateUiSize(self, default_size, is_allowed_odd:bool=False, is_zero_allowed:bool=False):
|
||||||
|
|||||||
Reference in New Issue
Block a user