调整目录结构

892768447 · 892768447 · commit 73b130162df4 · 2019-07-23T14:37:53.000+08:00
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
-encoding//CColorPicker/CColorControl.py=utf-8
-encoding//CColorPicker/CColorInfos.py=utf-8
-encoding//CColorPicker/CColorItems.py=utf-8
-encoding//CColorPicker/CColorPalettes.py=utf-8
-encoding//CColorPicker/CColorPanel.py=utf-8
-encoding//CColorPicker/CColorPicker.py=utf-8
-encoding//CColorPicker/CColorSlider.py=utf-8
-encoding//CColorPicker/CColorStraw.py=utf-8
-encoding//CFramelessWidget/CFramelessWidget.py=utf-8
-encoding//CTitleBar/CTitleBar.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorControl.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorInfos.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorItems.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorPalettes.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorPanel.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorPicker.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorSlider.py=utf-8
+encoding//CustomWidgets/CColorPicker/CColorStraw.py=utf-8
+encoding//CustomWidgets/CFramelessWidget.py=utf-8
+encoding//CustomWidgets/CTitleBar.py=utf-8
 encoding/TestCColorPicker.py=utf-8
 encoding/TestCFramelessWidget.py=utf-8
 encoding/TestCTitleBar.py=utf-8
diff --git a/CFramelessWidget/README.md b/CFramelessWidget/README.md
diff --git a/CTitleBar/README.md b/CTitleBar/README.md
diff --git a/CTitleBar/__init__.py b/CTitleBar/__init__.py
diff --git a/CustomWidgets/CColorPicker/CColorControl.py b/CustomWidgets/CColorPicker/CColorControl.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/PyQt5
 @email: 892768447@qq.com
-@file: CColorPicker.CColorControl
+@file: CustomWidgets.CColorPicker.CColorControl
 @description: 
 """
 from PyQt5.QtCore import Qt, pyqtSignal
diff --git a/CustomWidgets/CColorPicker/CColorInfos.py b/CustomWidgets/CColorPicker/CColorInfos.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/PyQt5
 @email: 892768447@qq.com
-@file: CColorPicker.CColorInfos
+@file: CustomWidgets.CColorPicker.CColorInfos
 @description: 
 """
 from PyQt5.QtCore import QSize, Qt, QRegExp, pyqtSignal
diff --git a/CustomWidgets/CColorPicker/CColorItems.py b/CustomWidgets/CColorPicker/CColorItems.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/PyQt5
 @email: 892768447@qq.com
-@file: CColorPicker.CColorItems
+@file: CustomWidgets.CColorPicker.CColorItems
 @description: 小方块列表
 """
 from PyQt5.QtCore import Qt, QSize
diff --git a/CustomWidgets/CColorPicker/CColorPalettes.py b/CustomWidgets/CColorPicker/CColorPalettes.py
@@ -6,14 +6,14 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
-@file: CColorPicker.CColorPalettes
+@file: CustomWidgets.CColorPicker.CColorPalettes
 @description: 
 """
 from PyQt5.QtCore import QSettings, pyqtSignal
 from PyQt5.QtGui import QColor
 from PyQt5.QtWidgets import QTabWidget
 
-from CColorPicker.CColorItems import CColorItems
+from CustomWidgets.CColorPicker.CColorItems import CColorItems
 
 
 __Author__ = 'Irony'
diff --git a/CustomWidgets/CColorPicker/CColorPanel.py b/CustomWidgets/CColorPicker/CColorPanel.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/PyQt5
 @email: 892768447@qq.com
-@file: CColorPicker.CColorPanel
+@file: CustomWidgets.CColorPicker.CColorPanel
 @description: 饱和度面板
 """
 from PyQt5.QtCore import Qt, QPoint, pyqtSignal
diff --git a/CustomWidgets/CColorPicker/CColorPicker.py b/CustomWidgets/CColorPicker/CColorPicker.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
-@file: CColorPicker.CColorPicker
+@file: CustomWidgets.CColorPicker.CColorPicker
 @description: 
 """
 from PyQt5.QtCore import Qt
@@ -15,12 +15,12 @@
     QGraphicsDropShadowEffect, QSpacerItem, QSizePolicy,\
     QHBoxLayout, QPushButton
 
-from CColorPicker.CColorControl import CColorControl
-from CColorPicker.CColorInfos import CColorInfos
-from CColorPicker.CColorPalettes import CColorPalettes
-from CColorPicker.CColorPanel import CColorPanel
-from CColorPicker.CColorSlider import CColorSlider
-from CColorPicker.CColorStraw import CColorStraw
+from CustomWidgets.CColorPicker.CColorControl import CColorControl
+from CustomWidgets.CColorPicker.CColorInfos import CColorInfos
+from CustomWidgets.CColorPicker.CColorPalettes import CColorPalettes
+from CustomWidgets.CColorPicker.CColorPanel import CColorPanel
+from CustomWidgets.CColorPicker.CColorSlider import CColorSlider
+from CustomWidgets.CColorPicker.CColorStraw import CColorStraw
 
 
 __Author__ = "Irony"
diff --git a/CustomWidgets/CColorPicker/CColorSlider.py b/CustomWidgets/CColorPicker/CColorSlider.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
-@file: CColorPicker.CColorSlider
+@file: CustomWidgets.CColorPicker.CColorSlider
 @description: 颜色滑动条
 """
 from PyQt5.QtCore import Qt, pyqtSignal
diff --git a/CustomWidgets/CColorPicker/CColorStraw.py b/CustomWidgets/CColorPicker/CColorStraw.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
-@file: CColorPicker.CColorStraw
+@file: CustomWidgets.CColorPicker.CColorStraw
 @description: 吸管
 """
 from PyQt5.QtCore import QByteArray, Qt, QRectF, QLineF, pyqtSignal
diff --git a/CustomWidgets/CColorPicker/README.md b/CustomWidgets/CColorPicker/README.md
@@ -1,13 +1,13 @@
-# CColorPicker
-
-[使用方法](/TestCColorPicker.py)
-
-```python
-from CColorPicker.CColorPicker import CColorPicker
-
-ret, color = CColorPicker.getColor()
-if ret == CColorPicker.Accepted:
-    print(color.name())
-```
-
+# CColorPicker
+
+[使用方法](/TestCColorPicker.py)
+
+```python
+from CColorPicker.CColorPicker import CColorPicker
+
+ret, color = CColorPicker.getColor()
+if ret == CColorPicker.Accepted:
+    print(color.name())
+```
+
 ![CColorPicker](/ScreenShot/CColorPicker.gif)
diff --git a/CustomWidgets/CColorPicker/__init__.py b/CustomWidgets/CColorPicker/__init__.py
diff --git a/CustomWidgets/CFramelessWidget.py b/CustomWidgets/CFramelessWidget.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
-@file: CFramelessBase.CFramelessBase
+@file: CustomWidgets.CFramelessBase
 @description: 无边框窗口
 """
 from PyQt5.QtCore import Qt
diff --git a/CustomWidgets/CTitleBar.py b/CustomWidgets/CTitleBar.py
@@ -6,7 +6,7 @@
 @author: Irony
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
-@file: CTitleBar.CTitleBar
+@file: CustomWidgets.CTitleBar
 @description: 自定义标题栏
 """
 
diff --git a/CustomWidgets/README.md b/CustomWidgets/README.md
@@ -0,0 +1,13 @@
+# Components - 组件
+
+## CTitleBar
+ - [使用方法](../TestCTitleBar.py)
+ - ![CTitleBar](../ScreenShot/CTitleBar.gif)
+
+## CFramelessWidget
+ - [使用方法](../TestCFramelessWidget.py)
+ - ![CFramelessWidget](../ScreenShot/CFramelessWidget.gif)
+
+## CColorPicker
+ - [使用方法](../TestCColorPicker.py)
+ - ![CFramelessWidget](../ScreenShot/CColorPicker.gif)
diff --git a/CustomWidgets/__init__.py b/CustomWidgets/__init__.py
diff --git a/README.md b/README.md
@@ -5,9 +5,9 @@
 PyQt Custom Widgets - PyQt 自定义控件
 
 # 目录
- - [CColorPicker - 颜色选择对话框](CColorPicker)
- - [CTitleBar - 自定义标题栏](CTitleBar)
- - [CTitleBar - 无边框窗口](CFramelessWidget)
+ - [CTitleBar　　　　　自定义标题栏](CustomWidgets/#CTitleBar)
+ - [CTitleBar　　　　　无边框窗口](CustomWidgets/#CFramelessWidget)
+ - [CColorPicker　　 　颜色选择对话框](CustomWidgets/#CColorPicker)
 
 ## QQ群
 
diff --git a/TestCColorPicker.py b/TestCColorPicker.py
@@ -19,7 +19,7 @@
 from PyQt5.QtWidgets import QApplication, QLabel, QDialog, QWidget, QVBoxLayout,\
     QPushButton
 
-from CColorPicker.CColorPicker import CColorPicker
+from CustomWidgets.CColorPicker.CColorPicker import CColorPicker
 
 
 sys.excepthook = cgitb.enable(1, None, 5, '')
diff --git a/TestCFramelessWidget.py b/TestCFramelessWidget.py
@@ -12,8 +12,8 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QVBoxLayout, QWidget, QLineEdit
 
-from CFramelessWidget.CFramelessWidget import CFramelessWidget, CFramelessDialog
-from CTitleBar.CTitleBar import CTitleBar
+from CustomWidgets.CFramelessWidget import CFramelessWidget, CFramelessDialog
+from CustomWidgets.CTitleBar import CTitleBar
 
 
 __Author__ = 'Irony'
diff --git a/TestCTitleBar.py b/TestCTitleBar.py
@@ -12,7 +12,7 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QDialog
 
-from CTitleBar.CTitleBar import CTitleBar
+from CustomWidgets.CTitleBar import CTitleBar
 
 
 __Author__ = 'Irony'
