Skip to content

Commit a83ed99

Browse files
Remove Qt5Compat dependency and migrate to Qt6 equivalents (#27)
* Removes custom box-shadow and elevation effects * Removes unused Popup element * Removes unused ToolBar element * Fixes QML module definition order * Replaces DropShadow with a custom ToolTipShadow * Removes unused QtGraphicalEffects import * Refines tooltip shadow appearance for PySide6.8+ * Updates setup instructions in examples * Updates version and PySide6 dependency * Constrains PySide6 version to avoid TableView issues
1 parent 4ee0553 commit a83ed99

16 files changed

+50
-549
lines changed

EXAMPLES.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Different types of examples are given here. All examples have a graphical fronte
1010
| AdvancedPy | III | QML | Python | `python` interpreter |
1111
| BasicC++ | IV | QML | Mock QML | need to be compiled |
1212

13-
## Setting up Python and IDE
13+
## Setting up Python and IDE
1414

1515
### Python environment
1616

@@ -19,14 +19,14 @@ Different types of examples are given here. All examples have a graphical fronte
1919
***macOS and Linux***
2020

2121
```
22-
python3.11 -m venv .venv
22+
python3 -m venv .venv
2323
source .venv/bin/activate
2424
```
2525

2626
***Windows***
2727

2828
```
29-
python3.11 -m venv .venv
29+
python3 -m venv .venv
3030
.venv\Scripts\activate
3131
```
3232

@@ -35,11 +35,11 @@ Different types of examples are given here. All examples have a graphical fronte
3535
```
3636
pip install --upgrade pip
3737
```
38-
38+
3939
* Install the Qt for Python `PySide6` package using PIP
4040

4141
```
42-
pip install --force-reinstall "PySide6>=6.6,<6.7"
42+
pip install 'PySide6>=6.8,<6.9'
4343
```
4444

4545
### Integrated development environment (IDE)
@@ -51,12 +51,11 @@ Qt Creator is a prefered IDE for developing the GUI in QML. It allows to run QML
5151
* Download Qt Online Installer from [qt.io](https://www.qt.io/download-qt-installer-oss). More info at [doc.qt.io](https://doc.qt.io/qt-6/qt-online-installation.html).
5252
* Install Qt for desktop development using a custom installation that includes the following components:
5353
* Qt
54-
* [ ] Qt 6.7.z
54+
* [ ] Qt 6.8.z
5555
* [x] Desktop (***macOS***) or MSVC 2019 64-bit (***Windows***)
56-
* [x] Qt 5 Compatibility Module
57-
* [x] Qt Shader Tools
5856
* [ ] Additional Libraries
5957
* [x] Qt Charts
58+
* [x] Qt Shader Tools
6059
* [ ] Developer and Designer Tools
6160
* [x] Qt Creator x.y.z
6261

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
44

55
[project]
66
name = 'EasyApp'
7-
version = '0.6.0'
7+
version = '0.8.0'
88
description = 'Collection of graphical components to quickly create cross-platform applications in the EasyScience universe.'
99
authors = [
1010
{name = 'Andrew Sazonov', email = '[email protected]'}
@@ -21,7 +21,7 @@ classifiers = [
2121
]
2222
requires-python = '>=3.10'
2323
dependencies = [
24-
'PySide6>=6.8,<6.9' # updated due to Numpy2 dependency
24+
'PySide6>=6.8,<6.9' # Issue with TableView formatting in 6.9
2525
]
2626

2727
[project.urls]

src/EasyApp/Gui/Components/GuideWindow.qml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import QtQuick
22
import QtQuick.Controls
33
import QtQuick.Controls.impl
44
import QtQuick.Layouts 1.12
5-
//import QtGraphicalEffects 1.13
6-
import Qt5Compat.GraphicalEffects
75

86
import EasyApp.Gui.Style as EaStyle
97
import EasyApp.Gui.Globals as EaGlobals

src/EasyApp/Gui/Elements/BoxShadow.qml

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

src/EasyApp/Gui/Elements/ComboBox.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import QtQuick
22
import QtQuick.Window
33
import QtQuick.Controls
44
import QtQuick.Controls.impl
5+
import QtQuick.Controls.Material.impl
56
import QtQuick.Templates as T
67

78
import EasyApp.Gui.Style as EaStyle
@@ -187,7 +188,7 @@ T.ComboBox {
187188
}
188189

189190
layer.enabled: control.enabled
190-
layer.effect: EaElements.ElevationEffect {
191+
layer.effect: ElevationEffect {
191192
elevation: 8
192193
}
193194
}

src/EasyApp/Gui/Elements/Dialog.qml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import QtQuick
2-
import QtQuick.Templates as T
32
import QtQuick.Controls
43
import QtQuick.Controls.impl
4+
import QtQuick.Controls.Material.impl
5+
import QtQuick.Templates as T
56

67
import EasyApp.Gui.Style as EaStyle
78
import EasyApp.Gui.Globals as EaGlobals
@@ -55,7 +56,7 @@ T.Dialog {
5556
Behavior on color { EaAnimations.ThemeChange {} }
5657

5758
layer.enabled: EaStyle.Sizes.dialogElevation
58-
layer.effect: EaElements.ElevationEffect {
59+
layer.effect: ElevationEffect {
5960
elevation: EaStyle.Sizes.dialogElevation
6061
}
6162
}

src/EasyApp/Gui/Elements/ElevationEffect.qml

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

src/EasyApp/Gui/Elements/Menu.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import QtQuick
2-
import QtQuick.Templates as T
2+
import QtQuick.Window
33
import QtQuick.Controls.Material
44
import QtQuick.Controls.Material.impl
5-
import QtQuick.Window
5+
import QtQuick.Templates as T
66

77
import EasyApp.Gui.Style as EaStyle
88

src/EasyApp/Gui/Elements/Popup.qml

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

0 commit comments

Comments
 (0)