diff --git a/examples/Gallery for siui/components/page_about/page_about.py b/examples/Gallery for siui/components/page_about/page_about.py index 0ed2bfb..076a37c 100644 --- a/examples/Gallery for siui/components/page_about/page_about.py +++ b/examples/Gallery for siui/components/page_about/page_about.py @@ -40,7 +40,7 @@ def __init__(self, *args, **kwargs): self.version_label = SiLabel(self) self.version_label.setSiliconWidgetFlag(Si.AdjustSizeOnTextChanged) self.version_label.setFont(SiFont.tokenized(GlobalFont.M_NORMAL)) - self.version_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}") + self.version_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_D)}") self.version_label.setText("PyQt-SiliconUI") version_picture_container.addWidget(self.version_picture) diff --git a/examples/Gallery for siui/components/page_container/page_container.py b/examples/Gallery for siui/components/page_container/page_container.py index f9c4cad..3184d84 100644 --- a/examples/Gallery for siui/components/page_container/page_container.py +++ b/examples/Gallery for siui/components/page_container/page_container.py @@ -26,8 +26,8 @@ def __init__(self, parent, text): self.resize(self.width() + 24, self.height()) def reloadStyleSheet(self): - self.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)};" - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)}") + self.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_D)}") class ExampleContainer(SiPage): @@ -112,19 +112,19 @@ def __init__(self, *args, **kwargs): self.indicator_h_80.resize(120, 4) self.indicator_h_80.setHint("该 Section 宽 120 像素") self.indicator_h_80.setFixedStyleSheet("border-radius: 2px") - self.indicator_h_80.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.THEME), 0.2)) + self.indicator_h_80.setColor(SiColor.trans(self.getColor(SiColor.THEME), 0.2)) self.indicator_h_120 = SiLabel(self) self.indicator_h_120.resize(180, 4) self.indicator_h_120.setHint("该 Section 宽 180 像素") self.indicator_h_120.setFixedStyleSheet("border-radius: 2px") - self.indicator_h_120.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.THEME), 0.5)) + self.indicator_h_120.setColor(SiColor.trans(self.getColor(SiColor.THEME), 0.5)) self.indicator_h_180 = SiLabel(self) self.indicator_h_180.resize(240, 4) self.indicator_h_180.setHint("该 Section 宽 240 像素") self.indicator_h_180.setFixedStyleSheet("border-radius: 2px") - self.indicator_h_180.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.THEME), 1.0)) + self.indicator_h_180.setColor(SiColor.trans(self.getColor(SiColor.THEME), 1.0)) self.indicator_container_divided_h_container.addWidget(self.indicator_h_80) self.indicator_container_divided_h_container.addWidget(self.indicator_h_120) @@ -163,19 +163,19 @@ def __init__(self, *args, **kwargs): self.indicator_v_48.resize(4, 48) self.indicator_v_48.setHint("该 Section 高 48 像素") self.indicator_v_48.setFixedStyleSheet("border-radius: 2px") - self.indicator_v_48.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.THEME), 0.2)) + self.indicator_v_48.setColor(SiColor.trans(self.getColor(SiColor.THEME), 0.2)) self.indicator_v_64 = SiLabel(self) self.indicator_v_64.resize(4, 64) self.indicator_v_64.setHint("该 Section 高 64 像素") self.indicator_v_64.setFixedStyleSheet("border-radius: 2px") - self.indicator_v_64.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.THEME), 0.5)) + self.indicator_v_64.setColor(SiColor.trans(self.getColor(SiColor.THEME), 0.5)) self.indicator_v_80 = SiLabel(self) self.indicator_v_80.resize(4, 80) self.indicator_v_80.setHint("该 Section 高 80 像素") self.indicator_v_80.setFixedStyleSheet("border-radius: 2px") - self.indicator_v_80.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.THEME), 1.0)) + self.indicator_v_80.setColor(SiColor.trans(self.getColor(SiColor.THEME), 1.0)) self.indicator_container_divided_v_container.addWidget(self.indicator_v_48) self.indicator_container_divided_v_container.addWidget(self.indicator_v_64) @@ -222,7 +222,7 @@ def __init__(self, *args, **kwargs): button = SiSimpleButton(label) button.attachment().setFont(SiFont.tokenized(GlobalFont.S_NORMAL)) button.attachment().setText(str(round(random.random(), int(6 * random.random() + 2)))) - button.colorGroup().assign(SiColor.BUTTON_OFF, button.colorGroup().fromToken(SiColor.INTERFACE_BG_D)) + button.colorGroup().assign(SiColor.BUTTON_OFF, button.getColor(SiColor.INTERFACE_BG_D)) button.setFixedHeight(32) button.adjustSize() button.setAttribute(Qt.WA_TransparentForMouseEvents) @@ -282,12 +282,12 @@ def __init__(self, *args, **kwargs): for _ in range(16): label = SiDraggableLabel(self) button = SiSimpleButton(label) - button.colorGroup().assign(SiColor.BUTTON_OFF, button.colorGroup().fromToken(SiColor.INTERFACE_BG_D)) + button.colorGroup().assign(SiColor.BUTTON_OFF, button.getColor(SiColor.INTERFACE_BG_D)) button.resize(160, int(random.random() * 50 + 70)) button.setAttribute(Qt.WA_TransparentForMouseEvents) label.button = button label.setFixedStyleSheet("border-radius: 4px") - label.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)) + label.setColor(self.getColor(SiColor.INTERFACE_BG_D)) label.resize(button.size()) self.demo_masonry_container.addWidget(label, ani=False) diff --git a/examples/Gallery for siui/components/page_dialog/components/modal_dialog_example.py b/examples/Gallery for siui/components/page_dialog/components/modal_dialog_example.py index ae9503f..7d9927f 100644 --- a/examples/Gallery for siui/components/page_dialog/components/modal_dialog_example.py +++ b/examples/Gallery for siui/components/page_dialog/components/modal_dialog_example.py @@ -10,15 +10,15 @@ def __init__(self, *args, **kwargs): self.setFixedWidth(500) self.icon().load(SiGlobal.siui.iconpack.get("ic_fluent_save_filled", color_code=SiColor.mix( - self.colorGroup().fromToken(SiColor.SVG_NORMAL), - self.colorGroup().fromToken(SiColor.INTERFACE_BG_B), + self.getColor(SiColor.SVG_NORMAL), + self.getColor(SiColor.INTERFACE_BG_B), 0.05)) ) label = SiLabel(self) - label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_E)}") + label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_E)}") label.setText( - f'是否保存刚刚编辑的文件？
' + f'是否保存刚刚编辑的文件？
' "
" "- 田所浩二志.doc
" "- 八十天游览下北泽——从百草园到三味书屋.docx
" @@ -30,13 +30,13 @@ def __init__(self, *args, **kwargs): button1 = SiPushButton(self) button1.setFixedHeight(32) button1.attachment().setText("继续编辑我的文档") - button1.colorGroup().assign(SiColor.BUTTON_PANEL, self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)) + button1.colorGroup().assign(SiColor.BUTTON_PANEL, self.getColor(SiColor.INTERFACE_BG_D)) button1.clicked.connect(SiGlobal.siui.windows["MAIN_WINDOW"].layerModalDialog().closeLayer) button2 = SiPushButton(self) button2.setFixedHeight(32) button2.attachment().setText("保存并退出") - button2.colorGroup().assign(SiColor.BUTTON_PANEL, self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)) + button2.colorGroup().assign(SiColor.BUTTON_PANEL, self.getColor(SiColor.INTERFACE_BG_D)) button2.clicked.connect(SiGlobal.siui.windows["MAIN_WINDOW"].layerModalDialog().closeLayer) self.button3 = SiLongPressButton(self) diff --git a/examples/Gallery for siui/components/page_dialog/components/side_msg_box.py b/examples/Gallery for siui/components/page_dialog/components/side_msg_box.py index 615b482..e7d563f 100644 --- a/examples/Gallery for siui/components/page_dialog/components/side_msg_box.py +++ b/examples/Gallery for siui/components/page_dialog/components/side_msg_box.py @@ -34,14 +34,14 @@ def send_custom_message(type_, auto_close=False, auto_close_duration=1000): info_label = SiLabel() info_label.setFont(SiFont.tokenized(GlobalFont.S_NORMAL)) - info_label.setStyleSheet(f"color: {info_label.colorGroup().fromToken(SiColor.TEXT_D)}; padding-left: 16px") + info_label.setStyleSheet(f"color: {info_label.getColor(SiColor.TEXT_D)}; padding-left: 16px") info_label.setText("以下账号已成功登录") info_label.adjustSize() split_line = SiLabel() split_line.resize(300, 1) split_line.setFixedStyleSheet("margin-left: 20px") - split_line.setColor(SiColor.trans(split_line.colorGroup().fromToken(SiColor.TEXT_D), 0.3)) + split_line.setColor(SiColor.trans(split_line.getColor(SiColor.TEXT_D), 0.3)) avatar = SiPixLabel(container) avatar.resize(80, 80) @@ -55,21 +55,21 @@ def send_custom_message(type_, auto_close=False, auto_close_duration=1000): name_label = SiLabel() name_label.setFont(SiFont.tokenized(GlobalFont.M_BOLD)) - name_label.setStyleSheet(f"color: {name_label.colorGroup().fromToken(SiColor.TEXT_B)}; padding-left:8px") + name_label.setStyleSheet(f"color: {name_label.getColor(SiColor.TEXT_B)}; padding-left:8px") name_label.setText("霏泠Ice") name_label.adjustSize() button_1 = SiSimpleButton() button_1.setFixedHeight(22) button_1.attachment().setText("打开我的主页") - button_1.colorGroup().assign(SiColor.TEXT_B, button_1.colorGroup().fromToken(SiColor.TITLE_INDICATOR)) + button_1.colorGroup().assign(SiColor.TEXT_B, button_1.getColor(SiColor.TITLE_INDICATOR)) button_1.adjustSize() button_1.reloadStyleSheet() button_2 = SiSimpleButton() button_2.setFixedHeight(22) button_2.attachment().setText("退出账号") - button_2.colorGroup().assign(SiColor.TEXT_B, button_2.colorGroup().fromToken(SiColor.TITLE_INDICATOR)) + button_2.colorGroup().assign(SiColor.TEXT_B, button_2.getColor(SiColor.TITLE_INDICATOR)) button_2.adjustSize() button_2.reloadStyleSheet() diff --git a/examples/Gallery for siui/components/page_functional/components/music_displayer/music_displayer.py b/examples/Gallery for siui/components/page_functional/components/music_displayer/music_displayer.py index 84a3035..64029ca 100644 --- a/examples/Gallery for siui/components/page_functional/components/music_displayer/music_displayer.py +++ b/examples/Gallery for siui/components/page_functional/components/music_displayer/music_displayer.py @@ -65,14 +65,14 @@ def loadAchievement(self, achievement): def reloadStyleSheet(self): super().reloadStyleSheet() - self.title_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_A)) - self.artist_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_A)) - self.album_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_D)) + self.title_label.setTextColor(self.getColor(SiColor.TEXT_A)) + self.artist_label.setTextColor(self.getColor(SiColor.TEXT_A)) + self.album_label.setTextColor(self.getColor(SiColor.TEXT_D)) self.transition_label.setStyleSheet( "background-color: qlineargradient(" " x1:0.1, y1:0, x2:1, y2:0," - f" stop:0 {SiColor.trans(self.colorGroup().fromToken(SiColor.INTERFACE_BG_D), 1.0)}," - f" stop:1 {SiColor.trans(self.colorGroup().fromToken(SiColor.INTERFACE_BG_D), 0.7)}" + f" stop:0 {SiColor.trans(self.getColor(SiColor.INTERFACE_BG_D), 1.0)}," + f" stop:1 {SiColor.trans(self.getColor(SiColor.INTERFACE_BG_D), 0.7)}" ")" ) self.achievement_label.setStyleSheet( @@ -144,7 +144,7 @@ def __init__(self, *args, **kwargs): self.state_label = SiLabel(self) self.state_label.resize(64, 128) self.state_label.setFixedStyleSheet("border-radius: 12px") - self.state_label.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + self.state_label.setColor(self.getColor(SiColor.INTERFACE_BG_C)) self.folded_container = SiDenseVContainer(self.state_label) self.folded_container.setAlignment(Qt.AlignHCenter) diff --git a/examples/Gallery for siui/components/page_icons/page_icons.py b/examples/Gallery for siui/components/page_icons/page_icons.py index b5cb3fe..8688e40 100644 --- a/examples/Gallery for siui/components/page_icons/page_icons.py +++ b/examples/Gallery for siui/components/page_icons/page_icons.py @@ -23,7 +23,7 @@ def on_button_clicked(): pyperclip.copy(button.objectName()) SiGlobal.siui.windows["TOOL_TIP"].setText( f"{button.objectName()}
" - f'复制成功', + f'复制成功', ) return on_button_clicked @@ -69,7 +69,7 @@ def __init__(self, *args, **kwargs): self.package_operation_container.setAlignment(Qt.AlignCenter) self.package_selection_description = SiLabel(self) - self.package_selection_description.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}") + self.package_selection_description.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_D)}") self.package_selection_description.setAlignment(Qt.AlignVCenter) self.package_selection_description.setText("当前图标包") self.package_selection_description.adjustSize() @@ -82,12 +82,12 @@ def __init__(self, *args, **kwargs): self.package_selection_combobox.valueChanged.connect(self.on_package_changed) self.package_selection_combobox.menu().setShowIcon(False) self.package_selection_combobox.colorGroup().assign( - SiColor.INTERFACE_BG_B, self.colorGroup().fromToken(SiColor.INTERFACE_BG_A)) + SiColor.INTERFACE_BG_B, self.getColor(SiColor.INTERFACE_BG_A)) self.package_selection_combobox.colorGroup().assign( - SiColor.INTERFACE_BG_D, self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + SiColor.INTERFACE_BG_D, self.getColor(SiColor.INTERFACE_BG_C)) self.search_description = SiLabel(self) - self.search_description.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}") + self.search_description.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_D)}") self.search_description.setAlignment(Qt.AlignVCenter) self.search_description.setText("搜索图标") self.search_description.adjustSize() @@ -97,9 +97,9 @@ def __init__(self, *args, **kwargs): self.search_input_box.reloadStyleSheet() self.search_input_box.line_edit.textChanged.connect(self.on_search_text_changed) self.search_input_box.colorGroup().assign( - SiColor.INTERFACE_BG_B, self.colorGroup().fromToken(SiColor.INTERFACE_BG_A)) + SiColor.INTERFACE_BG_B, self.getColor(SiColor.INTERFACE_BG_A)) self.search_input_box.colorGroup().assign( - SiColor.INTERFACE_BG_D, self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + SiColor.INTERFACE_BG_D, self.getColor(SiColor.INTERFACE_BG_C)) self.package_operation_container.addWidget(self.package_selection_description) self.package_operation_container.addWidget(self.package_selection_combobox) @@ -131,7 +131,7 @@ def __init__(self, *args, **kwargs): self.page_index_label.setAlignment(Qt.AlignCenter) self.page_index_label.setFixedSize(128, 32) self.page_index_label.setSiliconWidgetFlag(Si.AdjustSizeOnTextChanged) - self.page_index_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}") + self.page_index_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_D)}") self.page_down_button = SiPushButton(self) self.page_down_button.attachment().setText("下一页") @@ -198,13 +198,13 @@ def load_icon_page_to(self, page_index, fade_ani=True): svg_button = SiSimpleButton(widget) svg_button.colorGroup().assign(SiColor.BUTTON_OFF, - svg_button.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + svg_button.getColor(SiColor.INTERFACE_BG_C)) svg_button.attachment().setSvgSize(32, 32) - svg_button.attachment().load(icon_pack.get_from_data(value, self.colorGroup().fromToken(SiColor.SVG_NORMAL))) + svg_button.attachment().load(icon_pack.get_from_data(value, self.getColor(SiColor.SVG_NORMAL))) svg_button.setFixedSize(96, 96) svg_button.setHint( f"{key}
" - f'点击复制图标名称' + f'点击复制图标名称' ) svg_button.clicked.connect(get_on_button_clicked_func(widget)) svg_button.reloadStyleSheet() diff --git a/examples/Gallery for siui/components/page_widgets/components/demo_tables.py b/examples/Gallery for siui/components/page_widgets/components/demo_tables.py index 7e3a48d..cd697b4 100644 --- a/examples/Gallery for siui/components/page_widgets/components/demo_tables.py +++ b/examples/Gallery for siui/components/page_widgets/components/demo_tables.py @@ -40,14 +40,14 @@ def _value_write_parser(self, row_index, col_index, value): widget = self.parent().getRowWidget(row_index)[col_index] if col_index == 0: widget.setFont(SiFont.tokenized(GlobalFont.S_BOLD)) - widget.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_B)) + widget.setTextColor(self.parent().getColor(SiColor.TEXT_B)) if col_index == 1: widget.load(self.rank_dict[value]) widget.setHint(value) if col_index == 2: - widget.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_B)) + widget.setTextColor(self.parent().getColor(SiColor.TEXT_B)) if row_index == 0: widget.setFont(SiFont.tokenized(GlobalFont.S_BOLD)) else: @@ -57,21 +57,21 @@ def _value_write_parser(self, row_index, col_index, value): if value == "100.00%": widget.setTextColor("#B2D844") else: - widget.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_B)) + widget.setTextColor(self.parent().getColor(SiColor.TEXT_B)) if col_index == 4: widget.load(self.country_dict[value]) widget.setHint(value) if col_index == 5: - widget.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_THEME)) + widget.setTextColor(self.parent().getColor(SiColor.TEXT_THEME)) widget.setHint("Click to view profile") if col_index in [6, 7, 8, 9, 10]: if value == "0": - widget.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_E)) + widget.setTextColor(self.parent().getColor(SiColor.TEXT_E)) else: - widget.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_B)) + widget.setTextColor(self.parent().getColor(SiColor.TEXT_B)) if col_index in [0, 2, 3, 5, 6, 7, 8, 9, 10]: widget.setText(value) @@ -96,7 +96,7 @@ def on_header_created(self, header: SiRow): for name in self.parent().column_names: new_label = SiLabel(self.parent()) new_label.setFont(SiFont.tokenized(GlobalFont.S_BOLD)) - new_label.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_D)) + new_label.setTextColor(self.parent().getColor(SiColor.TEXT_D)) new_label.setText(name) new_label.adjustSize() header.container().addWidget(new_label) diff --git a/examples/My-TODOs/components/page_about/page_about.py b/examples/My-TODOs/components/page_about/page_about.py index e49e716..9dd35a1 100644 --- a/examples/My-TODOs/components/page_about/page_about.py +++ b/examples/My-TODOs/components/page_about/page_about.py @@ -38,7 +38,7 @@ def __init__(self, *args, **kwargs): self.version_label = SiLabel(self) self.version_label.setSiliconWidgetFlag(Si.AdjustSizeOnTextChanged) self.version_label.setFont(SiFont.tokenized(GlobalFont.M_NORMAL)) - self.version_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}") + self.version_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_D)}") self.version_label.setText("PyQt-SiliconUI") version_picture_container.addWidget(self.version_picture) diff --git a/examples/My-TODOs/components/page_homepage/components/today.py b/examples/My-TODOs/components/page_homepage/components/today.py index 7ba2c3d..2c2d550 100644 --- a/examples/My-TODOs/components/page_homepage/components/today.py +++ b/examples/My-TODOs/components/page_homepage/components/today.py @@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs): self.indicator = SiLabel(self) self.indicator.setFixedSize(8, 20) self.indicator.setFixedStyleSheet("border-radius: 4px") - self.indicator.setColor(self.colorGroup().fromToken(SiColor.PROGRESS_BAR_PROCESSING)) + self.indicator.setColor(self.getColor(SiColor.PROGRESS_BAR_PROCESSING)) self.indicator.move(0, 0) def setTimeStamp(self, time_stamp): @@ -62,7 +62,7 @@ def __init__(self, *args, **kwargs): def addTask(self, task: Task): d = datetime.datetime.fromtimestamp(task.due_time_stamp) r = d - datetime.datetime.fromtimestamp(time.time()) - dim_color = SiColor.mix(self.colorGroup().fromToken(SiColor.TEXT_B), task.color) + dim_color = SiColor.mix(self.getColor(SiColor.TEXT_B), task.color) new_task = TaskIndicator(self) new_task.setFixedStyleSheet("border-radius: 4px") @@ -111,8 +111,8 @@ def __init__(self, *args, **kwargs): self.month_label.setFont(SiFont.getFont(size=64, weight=QFont.Weight.Light, italic=True)) self.date_label.setFont(SiFont.getFont(size=64, weight=QFont.Weight.Bold, italic=False)) - self.month_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_D)) - self.date_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + self.month_label.setTextColor(self.getColor(SiColor.TEXT_D)) + self.date_label.setTextColor(self.getColor(SiColor.TEXT_B)) self.month_label.setAlignment(Qt.AlignVCenter | Qt.AlignRight) self.date_label.setAlignment(Qt.AlignVCenter | Qt.AlignLeft) @@ -141,8 +141,8 @@ def __init__(self, *args, **kwargs): self.stick_up.setFixedStyleSheet("border-radius: 1px") self.stick_down.setFixedStyleSheet("border-radius: 1px") - self.stick_up.setColor(self.colorGroup().fromToken(SiColor.TEXT_B)) - self.stick_down.setColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + self.stick_up.setColor(self.getColor(SiColor.TEXT_B)) + self.stick_down.setColor(self.getColor(SiColor.TEXT_B)) self.selector = SiLabel(self) self.selector.resize(20, 32) @@ -155,7 +155,7 @@ def reloadStyleSheet(self): super().reloadStyleSheet() self.selector.setStyleSheet( "border-radius: 8px;" - f"border: 3px solid {self.colorGroup().fromToken(SiColor.TEXT_B)}" + f"border: 3px solid {self.getColor(SiColor.TEXT_B)}" ) def setPadding(self, padding): @@ -192,7 +192,7 @@ def __init__(self, *args, **kwargs): self.task_track = SiLabel(self) self.task_track.setFixedStyleSheet("border-radius: 2px") - self.task_track.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_E)) + self.task_track.setColor(self.getColor(SiColor.INTERFACE_BG_E)) self.task_track.setFixedHeight(4) self.task_selector = TaskSelector(self) @@ -208,9 +208,9 @@ def __init__(self, *args, **kwargs): self.task_indicator_container = TaskIndicatorContainer(self) new_task_data1 = Task("回家睡觉", "躺下来闭上眼，睡觉就行", time.time() + 10000, - self.colorGroup().fromToken(SiColor.PROGRESS_BAR_COMPLETING)) + self.getColor(SiColor.PROGRESS_BAR_COMPLETING)) new_task_data2 = Task("写作业", "不写作业怎么交作业呢", time.time() - 20000, - self.colorGroup().fromToken(SiColor.PROGRESS_BAR_PROCESSING)) + self.getColor(SiColor.PROGRESS_BAR_PROCESSING)) self.task_indicator_container.addTask(new_task_data1) self.task_indicator_container.addTask(new_task_data2) @@ -278,13 +278,13 @@ def __init__(self, title, data, size_title, size_data, parent=None): self.title = SiLabel(self) self.title.setFont(SiFont.getFont(size=size_title, weight=QFont.Weight.Normal)) - self.title.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_D)) + self.title.setTextColor(self.getColor(SiColor.TEXT_D)) self.title.setSiliconWidgetFlag(Si.AdjustSizeOnTextChanged) self.title.setText(str(title)) self.data = SiLabel(self) self.data.setFont(SiFont.getFont(size=size_data, weight=QFont.Weight.Light)) - self.data.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + self.data.setTextColor(self.getColor(SiColor.TEXT_B)) self.data.setSiliconWidgetFlag(Si.AdjustSizeOnTextChanged) self.data.setText(str(data)) @@ -414,7 +414,7 @@ def __init__(self, *args, **kwargs): # self.memos_container = SiLabel(self) # self.memos_container.setFixedStyleSheet("border-radius: 4px") - # self.memos_container.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + # self.memos_container.setColor(self.getColor(SiColor.INTERFACE_BG_C)) def adjustSize(self): height = self.today_data_top.height() + 8 + self.today_tasks.height() + 8 + self.today_data_bottom.height() diff --git a/examples/My-TODOs/components/page_homepage/homepage.py b/examples/My-TODOs/components/page_homepage/homepage.py index debfed1..f1d65af 100644 --- a/examples/My-TODOs/components/page_homepage/homepage.py +++ b/examples/My-TODOs/components/page_homepage/homepage.py @@ -57,10 +57,10 @@ def __init__(self, *args, **kwargs): with self.titled_widget_group as group: group.addTitle("待办详情") - self.test_task_card = TaskCardLinear(Task("上床睡觉", "闭上眼睛直接睡觉就行", time.time(), self.colorGroup().fromToken(SiColor.PROGRESS_BAR_COMPLETING)), parent=self) + self.test_task_card = TaskCardLinear(Task("上床睡觉", "闭上眼睛直接睡觉就行", time.time(), self.getColor(SiColor.PROGRESS_BAR_COMPLETING)), parent=self) self.test_task_card.resize(0, 80) - self.test_task_card2 = TaskCardLinear(Task("写数学作业", "不写完作业该怎么交作业呢", time.time(), self.colorGroup().fromToken(SiColor.PROGRESS_BAR_PROCESSING)), parent=self) + self.test_task_card2 = TaskCardLinear(Task("写数学作业", "不写完作业该怎么交作业呢", time.time(), self.getColor(SiColor.PROGRESS_BAR_PROCESSING)), parent=self) self.test_task_card2.resize(0, 80) group.addPlaceholder(16) diff --git a/examples/My-TODOs/components/widgets/button.py b/examples/My-TODOs/components/widgets/button.py index 5d543f3..97a096d 100644 --- a/examples/My-TODOs/components/widgets/button.py +++ b/examples/My-TODOs/components/widgets/button.py @@ -11,29 +11,29 @@ def __init__(self, title, description, icon_name, parent=None): self.panel = SiLabel(self) self.panel.setFixedStyleSheet("border-radius: 4px") - self.panel.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + self.panel.setColor(self.getColor(SiColor.INTERFACE_BG_C)) self.icon_circle = SiLabel(self) self.icon_circle.setFixedSize(32, 32) self.icon_circle.move(20, 24) self.icon_circle.setFixedStyleSheet("border-radius: 16px") - self.icon_circle.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)) + self.icon_circle.setColor(self.getColor(SiColor.INTERFACE_BG_D)) self.icon = SiSvgLabel(self.icon_circle) self.icon.resize(32, 32) - self.icon.load(SiGlobal.siui.iconpack.get(icon_name, color_code=self.colorGroup().fromToken(SiColor.SVG_NORMAL))) + self.icon.load(SiGlobal.siui.iconpack.get(icon_name, color_code=self.getColor(SiColor.SVG_NORMAL))) self.icon.setSvgSize(16, 16) self.title = SiLabel(self) self.title.setFont(SiFont.getFont(size=16, weight=QFont.Weight.Bold)) - self.title.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + self.title.setTextColor(self.getColor(SiColor.TEXT_B)) self.title.setText(title) self.title.adjustSize() self.title.move(72, 20) self.description = SiLabel(self) self.description.setFont(SiFont.getFont(size=14, weight=QFont.Weight.Light)) - self.description.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_D)) + self.description.setTextColor(self.getColor(SiColor.TEXT_D)) self.description.setText(description) self.description.adjustSize() self.description.move(72, 20 + 20) diff --git a/examples/My-TODOs/components/widgets/group_title.py b/examples/My-TODOs/components/widgets/group_title.py index 0f846be..4fc66e4 100644 --- a/examples/My-TODOs/components/widgets/group_title.py +++ b/examples/My-TODOs/components/widgets/group_title.py @@ -16,8 +16,8 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): super().reloadStyleSheet() - self.title.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) - self.title_indicator.setColor(self.colorGroup().fromToken(SiColor.TITLE_INDICATOR)) + self.title.setTextColor(self.getColor(SiColor.TEXT_B)) + self.title_indicator.setColor(self.getColor(SiColor.TITLE_INDICATOR)) def setTitle(self, title): self.title.setText(title) diff --git a/examples/My-TODOs/components/widgets/tasks.py b/examples/My-TODOs/components/widgets/tasks.py index 2174038..7226b13 100644 --- a/examples/My-TODOs/components/widgets/tasks.py +++ b/examples/My-TODOs/components/widgets/tasks.py @@ -17,7 +17,7 @@ def __init__(self, task, parent=None): self.original_panel = SiLabel(self) self.original_panel.setFixedStyleSheet("border-radius: 8px") - self.original_panel.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + self.original_panel.setColor(self.getColor(SiColor.INTERFACE_BG_C)) self.panel = SiLabel(self) self.panel.setFixedStyleSheet("border-radius: 8px; border-top-left-radius: 6px; border-bottom-left-radius: 6px") @@ -33,9 +33,9 @@ def __init__(self, task, parent=None): def loadTask(self, task: Task): self.task = task self.theme_color_indicator.setColor(task.color) - self.panel.setColor(SiColor.mix(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C), task.color, weight=0.9)) - self.title.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) - self.description.setTextColor(SiColor.mix(self.colorGroup().fromToken(SiColor.TEXT_B), task.color)) + self.panel.setColor(SiColor.mix(self.getColor(SiColor.INTERFACE_BG_C), task.color, weight=0.9)) + self.title.setTextColor(self.getColor(SiColor.TEXT_B)) + self.description.setTextColor(SiColor.mix(self.getColor(SiColor.TEXT_B), task.color)) self.title.setText(task.name) self.description.setText(task.description) diff --git a/siui/components/combobox/abstracts/combobox.py b/siui/components/combobox/abstracts/combobox.py index 3121fed..1d388d4 100644 --- a/siui/components/combobox/abstracts/combobox.py +++ b/siui/components/combobox/abstracts/combobox.py @@ -62,15 +62,15 @@ def _on_unfold_button_clicked(self): def reloadStyleSheet(self): super().reloadStyleSheet() self.panel_label.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_B)};" - f"border: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_B)};" + f"border: 1px solid {self.getColor(SiColor.INTERFACE_BG_D)};" ) svg_data = ('') + f' fill="{self.getColor(SiColor.SVG_NORMAL)}" />') self.unfold_menu_indicator.load(svg_data.encode()) def resizeEvent(self, event): diff --git a/siui/components/combobox/combobox.py b/siui/components/combobox/combobox.py index 62a59e8..8d3945e 100644 --- a/siui/components/combobox/combobox.py +++ b/siui/components/combobox/combobox.py @@ -48,7 +48,7 @@ def addOption(self, def reloadStyleSheet(self): super().reloadStyleSheet() - self.value_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}") + self.value_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)}") def resizeEvent(self, event): super().resizeEvent(event) diff --git a/siui/components/menu/abstracts/ani_manager.py b/siui/components/menu/abstracts/ani_manager.py index b345d5b..9db2102 100644 --- a/siui/components/menu/abstracts/ani_manager.py +++ b/siui/components/menu/abstracts/ani_manager.py @@ -30,8 +30,8 @@ def on_parent_unfolded(parent, x, y): parent.resize(parent.width(), int(target_height * 0.6)) parent.resizeTo(parent.width(), target_height) - parent.flash_layer.setColor(SiColor.trans(parent.colorGroup().fromToken(SiColor.BUTTON_FLASH), 1)) - parent.flash_layer.setColorTo(SiColor.trans(parent.colorGroup().fromToken(SiColor.BUTTON_FLASH), 0)) + parent.flash_layer.setColor(SiColor.trans(parent.getColor(SiColor.BUTTON_FLASH), 1)) + parent.flash_layer.setColorTo(SiColor.trans(parent.getColor(SiColor.BUTTON_FLASH), 0)) @staticmethod def on_parent_resized(parent, event): @@ -67,8 +67,8 @@ def on_parent_unfolded(parent, x, y): parent.body().resize(parent.body().width(), 0) parent.show() - parent.flash_layer.setColor(SiColor.trans(parent.colorGroup().fromToken(SiColor.BUTTON_FLASH), 1)) - parent.flash_layer.setColorTo(SiColor.trans(parent.colorGroup().fromToken(SiColor.BUTTON_FLASH), 0)) + parent.flash_layer.setColor(SiColor.trans(parent.getColor(SiColor.BUTTON_FLASH), 1)) + parent.flash_layer.setColorTo(SiColor.trans(parent.getColor(SiColor.BUTTON_FLASH), 0)) @staticmethod def on_parent_resized(parent, event): diff --git a/siui/components/menu/abstracts/menu.py b/siui/components/menu/abstracts/menu.py index 9cada6c..6ccc355 100644 --- a/siui/components/menu/abstracts/menu.py +++ b/siui/components/menu/abstracts/menu.py @@ -67,8 +67,8 @@ def reloadStyleSheet(self): super().reloadStyleSheet() self.body_panel.setStyleSheet( f"""#menu_body_panel {{ - background-color: {self.colorGroup().fromToken(SiColor.MENU_BG)}; - border: 1px solid {SiColor.mix(self.colorGroup().fromToken(SiColor.MENU_BG), self.colorGroup().fromToken(SiColor.TEXT_E), 0.9)}; + background-color: {self.getColor(SiColor.MENU_BG)}; + border: 1px solid {SiColor.mix(self.getColor(SiColor.MENU_BG), self.getColor(SiColor.TEXT_E), 0.9)}; border-radius: 6px }}""" ) diff --git a/siui/components/menu/option.py b/siui/components/menu/option.py index 85fd242..73369e9 100644 --- a/siui/components/menu/option.py +++ b/siui/components/menu/option.py @@ -162,14 +162,14 @@ def on_hover_timeout(self): def reloadStyleSheet(self): super().reloadStyleSheet() - self.chosen_indicator.setColor(self.colorGroup().fromToken(SiColor.THEME)) - self.text_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}") + self.chosen_indicator.setColor(self.getColor(SiColor.THEME)) + self.text_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)}") if self.child_menu is not None: svg_arrow = ('') + f'15.4,9.88Z" fill="{self.getColor(SiColor.SVG_NORMAL)}" />') self.has_child_menu_indicator.load(svg_arrow.encode()) def resizeEvent(self, event): diff --git a/siui/components/page/child_page.py b/siui/components/page/child_page.py index ee68627..56ab7de 100644 --- a/siui/components/page/child_page.py +++ b/siui/components/page/child_page.py @@ -20,8 +20,8 @@ def __init__(self, *args, **kwargs): self.background_content = SiLabel(self.view_) self.background_content.setStyleSheet( "border-radius: 8px;" - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_B)};" - f"border: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_B)};" + f"border: 1px solid {self.getColor(SiColor.INTERFACE_BG_C)};" ) @@ -32,7 +32,7 @@ def __init__(self, *args, **kwargs): self.background_panel.setStyleSheet( "border-top-left-radius: 8px;" "border-top-right-radius: 8px;" - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)}" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_C)}" ) SiQuickEffect.applyDropShadowOn(self.background_panel, (0, 0, 0, 60), blur_radius=48) diff --git a/siui/components/progress_bar/progress_bar.py b/siui/components/progress_bar/progress_bar.py index 1de2999..5128ece 100644 --- a/siui/components/progress_bar/progress_bar.py +++ b/siui/components/progress_bar/progress_bar.py @@ -108,14 +108,14 @@ def refreshHint(self): """ 刷新工具提示，重写该方法以自定义工具提示 """ - self.setHint(f"{round(self.value()*100, 2)}%") # noqa: E501 + self.setHint(f"{round(self.value()*100, 2)}%") # noqa: E501 def _flash(self): """ 触发进度闪烁 """ - self.flash.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.PROGRESS_BAR_FLASHES), 0.8)) - self.flash.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.PROGRESS_BAR_FLASHES), 0.0)) + self.flash.setColor(SiColor.trans(self.getColor(SiColor.PROGRESS_BAR_FLASHES), 0.8)) + self.flash.setColorTo(SiColor.trans(self.getColor(SiColor.PROGRESS_BAR_FLASHES), 0.0)) def _resize_progress_according_to_value(self): """ @@ -130,8 +130,8 @@ def _resize_progress_according_to_value(self): def reloadStyleSheet(self): super().reloadStyleSheet() - self.track.setStyleSheet(f"background-color: {self.colorGroup().fromToken(SiColor.PROGRESS_BAR_TRACK)}") - self.progress.setColorTo(self.colorGroup().fromToken(self.state_colors[self.state()])) # noqa: UP032 + self.track.setStyleSheet(f"background-color: {self.getColor(SiColor.PROGRESS_BAR_TRACK)}") + self.progress.setColorTo(self.getColor(self.state_colors[self.state()])) # noqa: UP032 def resizeEvent(self, event): super().resizeEvent(event) @@ -233,7 +233,7 @@ def paintEvent(self, event): painter = QPainter(self) painter.setRenderHint(QPainter.RenderHint.Antialiasing) - color_array = SiColor.toArray(self.colorGroup().fromToken(SiColor.PROGRESS_BAR_PROCESSING))[1:4] + color_array = SiColor.toArray(self.getColor(SiColor.PROGRESS_BAR_PROCESSING))[1:4] pen = QPen(QColor(*color_array), self.bar_width) pen.setCapStyle(Qt.PenCapStyle.RoundCap) painter.setPen(pen) diff --git a/siui/components/widgets/abstracts/button.py b/siui/components/widgets/abstracts/button.py index 6f747d5..4fc76d4 100644 --- a/siui/components/widgets/abstracts/button.py +++ b/siui/components/widgets/abstracts/button.py @@ -32,14 +32,14 @@ def __init__(self, *args, **kwargs): # 提供悬停时的颜色变化动画 self.hover_highlight = SiLabel(self) self.hover_highlight.stackUnder(self) # 置于按钮的底部 - self.hover_highlight.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.BUTTON_HOVER), 0.0)) + self.hover_highlight.setColor(SiColor.trans(self.getColor(SiColor.BUTTON_HOVER), 0.0)) self.hover_highlight.animationGroup().fromToken("color").setBias(0.2) self.hover_highlight.animationGroup().fromToken("color").setFactor(1 / 8) # 提供点击时的颜色变化动画 self.flash_label = SiLabel(self) self.flash_label.stackUnder(self) # 置于按钮的底部 - self.flash_label.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.BUTTON_FLASH), 0.0)) + self.flash_label.setColor(SiColor.trans(self.getColor(SiColor.BUTTON_FLASH), 0.0)) self.flash_label.animationGroup().fromToken("color").setBias(0.2) self.flash_label.animationGroup().fromToken("color").setFactor(1 / 8) @@ -345,7 +345,7 @@ def __init__(self, *args, **kwargs): # 创建一个颜色叠层，用于标识被选中的状态 self.color_label = SiLabel(self) - self.color_label.setColor(self.colorGroup().fromToken(SiColor.BUTTON_OFF)) # 初始是关闭状态 + self.color_label.setColor(self.getColor(SiColor.BUTTON_OFF)) # 初始是关闭状态 # 把状态切换信号绑定到颜色切换的槽函数上 self.toggled.connect(self._toggled_handler) @@ -372,13 +372,13 @@ def reloadStyleSheet(self): self.setFixedStyleSheet(f"border-radius: {self.border_radius}px") # 刷新颜色 - self.color_label.setColor(self.colorGroup().fromToken(SiColor.BUTTON_ON if self.isChecked() else SiColor.BUTTON_OFF)) # noqa: E501 + self.color_label.setColor(self.getColor(SiColor.BUTTON_ON if self.isChecked() else SiColor.BUTTON_OFF)) # noqa: E501 def _toggled_handler(self, state): if state is True: - self.color_label.setColorTo(self.colorGroup().fromToken(SiColor.BUTTON_ON)) + self.color_label.setColorTo(self.getColor(SiColor.BUTTON_ON)) else: - self.color_label.setColorTo(self.colorGroup().fromToken(SiColor.BUTTON_OFF)) + self.color_label.setColorTo(self.getColor(SiColor.BUTTON_OFF)) def resizeEvent(self, event): super().resizeEvent(event) diff --git a/siui/components/widgets/abstracts/line_edit.py b/siui/components/widgets/abstracts/line_edit.py index 3ff9530..ccf5715 100644 --- a/siui/components/widgets/abstracts/line_edit.py +++ b/siui/components/widgets/abstracts/line_edit.py @@ -23,7 +23,7 @@ def reloadStyleSheet(self): "QLineEdit {" " selection-background-color: #493F4E;" " background-color: transparent;" - f" color: {self.parent().colorGroup().fromToken(SiColor.TEXT_C)};" + f" color: {self.parent().getColor(SiColor.TEXT_C)};" " border: 0px" "}" ) @@ -88,15 +88,15 @@ def reloadStyleSheet(self): super().reloadStyleSheet() self.outfit_label_top.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_B)};" - f"border-left: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)};" - f"border-right: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)};" - f"border-top: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_B)};" + f"border-left: 1px solid {self.getColor(SiColor.INTERFACE_BG_D)};" + f"border-right: 1px solid {self.getColor(SiColor.INTERFACE_BG_D)};" + f"border-top: 1px solid {self.getColor(SiColor.INTERFACE_BG_D)};" ) self.outfit_label_bottom.setStyleSheet( "background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1," - f" stop:0 {self.colorGroup().fromToken(SiColor.THEME_TRANSITION_A)}," - f" stop:1 {self.colorGroup().fromToken(SiColor.THEME_TRANSITION_B)}" + f" stop:0 {self.getColor(SiColor.THEME_TRANSITION_A)}," + f" stop:1 {self.getColor(SiColor.THEME_TRANSITION_B)}" ")" ) diff --git a/siui/components/widgets/button.py b/siui/components/widgets/button.py index b8d435e..c64debf 100644 --- a/siui/components/widgets/button.py +++ b/siui/components/widgets/button.py @@ -43,22 +43,22 @@ def reloadStyleSheet(self): self.body_top.setStyleSheet( f""" background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, - stop:0 {self.colorGroup().fromToken(SiColor.BUTTON_THEMED_BG_A)}, - stop:1 {self.colorGroup().fromToken(SiColor.BUTTON_THEMED_BG_B)}) + stop:0 {self.getColor(SiColor.BUTTON_THEMED_BG_A)}, + stop:1 {self.getColor(SiColor.BUTTON_THEMED_BG_B)}) """ ) self.body_bottom.setStyleSheet( f""" background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, - stop:0 {self.colorGroup().fromToken(SiColor.BUTTON_THEMED_SHADOW_A)}, - stop:1 {self.colorGroup().fromToken(SiColor.BUTTON_THEMED_SHADOW_B)}) + stop:0 {self.getColor(SiColor.BUTTON_THEMED_SHADOW_A)}, + stop:1 {self.getColor(SiColor.BUTTON_THEMED_SHADOW_B)}) """ ) else: # 纯色 - self.body_top.setStyleSheet(f"background-color: {self.colorGroup().fromToken(SiColor.BUTTON_PANEL)}") - self.body_bottom.setStyleSheet(f"background-color: {self.colorGroup().fromToken(SiColor.BUTTON_SHADOW)}") + self.body_top.setStyleSheet(f"background-color: {self.getColor(SiColor.BUTTON_PANEL)}") + self.body_bottom.setStyleSheet(f"background-color: {self.getColor(SiColor.BUTTON_SHADOW)}") def setUseTransition(self, b: bool): """ @@ -111,8 +111,8 @@ def _process_changed_handler(self, p): self.body_top.setStyleSheet( f""" background-color: qlineargradient(x1:{p-0.001}, y1:0, x2:{p}, y2:0, - stop:0 {self.colorGroup().fromToken(SiColor.BUTTON_LONG_PRESS_PROGRESS)}, - stop:1 {self.colorGroup().fromToken(SiColor.BUTTON_LONG_PRESS_PANEL)}) + stop:0 {self.getColor(SiColor.BUTTON_LONG_PRESS_PROGRESS)}, + stop:1 {self.getColor(SiColor.BUTTON_LONG_PRESS_PANEL)}) """ ) @@ -120,10 +120,10 @@ def reloadStyleSheet(self): super().reloadStyleSheet() # 设置文字颜色 - self.label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}") + self.label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)}") - self.body_top.setStyleSheet(f"background-color: {self.colorGroup().fromToken(SiColor.BUTTON_LONG_PRESS_PANEL)}") - self.body_bottom.setStyleSheet(f"background-color: {self.colorGroup().fromToken(SiColor.BUTTON_LONG_PRESS_SHADOW)}") # noqa: E501 + self.body_top.setStyleSheet(f"background-color: {self.getColor(SiColor.BUTTON_LONG_PRESS_PANEL)}") + self.body_bottom.setStyleSheet(f"background-color: {self.getColor(SiColor.BUTTON_LONG_PRESS_SHADOW)}") # noqa: E501 def mousePressEvent(self, event): super().mousePressEvent(event) @@ -166,7 +166,7 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): super().reloadStyleSheet() - self.label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}") + self.label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)}") class SiSimpleButton(SiToggleButton): @@ -219,7 +219,7 @@ def reloadStyleSheet(self): super().reloadStyleSheet() # 设置文字颜色 - self.text_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}") + self.text_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)}") # 设置选项按钮样式表，调用自己的事件处理器以刷新 self._toggled_handler(self.isChecked()) @@ -266,11 +266,11 @@ def _toggled_handler(self, check: bool): # 禁止其切换模式，防止被取消选择 self.indicator.setCheckable(False) - self.indicator_label.setStyleSheet(f"border: 4px solid {self.colorGroup().fromToken(SiColor.RADIO_BUTTON_CHECKED)}") # noqa: E501 + self.indicator_label.setStyleSheet(f"border: 4px solid {self.getColor(SiColor.RADIO_BUTTON_CHECKED)}") # noqa: E501 else: # 如果被选中状态为假，就允许其切换模式 self.indicator.setCheckable(True) - self.indicator_label.setStyleSheet(f"border: 3px solid {self.colorGroup().fromToken(SiColor.RADIO_BUTTON_UNCHECKED)}") # noqa: E501 + self.indicator_label.setStyleSheet(f"border: 3px solid {self.getColor(SiColor.RADIO_BUTTON_UNCHECKED)}") # noqa: E501 def _uncheck_all_in_same_parent(self): """ @@ -315,7 +315,7 @@ def __init__(self, parent): '0 c12.496-12.492,32.752-12.492,45.248,0l109.248,109.248L452.889,79.942c12.496-12.492,' '32.752-12.492,45.248,0l0,0 c12.492,12.496,12.492,32.752,0,45.248L202.265,421.019C192.087,' '431.214,178.271,436.94,163.865,436.934z" ' - f'fill="{self.colorGroup().fromToken(SiColor.CHECKBOX_SVG)}" />') + f'fill="{self.getColor(SiColor.CHECKBOX_SVG)}" />') self.indicator_icon = SiSvgLabel(self) self.indicator_icon.resize(20, 20) self.indicator_icon.setSvgSize(12, 12) @@ -339,7 +339,7 @@ def reloadStyleSheet(self): super().reloadStyleSheet() # 设置文字颜色 - self.text_label.setStyleSheet(f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}") + self.text_label.setStyleSheet(f"color: {self.getColor(SiColor.TEXT_B)}") # 设置选项按钮样式表，调用自己的事件处理器以刷新 self._toggled_handler(self.isChecked()) @@ -381,10 +381,10 @@ def isChecked(self): def _toggled_handler(self, check: bool): if check is True: self.indicator_icon.setVisible(True) - self.indicator_label.setStyleSheet(f"background-color: {self.colorGroup().fromToken(SiColor.CHECKBOX_CHECKED)}") # noqa: E501 + self.indicator_label.setStyleSheet(f"background-color: {self.getColor(SiColor.CHECKBOX_CHECKED)}") # noqa: E501 else: self.indicator_icon.setVisible(False) - self.indicator_label.setStyleSheet(f"border: 1px solid {self.colorGroup().fromToken(SiColor.CHECKBOX_UNCHECKED)}") # noqa: E501 + self.indicator_label.setStyleSheet(f"border: 1px solid {self.getColor(SiColor.CHECKBOX_UNCHECKED)}") # noqa: E501 def resizeEvent(self, event): super().resizeEvent(event) @@ -459,15 +459,15 @@ def _lever_move_animation_handler(self, x): self.switch_frame.setStyleSheet( f""" background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, - stop:0 {self.colorGroup().fromToken(SiColor.THEME_TRANSITION_A)}, - stop:1 {self.colorGroup().fromToken(SiColor.THEME_TRANSITION_B)}); + stop:0 {self.getColor(SiColor.THEME_TRANSITION_A)}, + stop:1 {self.getColor(SiColor.THEME_TRANSITION_B)}); """ ) - self.switch_lever.setStyleSheet(f"background-color:{self.colorGroup().fromToken(SiColor.SWITCH_ACTIVATE)}") + self.switch_lever.setStyleSheet(f"background-color:{self.getColor(SiColor.SWITCH_ACTIVATE)}") else: - self.switch_frame.setStyleSheet(f"border: 1px solid {self.colorGroup().fromToken(SiColor.SWITCH_DEACTIVATE)}") # noqa: E501 - self.switch_lever.setStyleSheet(f"background-color:{self.colorGroup().fromToken(SiColor.SWITCH_DEACTIVATE)}") # noqa: E501 + self.switch_frame.setStyleSheet(f"border: 1px solid {self.getColor(SiColor.SWITCH_DEACTIVATE)}") # noqa: E501 + self.switch_lever.setStyleSheet(f"background-color:{self.getColor(SiColor.SWITCH_DEACTIVATE)}") # noqa: E501 def _set_animation_target(self, is_checked): if is_checked is True: diff --git a/siui/components/widgets/line_edit.py b/siui/components/widgets/line_edit.py index 441fdd9..a9d7818 100644 --- a/siui/components/widgets/line_edit.py +++ b/siui/components/widgets/line_edit.py @@ -72,18 +72,18 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): super().reloadStyleSheet() - c = self.colorGroup().fromToken(SiColor.INTERFACE_BG_C) - b = self.colorGroup().fromToken(SiColor.INTERFACE_BG_B) - a = self.colorGroup().fromToken(SiColor.INTERFACE_BG_A) + c = self.getColor(SiColor.INTERFACE_BG_C) + b = self.getColor(SiColor.INTERFACE_BG_B) + a = self.getColor(SiColor.INTERFACE_BG_A) self.base_panel.setColor(SiColor.mix(c, b, 0.3)) self.edit_panel.setColor(SiColor.mix(b, a, 0.5)) - self.name_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_D)) + self.name_label.setTextColor(self.getColor(SiColor.TEXT_D)) def flash_on_edited(self): - c = self.colorGroup().fromToken(SiColor.INTERFACE_BG_C) - b = self.colorGroup().fromToken(SiColor.INTERFACE_BG_B) - self.base_panel.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_E)) + c = self.getColor(SiColor.INTERFACE_BG_C) + b = self.getColor(SiColor.INTERFACE_BG_B) + self.base_panel.setColor(self.getColor(SiColor.INTERFACE_BG_E)) self.base_panel.setColorTo(SiColor.mix(c, b, 0.3)) def setName(self, name: str): diff --git a/siui/components/widgets/navigation_bar.py b/siui/components/widgets/navigation_bar.py index 55cdf95..ac41c68 100644 --- a/siui/components/widgets/navigation_bar.py +++ b/siui/components/widgets/navigation_bar.py @@ -53,7 +53,7 @@ def on_clicked(): button = SiSimpleButton(self) button.attachment().setText(name) - button.colorGroup().assign(SiColor.TEXT_B, self.colorGroup().fromToken(SiColor.BUTTON_TEXT_BUTTON_IDLE)) + button.colorGroup().assign(SiColor.TEXT_B, self.getColor(SiColor.BUTTON_TEXT_BUTTON_IDLE)) button.adjustSize() button.clicked.connect(on_clicked) @@ -66,10 +66,10 @@ def _on_button_clicked(self, index): def _on_index_changed(self, index): for btn in self.item_dict.values(): - btn.attachment().setTextColor(self.colorGroup().fromToken(SiColor.BUTTON_TEXT_BUTTON_IDLE)) + btn.attachment().setTextColor(self.getColor(SiColor.BUTTON_TEXT_BUTTON_IDLE)) button = self.item_dict[str(index)] - button.attachment().setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + button.attachment().setTextColor(self.getColor(SiColor.TEXT_B)) width = int(button.width() * (1-0.618)*2) x = button.x() + (button.width() - width) // 2 @@ -79,8 +79,8 @@ def _on_index_changed(self, index): def reloadStyleSheet(self): super().reloadStyleSheet() - self.indicator_track.setColor(self.colorGroup().fromToken(SiColor.THEME)) - self.indicator.setColor(self.colorGroup().fromToken(SiColor.THEME)) + self.indicator_track.setColor(self.getColor(SiColor.THEME)) + self.indicator.setColor(self.getColor(SiColor.THEME)) def resizeEvent(self, event): super().resizeEvent(event) @@ -91,7 +91,7 @@ def resizeEvent(self, event): def showEvent(self, a0): super().showEvent(a0) button = self.item_dict[str(self.currentIndex())] - button.attachment().setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + button.attachment().setTextColor(self.getColor(SiColor.TEXT_B)) class SiNavigationBarV(ABCSiNavigationBar): @@ -143,7 +143,7 @@ def on_clicked(): button = SiSimpleButton(self) button.attachment().setText(name) - button.colorGroup().assign(SiColor.TEXT_B, self.colorGroup().fromToken(SiColor.BUTTON_TEXT_BUTTON_IDLE)) + button.colorGroup().assign(SiColor.TEXT_B, self.getColor(SiColor.BUTTON_TEXT_BUTTON_IDLE)) button.adjustSize() button.clicked.connect(on_clicked) @@ -156,10 +156,10 @@ def _on_button_clicked(self, index): def _on_index_changed(self, index): for btn in self.item_dict.values(): - btn.attachment().setTextColor(self.colorGroup().fromToken(SiColor.BUTTON_TEXT_BUTTON_IDLE)) + btn.attachment().setTextColor(self.getColor(SiColor.BUTTON_TEXT_BUTTON_IDLE)) button = self.item_dict[str(index)] - button.attachment().setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + button.attachment().setTextColor(self.getColor(SiColor.TEXT_B)) height = int(button.height() * (1-0.618)*2) y = button.y() + (button.height() - height) // 2 @@ -169,8 +169,8 @@ def _on_index_changed(self, index): def reloadStyleSheet(self): super().reloadStyleSheet() - self.indicator_track.setColor(self.colorGroup().fromToken(SiColor.THEME)) - self.indicator.setColor(self.colorGroup().fromToken(SiColor.THEME)) + self.indicator_track.setColor(self.getColor(SiColor.THEME)) + self.indicator.setColor(self.getColor(SiColor.THEME)) def resizeEvent(self, event): super().resizeEvent(event) @@ -181,4 +181,4 @@ def resizeEvent(self, event): def showEvent(self, a0): super().showEvent(a0) button = self.item_dict[str(self.currentIndex())] - button.attachment().setTextColor(self.colorGroup().fromToken(SiColor.TEXT_B)) + button.attachment().setTextColor(self.getColor(SiColor.TEXT_B)) diff --git a/siui/components/widgets/table.py b/siui/components/widgets/table.py index 882485f..a14eb36 100644 --- a/siui/components/widgets/table.py +++ b/siui/components/widgets/table.py @@ -21,7 +21,7 @@ def on_header_created(self, header: SiRow): for name in self.parent().column_names: new_label = SiLabel(self.parent()) new_label.setFont(SiFont.tokenized(GlobalFont.S_BOLD)) - new_label.setTextColor(self.parent().colorGroup().fromToken(SiColor.TEXT_B)) + new_label.setTextColor(self.parent().getColor(SiColor.TEXT_B)) new_label.setText(name) new_label.adjustSize() header.container().addWidget(new_label) @@ -64,9 +64,9 @@ def addRow(self, widgets: list = None, data: list = None): super().addRow(widgets, data) if len(self.rows_) % 2 == 0: - color = self.colorGroup().fromToken(SiColor.INTERFACE_BG_C) + color = self.getColor(SiColor.INTERFACE_BG_C) else: - color = self.colorGroup().fromToken(SiColor.INTERFACE_BG_B) + color = self.getColor(SiColor.INTERFACE_BG_B) self.rows_[-1].setFixedStyleSheet("border-radius: 6px") self.rows_[-1].setColor(color) @@ -92,16 +92,16 @@ def reloadStyleSheet(self): super().reloadStyleSheet() self.panel.setStyleSheet( - f"border: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)};" - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_B)};" + f"border: 1px solid {self.getColor(SiColor.INTERFACE_BG_D)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_B)};" ) self.header_panel.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_D)};" ) self.indicator_track.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.THEME)}" + f"background-color: {self.getColor(SiColor.THEME)}" ) def resizeEvent(self, event): diff --git a/siui/components/widgets/timeline.py b/siui/components/widgets/timeline.py index 70abeb4..c09173b 100644 --- a/siui/components/widgets/timeline.py +++ b/siui/components/widgets/timeline.py @@ -17,8 +17,8 @@ def __init__(self, *args, **kwargs): self.anchor.setFixedSize(24, 24) self.anchor.setFixedStyleSheet("border-radius: 12px") self.anchor.setStyleSheet( - f"border: 4px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_E)};" + f"border: 4px solid {self.getColor(SiColor.INTERFACE_BG_C)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_E)};" ) self.anchor.move(64 + 4, 20) @@ -27,11 +27,11 @@ def __init__(self, *args, **kwargs): self.anchor_dot.setFixedStyleSheet("border-radius: 4px") self.anchor_dot.move(8, 8) self.anchor_dot.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_C)};" ) self.title = SiLabel(self) - # self.title.setTextColor(self.colorGroup().fromToken(SiColor)) + # self.title.setTextColor(self.getColor(SiColor)) self.title.setText("你好世界") self.title.move(0, 0) self.title.adjustSize() @@ -58,7 +58,7 @@ def __init__(self, *args, **kwargs): self.track = SiLabel(self) self.track.setFixedStyleSheet("border-radius: 2px") - self.track.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_E)) + self.track.setColor(self.getColor(SiColor.INTERFACE_BG_E)) self.track.setFixedWidth(4) self.track.resize(4, 100) self.track.move(14 + 64, 0) diff --git a/siui/templates/application/components/dialog/modal.py b/siui/templates/application/components/dialog/modal.py index 3b46797..fe8a055 100644 --- a/siui/templates/application/components/dialog/modal.py +++ b/siui/templates/application/components/dialog/modal.py @@ -17,7 +17,7 @@ def __init__(self, *args, **kwargs): self.theme_label = SiLabel(self) self.theme_label.setFixedStyleSheet("border-radius: 8px") - self.theme_label.setColor(self.colorGroup().fromToken(SiColor.THEME)) + self.theme_label.setColor(self.getColor(SiColor.THEME)) self.body_content_label = SiLabel(self) self.body_content_label.setObjectName("body_content_label") @@ -47,19 +47,19 @@ def buttonContainer(self): def reloadStyleSheet(self): super().reloadStyleSheet() - self.theme_label.setColor(self.colorGroup().fromToken(SiColor.THEME)) + self.theme_label.setColor(self.getColor(SiColor.THEME)) self.body_content_label.setStyleSheet( "#body_content_label {" " border-radius: 8px;" - f" background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_B)};" - f" border: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" + f" background-color: {self.getColor(SiColor.INTERFACE_BG_B)};" + f" border: 1px solid {self.getColor(SiColor.INTERFACE_BG_C)};" "}" ) self.body_button_label.setStyleSheet( "#body_button_label {" " border-radius: 8px;" - f" background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" - f" border: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" + f" background-color: {self.getColor(SiColor.INTERFACE_BG_C)};" + f" border: 1px solid {self.getColor(SiColor.INTERFACE_BG_C)};" "}" ) diff --git a/siui/templates/application/components/layer/layer.py b/siui/templates/application/components/layer/layer.py index 445ef3d..ba5fd3e 100644 --- a/siui/templates/application/components/layer/layer.py +++ b/siui/templates/application/components/layer/layer.py @@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs): self.close_on_dim_clicked = True self.dim_ = SiLabelHasClickedSignal(self) - self.dim_.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.LAYER_DIM), 0.0)) + self.dim_.setColor(SiColor.trans(self.getColor(SiColor.LAYER_DIM), 0.0)) self.dim_.clicked.connect(self.on_dim_layer_clicked) def setCloseOnDimClicked(self, on): @@ -46,15 +46,15 @@ def showLayer(self): def showDimMask(self, ani=True): if ani is True: - self.dim_.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.LAYER_DIM), 1.0)) + self.dim_.setColorTo(SiColor.trans(self.getColor(SiColor.LAYER_DIM), 1.0)) else: - self.dim_.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.LAYER_DIM), 1.0)) + self.dim_.setColor(SiColor.trans(self.getColor(SiColor.LAYER_DIM), 1.0)) def hideDimMask(self, ani=True): if ani is True: - self.dim_.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.LAYER_DIM), 0.0)) + self.dim_.setColorTo(SiColor.trans(self.getColor(SiColor.LAYER_DIM), 0.0)) else: - self.dim_.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.LAYER_DIM), 0.0)) + self.dim_.setColor(SiColor.trans(self.getColor(SiColor.LAYER_DIM), 0.0)) def resizeEvent(self, event): super().resizeEvent(event) diff --git a/siui/templates/application/components/layer/layer_left_global_drawer/layer_left_global_drawer.py b/siui/templates/application/components/layer/layer_left_global_drawer/layer_left_global_drawer.py index efa1efb..3ad4e43 100644 --- a/siui/templates/application/components/layer/layer_left_global_drawer/layer_left_global_drawer.py +++ b/siui/templates/application/components/layer/layer_left_global_drawer/layer_left_global_drawer.py @@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs): group.addTitle("全局性") self.text_label = SiLabel(self) - self.text_label.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_D)) + self.text_label.setTextColor(self.getColor(SiColor.TEXT_D)) self.text_label.setWordWrap(True) self.text_label.setText("这里是全局抽屉，无论在何种情况下，该抽屉被打开时都会令界面发生侧移，保证抽屉正常展开\n\n" "不同于其他页面，全局抽屉推荐为唯一的，全局抽屉中的控件推荐为静态的") @@ -37,7 +37,7 @@ def __init__(self, *args, **kwargs): group.addTitle("声音") self.label_output_device = SiLabel(self) - self.label_output_device.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_C)) + self.label_output_device.setTextColor(self.getColor(SiColor.TEXT_C)) self.label_output_device.setText("输出设备") self.demo_output_device = SiComboBox(self) @@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs): self.demo_output_device.menu().setIndex(0) self.label_slider_1 = SiLabel(self) - self.label_slider_1.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_C)) + self.label_slider_1.setTextColor(self.getColor(SiColor.TEXT_C)) self.label_slider_1.setText("总音量") self.demo_slider_1 = SiSliderH(self) @@ -59,7 +59,7 @@ def __init__(self, *args, **kwargs): self.demo_slider_1.setValue(80, move_to=False) self.label_slider_2 = SiLabel(self) - self.label_slider_2.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_C)) + self.label_slider_2.setTextColor(self.getColor(SiColor.TEXT_C)) self.label_slider_2.setText("音乐音量") self.demo_slider_2 = SiSliderH(self) @@ -69,7 +69,7 @@ def __init__(self, *args, **kwargs): self.demo_slider_2.setValue(100, move_to=False) self.label_slider_3 = SiLabel(self) - self.label_slider_3.setTextColor(self.colorGroup().fromToken(SiColor.TEXT_C)) + self.label_slider_3.setTextColor(self.getColor(SiColor.TEXT_C)) self.label_slider_3.setText("音效音量") self.demo_slider_3 = SiSliderH(self) @@ -104,8 +104,8 @@ def setOpened(self, state): def reloadStyleSheet(self): super().reloadStyleSheet() self.drawer_panel.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)};" - f"border-right: 1px solid {self.colorGroup().fromToken(SiColor.INTERFACE_BG_D)}" + f"background-color: {self.getColor(SiColor.INTERFACE_BG_C)};" + f"border-right: 1px solid {self.getColor(SiColor.INTERFACE_BG_D)}" ) def showLayer(self): diff --git a/siui/templates/application/components/layer/layer_main/layer_main.py b/siui/templates/application/components/layer/layer_main/layer_main.py index 03398a2..dc95a53 100644 --- a/siui/templates/application/components/layer/layer_main/layer_main.py +++ b/siui/templates/application/components/layer/layer_main/layer_main.py @@ -57,10 +57,10 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): self.background_label.setStyleSheet("background-color: {}; border: 1px solid {};".format( - self.colorGroup().fromToken(SiColor.INTERFACE_BG_A), - self.colorGroup().fromToken(SiColor.INTERFACE_BG_B)) + self.getColor(SiColor.INTERFACE_BG_A), + self.getColor(SiColor.INTERFACE_BG_B)) ) - self.app_title.setStyleSheet("color: {}".format(self.colorGroup().fromToken(SiColor.TEXT_B))) + self.app_title.setStyleSheet("color: {}".format(self.getColor(SiColor.TEXT_B))) def setTitle(self, title): self.app_title.setText(title) diff --git a/siui/templates/application/components/layer/layer_right_message_sidebar/layer_right_message_sidebar.py b/siui/templates/application/components/layer/layer_right_message_sidebar/layer_right_message_sidebar.py index d072f6a..1e891c3 100644 --- a/siui/templates/application/components/layer/layer_right_message_sidebar/layer_right_message_sidebar.py +++ b/siui/templates/application/components/layer/layer_right_message_sidebar/layer_right_message_sidebar.py @@ -54,7 +54,7 @@ def send(self, "padding-bottom: 16px;" "padding-left: 12px;" "padding-right: 12px;" - "color: {}".format(self.colorGroup().fromToken(SiColor.TEXT_D)) + "color: {}".format(self.getColor(SiColor.TEXT_D)) ) label.setText(text) new_message_box.content().container().addWidget(label) @@ -70,7 +70,7 @@ def send(self, "padding-bottom: 1px;" "padding-left: 12px;" "padding-right: 12px;" - "color: {}".format(self.colorGroup().fromToken(SiColor.TEXT_B)) + "color: {}".format(self.getColor(SiColor.TEXT_B)) ) title_label.setText(title) @@ -84,7 +84,7 @@ def send(self, "padding-bottom: 16px;" "padding-left: 12px;" "padding-right: 12px;" - "color: {}".format(self.colorGroup().fromToken(SiColor.TEXT_D)) + "color: {}".format(self.getColor(SiColor.TEXT_D)) ) description_label.setText(text) diff --git a/siui/templates/application/components/layer/layer_right_message_sidebar/messagebox.py b/siui/templates/application/components/layer/layer_right_message_sidebar/messagebox.py index 0de440c..c7de115 100644 --- a/siui/templates/application/components/layer/layer_right_message_sidebar/messagebox.py +++ b/siui/templates/application/components/layer/layer_right_message_sidebar/messagebox.py @@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs): self.flash_layer = SiLabel(self) self.flash_layer.setAttribute(Qt.WA_TransparentForMouseEvents) self.flash_layer.setFixedStyleSheet("border-radius: 6px") - self.flash_layer.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0)) + self.flash_layer.setColor(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0)) self.flash_layer.animationGroup().fromToken("color").setFactor(1/8) self.flash_layer.animationGroup().fromToken("color").setBias(0.001) @@ -55,13 +55,13 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): super().reloadStyleSheet() - self.background.setColor(self.colorGroup().fromToken(SiColor.SIDE_MSG_THEME_WARNING)) - self.panel.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + self.background.setColor(self.getColor(SiColor.SIDE_MSG_THEME_WARNING)) + self.panel.setColor(self.getColor(SiColor.INTERFACE_BG_C)) self.close_button.reloadStyleSheet() def setMessageType(self, index): self.msg_type = index - self.background.setColor(self.colorGroup().fromToken(self.msg_color_tokens[self.msg_type])) + self.background.setColor(self.getColor(self.msg_color_tokens[self.msg_type])) def container(self): return self.container_ @@ -70,8 +70,8 @@ def themeIcon(self): return self.theme_icon def flash(self): - self.flash_layer.setColor(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH)) - self.flash_layer.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0)) + self.flash_layer.setColor(self.getColor(SiColor.SIDE_MSG_FLASH)) + self.flash_layer.setColorTo(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0)) def adjustSize(self): self.container_.adjustSize() @@ -101,12 +101,12 @@ def resizeEvent(self, event): def enterEvent(self, a0): super().enterEvent(a0) - self.flash_layer.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0.07)) + self.flash_layer.setColorTo(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0.07)) self.parent().fold_timer.stop() def leaveEvent(self, a0): super().leaveEvent(a0) - self.flash_layer.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0)) + self.flash_layer.setColorTo(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0)) self.parent().fold_timer.start() def mouseReleaseEvent(self, a0): diff --git a/siui/templates/application/components/message/box.py b/siui/templates/application/components/message/box.py index 0de440c..c7de115 100644 --- a/siui/templates/application/components/message/box.py +++ b/siui/templates/application/components/message/box.py @@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs): self.flash_layer = SiLabel(self) self.flash_layer.setAttribute(Qt.WA_TransparentForMouseEvents) self.flash_layer.setFixedStyleSheet("border-radius: 6px") - self.flash_layer.setColor(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0)) + self.flash_layer.setColor(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0)) self.flash_layer.animationGroup().fromToken("color").setFactor(1/8) self.flash_layer.animationGroup().fromToken("color").setBias(0.001) @@ -55,13 +55,13 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): super().reloadStyleSheet() - self.background.setColor(self.colorGroup().fromToken(SiColor.SIDE_MSG_THEME_WARNING)) - self.panel.setColor(self.colorGroup().fromToken(SiColor.INTERFACE_BG_C)) + self.background.setColor(self.getColor(SiColor.SIDE_MSG_THEME_WARNING)) + self.panel.setColor(self.getColor(SiColor.INTERFACE_BG_C)) self.close_button.reloadStyleSheet() def setMessageType(self, index): self.msg_type = index - self.background.setColor(self.colorGroup().fromToken(self.msg_color_tokens[self.msg_type])) + self.background.setColor(self.getColor(self.msg_color_tokens[self.msg_type])) def container(self): return self.container_ @@ -70,8 +70,8 @@ def themeIcon(self): return self.theme_icon def flash(self): - self.flash_layer.setColor(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH)) - self.flash_layer.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0)) + self.flash_layer.setColor(self.getColor(SiColor.SIDE_MSG_FLASH)) + self.flash_layer.setColorTo(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0)) def adjustSize(self): self.container_.adjustSize() @@ -101,12 +101,12 @@ def resizeEvent(self, event): def enterEvent(self, a0): super().enterEvent(a0) - self.flash_layer.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0.07)) + self.flash_layer.setColorTo(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0.07)) self.parent().fold_timer.stop() def leaveEvent(self, a0): super().leaveEvent(a0) - self.flash_layer.setColorTo(SiColor.trans(self.colorGroup().fromToken(SiColor.SIDE_MSG_FLASH), 0)) + self.flash_layer.setColorTo(SiColor.trans(self.getColor(SiColor.SIDE_MSG_FLASH), 0)) self.parent().fold_timer.start() def mouseReleaseEvent(self, a0): diff --git a/siui/templates/application/components/message/sidebar.py b/siui/templates/application/components/message/sidebar.py index 4897537..43146b8 100644 --- a/siui/templates/application/components/message/sidebar.py +++ b/siui/templates/application/components/message/sidebar.py @@ -55,7 +55,7 @@ def send(self, "padding-bottom: 16px;" "padding-left: 12px;" "padding-right: 12px;" - f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}" + f"color: {self.getColor(SiColor.TEXT_D)}" ) label.setText(text) new_message_box.content().container().addWidget(label) @@ -71,7 +71,7 @@ def send(self, "padding-bottom: 1px;" "padding-left: 12px;" "padding-right: 12px;" - f"color: {self.colorGroup().fromToken(SiColor.TEXT_B)}" + f"color: {self.getColor(SiColor.TEXT_B)}" ) title_label.setText(title) @@ -85,7 +85,7 @@ def send(self, "padding-bottom: 16px;" "padding-left: 12px;" "padding-right: 12px;" - f"color: {self.colorGroup().fromToken(SiColor.TEXT_D)}" + f"color: {self.getColor(SiColor.TEXT_D)}" ) description_label.setText(text) diff --git a/siui/templates/application/components/page_view/page_view.py b/siui/templates/application/components/page_view/page_view.py index a7cf187..7e554e2 100644 --- a/siui/templates/application/components/page_view/page_view.py +++ b/siui/templates/application/components/page_view/page_view.py @@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs): def reloadStyleSheet(self): super().reloadStyleSheet() self.active_indicator.setStyleSheet( - f"background-color: {self.colorGroup().fromToken(SiColor.THEME)}" + f"background-color: {self.getColor(SiColor.THEME)}" ) def setActive(self, state):