From 9eab7ffc6389b4d2b21de25847c72c3231d88865 Mon Sep 17 00:00:00 2001
From: 283375 <bilibili283375@163.com>
Date: Tue, 15 Aug 2023 16:02:27 +0800
Subject: [PATCH] fix: avoid circular import

---
 ui/designer/settings/settingsDefault.ui    | 2 +-
 ui/designer/settings/settingsDefault_ui.py | 4 ++--
 ui/designer/tabs/tabOcr.ui                 | 6 +++---
 ui/designer/tabs/tabOcr_ui.py              | 4 +++-
 ui/implements/components/__init__.py       | 7 -------
 5 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 ui/implements/components/__init__.py

diff --git a/ui/designer/settings/settingsDefault.ui b/ui/designer/settings/settingsDefault.ui
index c3f6d37..ca6355f 100644
--- a/ui/designer/settings/settingsDefault.ui
+++ b/ui/designer/settings/settingsDefault.ui
@@ -160,7 +160,7 @@
   <customwidget>
    <class>DevicesComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui.implements.components</header>
+   <header>ui.implements.components.devicesComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/ui/designer/settings/settingsDefault_ui.py b/ui/designer/settings/settingsDefault_ui.py
index 3fcf8c9..03c5952 100644
--- a/ui/designer/settings/settingsDefault_ui.py
+++ b/ui/designer/settings/settingsDefault_ui.py
@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'settingsDefault.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.0
+## Created by: Qt User Interface Compiler version 6.5.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -18,7 +18,7 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
 from PySide6.QtWidgets import (QApplication, QFormLayout, QHBoxLayout, QLabel,
     QPushButton, QSizePolicy, QSpacerItem, QWidget)
 
-from ui.implements.components import DevicesComboBox
+from ui.implements.components.devicesComboBox import DevicesComboBox
 from ui.implements.components.fileSelector import FileSelector
 
 class Ui_SettingsDefault(object):
diff --git a/ui/designer/tabs/tabOcr.ui b/ui/designer/tabs/tabOcr.ui
index f95df60..82c92ec 100644
--- a/ui/designer/tabs/tabOcr.ui
+++ b/ui/designer/tabs/tabOcr.ui
@@ -159,18 +159,18 @@
   <customwidget>
    <class>FileSelector</class>
    <extends>QWidget</extends>
-   <header>ui.implements.components</header>
+   <header>ui.implements.components.fileSelector</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>DevicesComboBox</class>
    <extends>QComboBox</extends>
-   <header>ui.implements.components</header>
+   <header>ui.implements.components.devicesComboBox</header>
   </customwidget>
   <customwidget>
    <class>OcrQueue</class>
    <extends>QWidget</extends>
-   <header>ui.implements.components</header>
+   <header>ui.implements.components.ocrQueue</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/designer/tabs/tabOcr_ui.py b/ui/designer/tabs/tabOcr_ui.py
index 1ab57b7..a72a97e 100644
--- a/ui/designer/tabs/tabOcr_ui.py
+++ b/ui/designer/tabs/tabOcr_ui.py
@@ -18,7 +18,9 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
 from PySide6.QtWidgets import (QApplication, QGroupBox, QHBoxLayout, QPushButton,
     QSizePolicy, QStackedWidget, QVBoxLayout, QWidget)
 
-from ui.implements.components import (DevicesComboBox, FileSelector, OcrQueue)
+from ui.implements.components.devicesComboBox import DevicesComboBox
+from ui.implements.components.fileSelector import FileSelector
+from ui.implements.components.ocrQueue import OcrQueue
 
 class Ui_TabOcr(object):
     def setupUi(self, TabOcr):
diff --git a/ui/implements/components/__init__.py b/ui/implements/components/__init__.py
deleted file mode 100644
index aa13166..0000000
--- a/ui/implements/components/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from .chartSelector import ChartSelector
-from .devicesComboBox import DevicesComboBox
-from .elidedLabel import ElidedLabel
-from .fileSelector import FileSelector
-from .ratingClassRadioButton import RatingClassRadioButton
-from .scoreEditor import ScoreEditor
-from .ocrQueue import OcrQueue