Skip to content

Commit 73b1301

Browse files
892768447892768447
committed
调整目录结构
1 parent 4a7e64a commit 73b1301

22 files changed

+59
-56
lines changed

‎.settings/org.eclipse.core.resources.prefs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
eclipse.preferences.version=1
2-
encoding//CColorPicker/CColorControl.py=utf-8
3-
encoding//CColorPicker/CColorInfos.py=utf-8
4-
encoding//CColorPicker/CColorItems.py=utf-8
5-
encoding//CColorPicker/CColorPalettes.py=utf-8
6-
encoding//CColorPicker/CColorPanel.py=utf-8
7-
encoding//CColorPicker/CColorPicker.py=utf-8
8-
encoding//CColorPicker/CColorSlider.py=utf-8
9-
encoding//CColorPicker/CColorStraw.py=utf-8
10-
encoding//CFramelessWidget/CFramelessWidget.py=utf-8
11-
encoding//CTitleBar/CTitleBar.py=utf-8
2+
encoding//CustomWidgets/CColorPicker/CColorControl.py=utf-8
3+
encoding//CustomWidgets/CColorPicker/CColorInfos.py=utf-8
4+
encoding//CustomWidgets/CColorPicker/CColorItems.py=utf-8
5+
encoding//CustomWidgets/CColorPicker/CColorPalettes.py=utf-8
6+
encoding//CustomWidgets/CColorPicker/CColorPanel.py=utf-8
7+
encoding//CustomWidgets/CColorPicker/CColorPicker.py=utf-8
8+
encoding//CustomWidgets/CColorPicker/CColorSlider.py=utf-8
9+
encoding//CustomWidgets/CColorPicker/CColorStraw.py=utf-8
10+
encoding//CustomWidgets/CFramelessWidget.py=utf-8
11+
encoding//CustomWidgets/CTitleBar.py=utf-8
1212
encoding/TestCColorPicker.py=utf-8
1313
encoding/TestCFramelessWidget.py=utf-8
1414
encoding/TestCTitleBar.py=utf-8

‎CFramelessWidget/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎CTitleBar/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎CTitleBar/__init__.py

Whitespace-only changes.

‎CColorPicker/CColorControl.py renamed to ‎CustomWidgets/CColorPicker/CColorControl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/PyQt5
88
@email: [email protected]
9-
@file: CColorPicker.CColorControl
9+
@file: CustomWidgets.CColorPicker.CColorControl
1010
@description:
1111
"""
1212
from PyQt5.QtCore import Qt, pyqtSignal

‎CColorPicker/CColorInfos.py renamed to ‎CustomWidgets/CColorPicker/CColorInfos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/PyQt5
88
@email: [email protected]
9-
@file: CColorPicker.CColorInfos
9+
@file: CustomWidgets.CColorPicker.CColorInfos
1010
@description:
1111
"""
1212
from PyQt5.QtCore import QSize, Qt, QRegExp, pyqtSignal

‎CColorPicker/CColorItems.py renamed to ‎CustomWidgets/CColorPicker/CColorItems.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/PyQt5
88
@email: [email protected]
9-
@file: CColorPicker.CColorItems
9+
@file: CustomWidgets.CColorPicker.CColorItems
1010
@description: 小方块列表
1111
"""
1212
from PyQt5.QtCore import Qt, QSize

‎CColorPicker/CColorPalettes.py renamed to ‎CustomWidgets/CColorPicker/CColorPalettes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/892768447
88
@email: [email protected]
9-
@file: CColorPicker.CColorPalettes
9+
@file: CustomWidgets.CColorPicker.CColorPalettes
1010
@description:
1111
"""
1212
from PyQt5.QtCore import QSettings, pyqtSignal
1313
from PyQt5.QtGui import QColor
1414
from PyQt5.QtWidgets import QTabWidget
1515

16-
from CColorPicker.CColorItems import CColorItems
16+
from CustomWidgets.CColorPicker.CColorItems import CColorItems
1717

1818

1919
__Author__ = 'Irony'

‎CColorPicker/CColorPanel.py renamed to ‎CustomWidgets/CColorPicker/CColorPanel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/PyQt5
88
@email: [email protected]
9-
@file: CColorPicker.CColorPanel
9+
@file: CustomWidgets.CColorPicker.CColorPanel
1010
@description: 饱和度面板
1111
"""
1212
from PyQt5.QtCore import Qt, QPoint, pyqtSignal

‎CColorPicker/CColorPicker.py renamed to ‎CustomWidgets/CColorPicker/CColorPicker.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/892768447
88
@email: [email protected]
9-
@file: CColorPicker.CColorPicker
9+
@file: CustomWidgets.CColorPicker.CColorPicker
1010
@description:
1111
"""
1212
from PyQt5.QtCore import Qt
@@ -15,12 +15,12 @@
1515
QGraphicsDropShadowEffect, QSpacerItem, QSizePolicy,\
1616
QHBoxLayout, QPushButton
1717

18-
from CColorPicker.CColorControl import CColorControl
19-
from CColorPicker.CColorInfos import CColorInfos
20-
from CColorPicker.CColorPalettes import CColorPalettes
21-
from CColorPicker.CColorPanel import CColorPanel
22-
from CColorPicker.CColorSlider import CColorSlider
23-
from CColorPicker.CColorStraw import CColorStraw
18+
from CustomWidgets.CColorPicker.CColorControl import CColorControl
19+
from CustomWidgets.CColorPicker.CColorInfos import CColorInfos
20+
from CustomWidgets.CColorPicker.CColorPalettes import CColorPalettes
21+
from CustomWidgets.CColorPicker.CColorPanel import CColorPanel
22+
from CustomWidgets.CColorPicker.CColorSlider import CColorSlider
23+
from CustomWidgets.CColorPicker.CColorStraw import CColorStraw
2424

2525

2626
__Author__ = "Irony"

‎CColorPicker/CColorSlider.py renamed to ‎CustomWidgets/CColorPicker/CColorSlider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/892768447
88
@email: [email protected]
9-
@file: CColorPicker.CColorSlider
9+
@file: CustomWidgets.CColorPicker.CColorSlider
1010
@description: 颜色滑动条
1111
"""
1212
from PyQt5.QtCore import Qt, pyqtSignal

‎CColorPicker/CColorStraw.py renamed to ‎CustomWidgets/CColorPicker/CColorStraw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/892768447
88
@email: [email protected]
9-
@file: CColorPicker.CColorStraw
9+
@file: CustomWidgets.CColorPicker.CColorStraw
1010
@description: 吸管
1111
"""
1212
from PyQt5.QtCore import QByteArray, Qt, QRectF, QLineF, pyqtSignal

‎CColorPicker/README.md renamed to ‎CustomWidgets/CColorPicker/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# CColorPicker
2-
3-
[使用方法](/TestCColorPicker.py)
4-
5-
```python
6-
from CColorPicker.CColorPicker import CColorPicker
7-
8-
ret, color = CColorPicker.getColor()
9-
if ret == CColorPicker.Accepted:
10-
print(color.name())
11-
```
12-
1+
# CColorPicker
2+
3+
[使用方法](/TestCColorPicker.py)
4+
5+
```python
6+
from CColorPicker.CColorPicker import CColorPicker
7+
8+
ret, color = CColorPicker.getColor()
9+
if ret == CColorPicker.Accepted:
10+
print(color.name())
11+
```
12+
1313
![CColorPicker](/ScreenShot/CColorPicker.gif)

‎CColorPicker/__init__.py renamed to ‎CustomWidgets/CColorPicker/__init__.py

File renamed without changes.

‎CFramelessWidget/CFramelessWidget.py renamed to ‎CustomWidgets/CFramelessWidget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/892768447
88
@email: [email protected]
9-
@file: CFramelessBase.CFramelessBase
9+
@file: CustomWidgets.CFramelessBase
1010
@description: 无边框窗口
1111
"""
1212
from PyQt5.QtCore import Qt

‎CTitleBar/CTitleBar.py renamed to ‎CustomWidgets/CTitleBar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@author: Irony
77
@site: https://pyqt5.com https://github.com/892768447
88
@email: [email protected]
9-
@file: CTitleBar.CTitleBar
9+
@file: CustomWidgets.CTitleBar
1010
@description: 自定义标题栏
1111
"""
1212

‎CustomWidgets/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Components - 组件
2+
3+
## CTitleBar
4+
- [使用方法](../TestCTitleBar.py)
5+
- ![CTitleBar](../ScreenShot/CTitleBar.gif)
6+
7+
## CFramelessWidget
8+
- [使用方法](../TestCFramelessWidget.py)
9+
- ![CFramelessWidget](../ScreenShot/CFramelessWidget.gif)
10+
11+
## CColorPicker
12+
- [使用方法](../TestCColorPicker.py)
13+
- ![CFramelessWidget](../ScreenShot/CColorPicker.gif)

‎CFramelessWidget/__init__.py renamed to ‎CustomWidgets/__init__.py

File renamed without changes.

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
PyQt Custom Widgets - PyQt 自定义控件
66

77
# 目录
8-
- [CColorPicker - 颜色选择对话框](CColorPicker)
9-
- [CTitleBar - 自定义标题栏](CTitleBar)
10-
- [CTitleBar - 无边框窗口](CFramelessWidget)
8+
- [CTitleBar　　　　　自定义标题栏](CustomWidgets/#CTitleBar)
9+
- [CTitleBar　　　　　无边框窗口](CustomWidgets/#CFramelessWidget)
10+
- [CColorPicker　　 　颜色选择对话框](CustomWidgets/#CColorPicker)
1111

1212
## QQ群
1313

‎TestCColorPicker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from PyQt5.QtWidgets import QApplication, QLabel, QDialog, QWidget, QVBoxLayout,\
2020
QPushButton
2121

22-
from CColorPicker.CColorPicker import CColorPicker
22+
from CustomWidgets.CColorPicker.CColorPicker import CColorPicker
2323

2424

2525
sys.excepthook = cgitb.enable(1, None, 5, '')

‎TestCFramelessWidget.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
from PyQt5.QtCore import Qt
1313
from PyQt5.QtWidgets import QVBoxLayout, QWidget, QLineEdit
1414

15-
from CFramelessWidget.CFramelessWidget import CFramelessWidget, CFramelessDialog
16-
from CTitleBar.CTitleBar import CTitleBar
15+
from CustomWidgets.CFramelessWidget import CFramelessWidget, CFramelessDialog
16+
from CustomWidgets.CTitleBar import CTitleBar
1717

1818

1919
__Author__ = 'Irony'

‎TestCTitleBar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from PyQt5.QtCore import Qt
1313
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QDialog
1414

15-
from CTitleBar.CTitleBar import CTitleBar
15+
from CustomWidgets.CTitleBar import CTitleBar
1616

1717

1818
__Author__ = 'Irony'

0 commit comments

Comments
 (0)