Merge pull request #280 from ChinaIceF/refactor

Refactor

Author: ChinaIceF

examples/Gallery for siui/components/page_refactor/page_refactor.py

@@ -20,7 +20,7 @@
 )
 from siui.components.chart import SiTrendChart
 from siui.components.container import SiDenseContainer, SiTriSectionPanelCard, SiTriSectionRowCard
-from siui.components.editbox import SiCapsuleEdit, SiDoubleSpinBox, SiLineEdit, SiSpinBox
+from siui.components.editbox import SiLabeledLineEdit, SiDoubleSpinBox, SiCapsuleLineEdit, SiSpinBox
 from siui.components.label import SiLinearIndicator, SiLinearPartitionIndicator
 from siui.components.page import SiPage
 from siui.components.progress_bar_ import SiProgressBarRefactor
@@ -570,17 +570,17 @@ def test_func_2():
             self.editbox = OptionCardPlaneForWidgetDemos(self)
             self.editbox.setTitle("单行文本编辑框")
 
-            self.linear_edit_box = SiLineEdit(self)
+            self.linear_edit_box = SiCapsuleLineEdit(self)
             self.linear_edit_box.resize(560, 36)
             self.linear_edit_box.setTitle("Repository Name")
             self.linear_edit_box.setText("PyQt-SiliconUI")
 
-            self.linear_edit_box2 = SiLineEdit(self)
+            self.linear_edit_box2 = SiCapsuleLineEdit(self)
             self.linear_edit_box2.resize(560, 36)
             self.linear_edit_box2.setTitle("Owner")
             self.linear_edit_box2.setText("ChinaIceF")
 
-            self.linear_edit_box3 = SiLineEdit(self)
+            self.linear_edit_box3 = SiCapsuleLineEdit(self)
             self.linear_edit_box3.resize(560, 36)
             self.linear_edit_box3.setTitle("Description")
             self.linear_edit_box3.setText("A powerful and artistic UI library based on PyQt5")
@@ -602,7 +602,7 @@ def test_func_2():
             self.capsule_editbox = OptionCardPlaneForWidgetDemos(self)
             self.capsule_editbox.setTitle("小型文本编辑框")
 
-            self.capsule_edit = SiCapsuleEdit(self)
+            self.capsule_edit = SiLabeledLineEdit(self)
             self.capsule_edit.setTitle("用户名")
             self.capsule_edit.setPlaceholderText("您的用户名...")
             self.capsule_edit.resize(170, 58)

examples/Gallery for siui/components/page_widgets/page_widgets.py

@@ -28,7 +28,7 @@
 )
 from siui.components.chart import SiTrendChart
 from siui.components.combobox import SiComboBox
-from siui.components.editbox import SiLineEdit
+from siui.components.editbox import SiCapsuleLineEdit
 from siui.components.label import HyperRoundBorderTest
 from siui.components.menu import SiMenu
 from siui.components.page import SiPage
@@ -330,11 +330,11 @@ def __init__(self, *args, **kwargs):
             # self.trend_chart.adjustViewRect()
             # print(self.trend_chart.viewRect())
 
-            self.linear_edit_box = SiLineEdit(self)
+            self.linear_edit_box = SiCapsuleLineEdit(self)
             self.linear_edit_box.resize(560, 36)
             self.linear_edit_box.setTitle("项目名称")
 
-            self.linear_edit_box2 = SiLineEdit(self)
+            self.linear_edit_box2 = SiCapsuleLineEdit(self)
             self.linear_edit_box2.resize(560, 36)
             self.linear_edit_box2.setTitle("项目所属人")
 

siui/components/button.py

@@ -39,7 +39,7 @@
 
 from siui.core import GlobalFont, SiGlobal, createPainter
 from siui.core.animation import SiExpAnimationRefactor
-from siui.core.event_filter import ButtonScaleOnPressedManager, TooltipManager
+from siui.core.event_filter import ScaleOnPressEventFilter, WidgetTooltipRedirectEventFilter
 from siui.core.globals import toolTipWindow
 from siui.core.painter import getGaussianLinearGradient
 from siui.gui import SiFont
@@ -1744,11 +1744,11 @@ def _initStyle(self) -> None:
         self._description_label.setWordWrap(True)
 
     def _initToolTipManager(self) -> None:
-        self._tooltip_manager = TooltipManager(toolTipWindow())
+        self._tooltip_manager = WidgetTooltipRedirectEventFilter(toolTipWindow())
         self.installEventFilter(self._tooltip_manager)
 
     def _initScaleManager(self) -> None:
-        self._scale_manager = ButtonScaleOnPressedManager(self)
+        self._scale_manager = ScaleOnPressEventFilter(self)
         self._scale_manager.setMinScaleFactor(0.95)
         self.installEventFilter(self._scale_manager)
 
@@ -2049,11 +2049,11 @@ def __init__(self, parent: T_WidgetParent = None) -> None:
         self.toggled.connect(self._onToggled)
 
     def _initToolTipManager(self) -> None:
-        self._tooltip_manager = TooltipManager(toolTipWindow())
+        self._tooltip_manager = WidgetTooltipRedirectEventFilter(toolTipWindow())
         self.installEventFilter(self._tooltip_manager)
 
     def _initScaleManager(self) -> None:
-        self._scale_manager = ButtonScaleOnPressedManager(self)
+        self._scale_manager = ScaleOnPressEventFilter(self)
         self._scale_manager.setMinScaleFactor(0.95)
         self.installEventFilter(self._scale_manager)
 

siui/components/editbox.py

@@ -43,7 +43,7 @@ class LineEditStyleData:
     text_indicator_color_error: QColor = QColor("#d36764")
 
 
-class SiLineEdit(QLineEdit):
+class SiCapsuleLineEdit(QLineEdit):
     class Property:
         TitleColor = "titleColor"
         TextIndicatorColor = "textIndicatorColor"
@@ -538,7 +538,7 @@ def _onCursorPositionChanged(self, old, new) -> None:
 
 
 
-class SiCapsuleEdit(QLineEdit):
+class SiLabeledLineEdit(QLineEdit):
     class Property:
         TitleColor = "titleColor"
         TextIndicatorColor = "textIndicatorColor"
@@ -735,7 +735,7 @@ def focusOutEvent(self, a0):
         self._onTextEdited("")
 
 
-class SiSpinBox(SiCapsuleEdit):
+class SiSpinBox(SiLabeledLineEdit):
     def __init__(self, parent: T_WidgetParent = None, title: str = "Untitled Edit Box") -> None:
         super().__init__(parent)