Add more toolbox examples and switch to installed EasyApplication

pyproject.toml

@@ -23,46 +23,46 @@ classifiers = [
 requires-python = '>=3.11'
 dependencies = [
   #'easyscience', # The base library of the EasyScience framework
-  'pooch',       # Data downloader
-  'darkdetect',  # Detecting dark mode (system-level)
-  'pandas',      # Displaying tables in Jupyter notebooks
-  'plotly',      # Interactive plots
-  'py3Dmol',     # Visualisation of crystal structures
-  'jupyterlab',  # Jupyter notebooks
-  'pixi-kernel', # Pixi Jupyter kernel
+  'EasyApplication', # GUI components
+  'pooch',           # Data downloader
+  'darkdetect',      # Detecting dark mode (system-level)
+  'pandas',          # Displaying tables in Jupyter notebooks
+  'plotly',          # Interactive plots
+  'py3Dmol',         # Visualisation of crystal structures
+  'jupyterlab',      # Jupyter notebooks
+  'pixi-kernel',     # Pixi Jupyter kernel
 ]
 
 [project.optional-dependencies]
 dev = [
-  'build',                                                            # Building the package
-  'pre-commit',                                                       # Pre-commit hooks
-  'jinja2',                                                           # Templating
-  'nbmake',                                                           # Building notebooks
-  'nbstripout',                                                       # Strip output from notebooks
-  'nbqa',                                                             # Linting and formatting notebooks
-  'pytest',                                                           # Testing
-  'pytest-cov',                                                       # Test coverage
-  'pytest-xdist',                                                     # Enable parallel testing
-  'ruff',                                                             # Linting and formatting code
-  'radon',                                                            # Code complexity and maintainability
-  'validate-pyproject[all]',                                          # Validate pyproject.toml
-  'versioningit',                                                     # Automatic versioning from git tags
-  'jupytext',                                                         # Jupyter notebook text format support
-  'jupyterquiz',                                                      # Quizzes in Jupyter notebooks
-  'docformatter',                                                     # Code formatter for docstrings
-  'interrogate',                                                      # Check for missing docstrings
-  'copier',                                                           # Template management
-  'mike',                                                             # MkDocs: Versioned documentation support
-  'mkdocs',                                                           # Static site generator
-  'mkdocs-material',                                                  # Documentation framework on top of MkDocs
-  'mkdocs-autorefs',                                                  # MkDocs: Auto-references support
-  'mkdocs-jupyter',                                                   # MkDocs: Jupyter notebook support
-  'mkdocs-plugin-inline-svg',                                         # MkDocs: Inline SVG support
-  'mkdocs-markdownextradata-plugin',                                  # MkDocs: Markdown extra data support, such as global variables
-  'mkdocstrings-python',                                              # MkDocs: Python docstring support
-  'pyyaml',                                                           # YAML parser
-  'EasyApp @ git+https://github.com/easyscience/EasyApp.git@develop', # The EasyScience application framework
-  'pyinstaller',                                                      # Create standalone executables
+  'build',                           # Building the package
+  'pre-commit',                      # Pre-commit hooks
+  'jinja2',                          # Templating
+  'nbmake',                          # Building notebooks
+  'nbstripout',                      # Strip output from notebooks
+  'nbqa',                            # Linting and formatting notebooks
+  'pytest',                          # Testing
+  'pytest-cov',                      # Test coverage
+  'pytest-xdist',                    # Enable parallel testing
+  'ruff',                            # Linting and formatting code
+  'radon',                           # Code complexity and maintainability
+  'validate-pyproject[all]',         # Validate pyproject.toml
+  'versioningit',                    # Automatic versioning from git tags
+  'jupytext',                        # Jupyter notebook text format support
+  'jupyterquiz',                     # Quizzes in Jupyter notebooks
+  'docformatter',                    # Code formatter for docstrings
+  'interrogate',                     # Check for missing docstrings
+  'copier',                          # Template management
+  'mike',                            # MkDocs: Versioned documentation support
+  'mkdocs',                          # Static site generator
+  'mkdocs-material',                 # Documentation framework on top of MkDocs
+  'mkdocs-autorefs',                 # MkDocs: Auto-references support
+  'mkdocs-jupyter',                  # MkDocs: Jupyter notebook support
+  'mkdocs-plugin-inline-svg',        # MkDocs: Inline SVG support
+  'mkdocs-markdownextradata-plugin', # MkDocs: Markdown extra data support, such as global variables
+  'mkdocstrings-python',             # MkDocs: Python docstring support
+  'pyyaml',                          # YAML parser
+  'pyinstaller',                     # Create standalone executables
 ]
 
 [project.urls]

src/easypeasy_app.pyproject

@@ -0,0 +1,5 @@
+{
+    "files": [
+        "easypeasy_app/main.py"
+    ]
+}

src/easypeasy_app.qmlproject

@@ -6,23 +6,23 @@ Project {
     // List of module and plugin directories passed to QML runtime
     importPaths: [
         "easypeasy_app",
-        "../../EasyApp/src",  // EasyApp
+        "../.pixi/envs/default/lib/python3.13/site-packages/",  // EasyApplication
     ]
 
     // Include .qml files from specified directory and its subdirectories
     QmlFiles {
         directory: "easypeasy_app"
     }
     QmlFiles {
-        directory: "../../EasyApp/src/EasyApp"
+        directory: "../.pixi/envs/default/lib/python3.13/site-packages/EasyApplication"
     }
 
     // Include .js files from specified directory and its subdirectories
     JavaScriptFiles {
         directory: "easypeasy_app"
     }
     JavaScriptFiles {
-        directory: "../../EasyApp/src/EasyApp"
+        directory: "../.pixi/envs/default/lib/python3.13/site-packages/EasyApplication"
     }
 
     // Include Module Definition Files (qmldir), as well as .ts and .qrc
@@ -33,7 +33,7 @@ Project {
         recursive: true
     }
     Files {
-        directory: "../../EasyApp/src/EasyApp"
+        directory: "../.pixi/envs/default/lib/python3.13/site-packages/EasyApplication"
         filter: "qmldir;*.ts;*.qrc;*.html"
         recursive: true
     }

src/easypeasy_app.qrc

@@ -0,0 +1,61 @@
+<RCC>
+    <qresource>
+        <file>easypeasy_app.qmlproject</file>
+        <file>easypeasy_app/Backends/MockBackend.qml</file>
+        <file>easypeasy_app/Backends/MockQml/Analysis.qml</file>
+        <file>easypeasy_app/Backends/MockQml/Project.qml</file>
+        <file>easypeasy_app/Backends/MockQml/qmldir</file>
+        <file>easypeasy_app/Backends/MockQml/Report.qml</file>
+        <file>easypeasy_app/Backends/MockQml/Status.qml</file>
+        <file>easypeasy_app/Backends/qmldir</file>
+        <file>easypeasy_app/Gui/ApplicationWindow.qml</file>
+        <file>easypeasy_app/Gui/Globals/ApplicationInfo.qml</file>
+        <file>easypeasy_app/Gui/Globals/BackendWrapper.qml</file>
+        <file>easypeasy_app/Gui/Globals/qmldir</file>
+        <file>easypeasy_app/Gui/Globals/References.qml</file>
+        <file>easypeasy_app/Gui/Pages/Analysis/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Analysis/MainArea/Chart.qml</file>
+        <file>easypeasy_app/Gui/Pages/Analysis/Sidebar/Basic/Groups/GetStarted.qml</file>
+        <file>easypeasy_app/Gui/Pages/Analysis/Sidebar/Basic/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Home/Content.qml</file>
+        <file>easypeasy_app/Gui/Pages/Home/Popups/About.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/MainArea/Description.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Groups/Examples.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Groups/GetStarted.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Groups/Recent.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Popups/OpenCifFile.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Popups/ProjectDescription.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Extra/Groups/Scrolling.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Extra/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Project/Sidebar/Text/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Report/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Report/MainArea/Summary.qml</file>
+        <file>easypeasy_app/Gui/Pages/Report/Sidebar/Basic/Groups/Export.qml</file>
+        <file>easypeasy_app/Gui/Pages/Report/Sidebar/Basic/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Report/Sidebar/Extra/Groups/Empty.qml</file>
+        <file>easypeasy_app/Gui/Pages/Report/Sidebar/Extra/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/MainArea/GraphsView.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/Sidebar/Basic/Groups/Group1.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/Sidebar/Basic/Groups/Group2.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/Sidebar/Basic/Groups/Group3.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/Sidebar/Basic/Groups/Group4.qml</file>
+        <file>easypeasy_app/Gui/Pages/SampleModel/Sidebar/Basic/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Layout.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/MainArea/GraphsView.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/MainArea/Image.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/MainArea/TextAreaPlain.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/MainArea/TextAreaRich.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Sidebar/Basic/Groups/Group1.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Sidebar/Basic/Groups/Group2.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Sidebar/Basic/Groups/Group3.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Sidebar/Basic/Groups/Group4.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Sidebar/Basic/Groups/Group5.qml</file>
+        <file>easypeasy_app/Gui/Pages/Toolbox/Sidebar/Basic/Layout.qml</file>
+        <file>easypeasy_app/Gui/qmldir</file>
+        <file>easypeasy_app/Gui/StatusBar.qml</file>
+        <file>easypeasy_app/main.qml</file>
+    </qresource>
+</RCC>

src/easypeasy_app/Backends/real_backend.py

@@ -4,7 +4,7 @@
 
 from PySide6.QtCore import QObject, Property
 
-from EasyApp.Logic.Logging import LoggerLevelHandler
+from EasyApplication.Logic.Logging import LoggerLevelHandler
 
 from .real_py.project import Project
 from .real_py.analysis import Analysis

src/easypeasy_app/Backends/real_py/analysis.py

@@ -5,7 +5,7 @@
 import numpy as np
 from PySide6.QtCore import QObject, Signal, Slot, Property, QPointF
 
-from EasyApp.Logic.Logging import console
+from EasyApplication.Logic.Logging import console
 
 
 class Analysis(QObject):

src/easypeasy_app/Backends/real_py/project.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from PySide6.QtCore import QObject, Signal, Slot, Property
 
-from EasyApp.Logic.Logging import console
+from EasyApplication.Logic.Logging import console
 from .logic.helpers import IO
 from .logic.helpers import DottyDict
 

src/easypeasy_app/Gui/ApplicationWindow.qml

@@ -5,9 +5,9 @@
 import QtQuick
 import QtQuick.Controls
 
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Elements as EaElements
-import EasyApp.Gui.Components as EaComponents
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Elements as EaElements
+import EasyApplication.Gui.Components as EaComponents
 
 import Gui as Gui
 import Gui.Globals as Globals

src/easypeasy_app/Gui/Pages/Analysis/Layout.qml

@@ -5,10 +5,10 @@
 import QtQuick
 import QtQuick.Controls
 
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Elements as EaElements
-import EasyApp.Gui.Components as EaComponents
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Elements as EaElements
+import EasyApplication.Gui.Components as EaComponents
 
 import Gui.Globals as Globals
 
@@ -27,7 +27,7 @@ EaComponents.ContentPage {
 
     sideBar: EaComponents.SideBar {
         tabs: [
-            EaElements.TabButton { text: qsTr('Basic controls') }
+            EaElements.TabButton { text: qsTr('Basic') }
         ]
 
         items: [

src/easypeasy_app/Gui/Pages/Analysis/MainArea/Chart.qml

@@ -5,8 +5,8 @@
 import QtQuick
 import QtGraphs
 
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Elements as EaElements
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Elements as EaElements
 
 import Gui.Globals as Globals
 
@@ -59,7 +59,7 @@ Rectangle {
             //labelsVisible: true
             //subTickCount: 1
 
-            labelDelegate: TextEdit {
+            labelDelegate: EaElements.Label {
                 horizontalAlignment: TextInput.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 bottomPadding: EaStyle.Sizes.fontPixelSize
@@ -81,7 +81,7 @@ Rectangle {
             //labelsVisible: true
             //subTickCount: 1
 
-            labelDelegate: TextEdit {
+            labelDelegate: EaElements.Label {
                 horizontalAlignment: TextInput.AlignRight
                 verticalAlignment: Text.AlignVCenter
                 rightPadding: -EaStyle.Sizes.fontPixelSize

src/easypeasy_app/Gui/Pages/Analysis/Sidebar/Basic/Groups/GetStarted.qml

@@ -5,11 +5,11 @@
 import QtQuick
 import QtQuick.Controls
 
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Elements as EaElements
-import EasyApp.Gui.Components as EaComponents
-import EasyApp.Gui.Logic as EaLogic
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Elements as EaElements
+import EasyApplication.Gui.Components as EaComponents
+import EasyApplication.Gui.Logic as EaLogic
 
 import Gui.Globals as Globals
 

src/easypeasy_app/Gui/Pages/Analysis/Sidebar/Basic/Layout.qml

@@ -5,8 +5,8 @@
 import QtQuick
 import QtQuick.Controls
 
-import EasyApp.Gui.Elements as EaElements
-import EasyApp.Gui.Components as EaComponents
+import EasyApplication.Gui.Elements as EaElements
+import EasyApplication.Gui.Components as EaComponents
 
 import Gui.Globals as Globals
 

src/easypeasy_app/Gui/Pages/Home/Content.qml

@@ -4,9 +4,9 @@
 
 import QtQuick
 
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Elements as EaElements
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Elements as EaElements
 
 import Gui.Globals as Globals
 

src/easypeasy_app/Gui/Pages/Home/Popups/About.qml

@@ -4,8 +4,8 @@
 
 import QtQuick
 
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Components as EaComponents
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Components as EaComponents
 
 import Gui.Globals as Globals
 

src/easypeasy_app/Gui/Pages/Project/Layout.qml

@@ -5,10 +5,10 @@
 import QtQuick
 import QtQuick.Controls
 
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Elements as EaElements
-import EasyApp.Gui.Components as EaComponents
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Elements as EaElements
+import EasyApplication.Gui.Components as EaComponents
 
 import Gui.Globals as Globals
 
@@ -31,9 +31,9 @@ EaComponents.ContentPage {
 
     sideBar: EaComponents.SideBar {
         tabs: [
-            EaElements.TabButton { text: qsTr('Basic controls') },
-            EaElements.TabButton { text: qsTr('Extra controls') },
-            EaElements.TabButton { text: qsTr('Text mode controls'); enabled: false }
+            EaElements.TabButton { text: qsTr('Basic') },
+            EaElements.TabButton { text: qsTr('Extra') },
+            EaElements.TabButton { text: qsTr('Text mode'); enabled: false }
         ]
 
         items: [

src/easypeasy_app/Gui/Pages/Project/MainArea/Description.qml

@@ -4,8 +4,8 @@
 
 import QtQuick
 
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Elements as EaElements
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Elements as EaElements
 
 import Gui.Globals as Globals
 

src/easypeasy_app/Gui/Pages/Project/Sidebar/Basic/Groups/Examples.qml

@@ -5,11 +5,11 @@
 import QtQuick
 import QtQuick.Controls
 
-import EasyApp.Gui.Globals as EaGlobals
-import EasyApp.Gui.Style as EaStyle
-import EasyApp.Gui.Elements as EaElements
-import EasyApp.Gui.Components as EaComponents
-import EasyApp.Gui.Logic as EaLogic
+import EasyApplication.Gui.Globals as EaGlobals
+import EasyApplication.Gui.Style as EaStyle
+import EasyApplication.Gui.Elements as EaElements
+import EasyApplication.Gui.Components as EaComponents
+import EasyApplication.Gui.Logic as EaLogic
 
 import Gui.Globals as Globals