Skip to content

Commit 2c847ce

Browse files
892768447892768447
committed
dev
1 parent 85ca675 commit 2c847ce

38 files changed

+1845
-918
lines changed

Update/Upgrade.json renamed to .Update/Upgrade.json

File renamed without changes.

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
eclipse.preferences.version=1
2-
encoding//Dialogs/DonateDialog.py=utf-8
3-
encoding//Dialogs/ErrorDialog.py=utf-8
4-
encoding//Dialogs/LoginDialog.py=utf-8
5-
encoding//Dialogs/MoveDialog.py=utf-8
6-
encoding//Dialogs/TwinkleDialog.py=utf-8
7-
encoding//Dialogs/UpdateDialog.py=utf-8
82
encoding//Test/CustomCursor.py=utf-8
93
encoding//Test/GenerateLanguage.py=utf-8
104
encoding//Test/RunCode.py=utf-8
115
encoding//Test/SlotsByName.py=utf-8
126
encoding//Test/TestDownProgress.py=utf-8
137
encoding//Test/TestGitTree.py=utf-8
8+
encoding//Test/TestMainwindowStyle.py=utf-8
149
encoding//Test/TestPropertyAnimation.py=utf-8
1510
encoding//Test/TestRotateButton.py=utf-8
1611
encoding//Test/TestRubberBandButton.py=utf-8
1712
encoding//Test/TestSetting.py=utf-8
13+
encoding//Test/TestSkinDialog.py=utf-8
1814
encoding//Test/TestToolTip.py=utf-8
1915
encoding//Test/TestTreeView.py=utf-8
2016
encoding//Test/TestWaterWidget.py=utf-8
@@ -23,9 +19,11 @@ encoding//Test/buildexe/PyQtClient.py=utf-8
2319
encoding//Test/buildexe/setup_win.py=utf-8
2420
encoding//Test/buildzip.py=utf-8
2521
encoding//Test/compilepy.py=utf-8
22+
encoding//UiFiles/Ui_ColourfulWidget.py=utf-8
2623
encoding//UiFiles/Ui_ErrorDialog.py=utf-8
2724
encoding//UiFiles/Ui_LoginDialog.py=utf-8
2825
encoding//UiFiles/Ui_MainWindow.py=utf-8
26+
encoding//UiFiles/Ui_SkinDialog.py=utf-8
2927
encoding//UiFiles/Ui_UpdateDialog.py=utf-8
3028
encoding//Utils/Application.py=utf-8
3129
encoding//Utils/ColorThief.py=utf-8
@@ -34,14 +32,26 @@ encoding//Utils/Constants.py=utf-8
3432
encoding//Utils/GitThread.py=utf-8
3533
encoding//Utils/NetworkAccessManager.py=utf-8
3634
encoding//Utils/SortFilterModel.py=utf-8
35+
encoding//Utils/TestColourfulWidget.py=utf-8
3736
encoding//Utils/ThemeManager.py=utf-8
37+
encoding//Utils/ThemeThread.py=utf-8
3838
encoding//Utils/Version.py=utf-8
39+
encoding//Widgets/Buttons/ProgressButton.py=utf-8
40+
encoding//Widgets/Buttons/RotateButton.py=utf-8
41+
encoding//Widgets/Buttons/RubberBandButton.py=utf-8
42+
encoding//Widgets/Dialogs/DonateDialog.py=utf-8
43+
encoding//Widgets/Dialogs/ErrorDialog.py=utf-8
44+
encoding//Widgets/Dialogs/LoginDialog.py=utf-8
45+
encoding//Widgets/Dialogs/MoveDialog.py=utf-8
46+
encoding//Widgets/Dialogs/SkinDialog.py=utf-8
47+
encoding//Widgets/Dialogs/TwinkleDialog.py=utf-8
48+
encoding//Widgets/Dialogs/UpdateDialog.py=utf-8
3949
encoding//Widgets/FramelessWindow.py=utf-8
4050
encoding//Widgets/MainWindow.py=utf-8
4151
encoding//Widgets/MainWindowBase.py=utf-8
42-
encoding//Widgets/ProgressButton.py=utf-8
43-
encoding//Widgets/RotateButton.py=utf-8
44-
encoding//Widgets/RubberBandButton.py=utf-8
52+
encoding//Widgets/Skins/ColourfulWidget.py=utf-8
53+
encoding//Widgets/Skins/PictureWidget.py=utf-8
54+
encoding//Widgets/Skins/ThemeWidget.py=utf-8
4555
encoding//Widgets/ToolTip.py=utf-8
4656
encoding//Widgets/TreeView.py=utf-8
4757
encoding//Widgets/WaterWidget.py=utf-8

‎Resources/Themes/Default/preview.png‎

45.1 KB
Loading

‎Test/TestMainwindowStyle.py‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
4+
"""
5+
Created on 2019年1月18日
6+
@author: Irony
7+
@site: https://pyqt5.com https://github.com/892768447
8+
@email: 892768447@qq.com
9+
@file: Test.TestMainwindowStyle
10+
@description:
11+
"""
12+
from PyQt5.QtCore import Qt
13+
from PyQt5.QtWidgets import QWidget
14+
15+
from UiFiles.Ui_MainWindow import Ui_FormMainWindow
16+
from Utils.ThemeManager import ThemeManager
17+
18+
19+
__Author__ = "Irony"
20+
__Copyright__ = "Copyright (c) 2019"
21+
22+
23+
class Window(QWidget, Ui_FormMainWindow):
24+
25+
def __init__(self, *args, **kwargs):
26+
super(Window, self).__init__(*args, **kwargs)
27+
self.setAttribute(Qt.WA_TranslucentBackground, True)
28+
self.setWindowFlags(self.windowFlags() | Qt.FramelessWindowHint)
29+
self.setupUi(self)
30+
ThemeManager.loadTheme()
31+
32+
33+
if __name__ == '__main__':
34+
import sys
35+
import os
36+
os.chdir('../')
37+
from PyQt5.QtWidgets import QApplication
38+
app = QApplication(sys.argv)
39+
w = Window()
40+
w.resize(800, 770)
41+
w.show()
42+
w.grab().save('Resources/Themes/Default/preview.png')
43+
sys.exit(app.exec_())

‎Test/TestSkinDialog.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
4+
"""
5+
Created on 2019年1月20日
6+
@author: Irony
7+
@site: https://pyqt5.com https://github.com/892768447
8+
@email: 892768447@qq.com
9+
@file: Test.TestSkinDialog
10+
@description:
11+
"""
12+
from Dialogs.SkinDialog import SkinDialog
13+
from Utils.ThemeManager import ThemeManager
14+
15+
16+
__Author__ = 'Irony'
17+
__Copyright__ = 'Copyright (c) 2019'
18+
19+
20+
if __name__ == '__main__':
21+
import sys
22+
import os
23+
import cgitb
24+
os.chdir('../')
25+
sys.excepthook = cgitb.enable(1, None, 5, '')
26+
from PyQt5.QtWidgets import QApplication
27+
app = QApplication(sys.argv)
28+
w = SkinDialog()
29+
ThemeManager.loadTheme()
30+
w.show()
31+
sys.exit(app.exec_())

‎UiFiles/ColourfulWidget.ui‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>FormColourful</class>
4+
<widget class="QWidget" name="FormColourful">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>900</width>
10+
<height>612</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Colourful</string>
15+
</property>
16+
<layout class="QHBoxLayout" name="horizontalLayout">
17+
<property name="spacing">
18+
<number>0</number>
19+
</property>
20+
<property name="leftMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="topMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="rightMargin">
27+
<number>0</number>
28+
</property>
29+
<property name="bottomMargin">
30+
<number>0</number>
31+
</property>
32+
<item>
33+
<widget class="QScrollArea" name="scrollArea">
34+
<property name="horizontalScrollBarPolicy">
35+
<enum>Qt::ScrollBarAlwaysOff</enum>
36+
</property>
37+
<property name="widgetResizable">
38+
<bool>true</bool>
39+
</property>
40+
<property name="alignment">
41+
<set>Qt::AlignCenter</set>
42+
</property>
43+
<widget class="QWidget" name="scrollAreaWidgetContents">
44+
<property name="geometry">
45+
<rect>
46+
<x>0</x>
47+
<y>0</y>
48+
<width>898</width>
49+
<height>610</height>
50+
</rect>
51+
</property>
52+
<layout class="QGridLayout" name="gridLayout">
53+
<property name="sizeConstraint">
54+
<enum>QLayout::SetFixedSize</enum>
55+
</property>
56+
<property name="leftMargin">
57+
<number>30</number>
58+
</property>
59+
<property name="topMargin">
60+
<number>26</number>
61+
</property>
62+
<property name="rightMargin">
63+
<number>30</number>
64+
</property>
65+
<property name="bottomMargin">
66+
<number>26</number>
67+
</property>
68+
<property name="horizontalSpacing">
69+
<number>12</number>
70+
</property>
71+
<property name="verticalSpacing">
72+
<number>26</number>
73+
</property>
74+
</layout>
75+
</widget>
76+
</widget>
77+
</item>
78+
</layout>
79+
</widget>
80+
<resources/>
81+
<connections/>
82+
</ui>

‎UiFiles/DonateDialog.ui‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@
9696
<property name="text">
9797
<string/>
9898
</property>
99+
<property name="autoDefault">
100+
<bool>false</bool>
101+
</property>
99102
</widget>
100103
</item>
101104
</layout>

‎UiFiles/LoginDialog.ui‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@
247247
<property name="text">
248248
<string/>
249249
</property>
250+
<property name="autoDefault">
251+
<bool>false</bool>
252+
</property>
250253
</widget>
251254
</item>
252255
</layout>
@@ -344,12 +347,12 @@
344347
<customwidget>
345348
<class>RotateButton</class>
346349
<extends>QPushButton</extends>
347-
<header location="global">Widgets.RotateButton</header>
350+
<header location="global">Widgets.Buttons.RotateButton</header>
348351
</customwidget>
349352
<customwidget>
350353
<class>ProgressButton</class>
351354
<extends>QPushButton</extends>
352-
<header location="global">Widgets.ProgressButton</header>
355+
<header location="global">Widgets.Buttons.ProgressButton</header>
353356
</customwidget>
354357
</customwidgets>
355358
<resources/>

‎UiFiles/MainWindow.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,12 @@
410410
<customwidget>
411411
<class>RotateButton</class>
412412
<extends>QPushButton</extends>
413-
<header location="global">Widgets.RotateButton</header>
413+
<header location="global">Widgets.Buttons.RotateButton</header>
414414
</customwidget>
415415
<customwidget>
416416
<class>RubberBandButton</class>
417417
<extends>QPushButton</extends>
418-
<header location="global">Widgets.RubberBandButton</header>
418+
<header location="global">Widgets.Buttons.RubberBandButton</header>
419419
</customwidget>
420420
<customwidget>
421421
<class>TreeView</class>

0 commit comments

Comments
 (0)