Rewirring paths to improve import names and such.

Author: Ad5001

common/rollup.config.mjs

@@ -22,7 +22,7 @@ import { babel } from "@rollup/plugin-babel"
 import cleanup from "rollup-plugin-cleanup"
 
 const src = "./src/index.mjs"
-const dest = "../build/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/index.mjs"
+const dest = "../build/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Common/index.mjs"
 
 export default {
  input: src,

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml

@@ -20,7 +20,7 @@ import QtQuick
 import Qt.labs.platform as Native
 //import QtQuick.Controls 2.15
 import eu.ad5001.MixedMenu 1.1
-import "js/index.mjs" as JS
+import eu.ad5001.LogarithmPlotter.Common
 
 
 /*!

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Common/qmldir

@@ -0,0 +1,3 @@
+module eu.ad5001.LogarithmPlotter.Common
+
+JS 1.0 index.mjs

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml renamed to runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/Browser.qml

@@ -24,7 +24,7 @@ import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 
 
 /*!
- \qmltype HistoryBrowser
+ \qmltype Browser
  \inqmlmodule eu.ad5001.LogarithmPlotter.History
  \brief Tab of the drawer that allows to navigate through the undo and redo history.
 
@@ -95,7 +95,7 @@ Item {
  Repeater {
  model: historyBrowser.redoCount
 
- HistoryItem {
+ SingleItem {
  id: redoButton
  width: historyBrowser.actionWidth
  //height: actionHeight
@@ -147,7 +147,7 @@ Item {
  model: historyBrowser.undoCount
 
 
- HistoryItem {
+ SingleItem {
  id: undoButton
  width: historyBrowser.actionWidth
  //height: actionHeight

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml renamed to runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/SingleItem.qml

@@ -22,7 +22,7 @@ import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 
 
 /*!
- \qmltype HistoryItem
+ \qmltype SingleItem
  \inqmlmodule eu.ad5001.LogarithmPlotter.History
  \brief Item representing an history action.
 

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/qmldir

@@ -1,4 +1,4 @@
 module eu.ad5001.LogarithmPlotter.History
 
-HistoryBrowser 1.0 HistoryBrowser.qml
-HistoryItem 1.0 HistoryItem.qml
+Browser 1.0 Browser.qml
+SingleItem 1.0 SingleItem.qml

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml

@@ -23,10 +23,11 @@ import QtQuick.Layouts 1.12
 import QtQuick
 
 // Auto loading all modules.
-import "js/index.mjs" as JS
+import eu.ad5001.LogarithmPlotter.Common
 
-import eu.ad5001.LogarithmPlotter.History 1.0
+import eu.ad5001.LogarithmPlotter.History 1.0 as History
 import eu.ad5001.LogarithmPlotter.ObjectLists 1.0
+import eu.ad5001.LogarithmPlotter.Overlay 1.0 as Overlay
 import eu.ad5001.LogarithmPlotter.Popup 1.0 as Popup
 
 /*!
@@ -120,16 +121,16 @@ ApplicationWindow {
 
  ObjectLists {
  id: objectLists
- onChanged: drawCanvas.requestPaint()
+ onChanged: Modules.Canvas.requestPaint()
  }
 
  Settings {
  id: settings
  canvas: drawCanvas
- onChanged: drawCanvas.requestPaint()
+ onChanged: Modules.Canvas.requestPaint()
  }
 
- HistoryBrowser {
+ History.Browser {
  id: historyBrowser
  }
  }
@@ -154,18 +155,24 @@ ApplicationWindow {
  }
  }
 
- ViewPositionChangeOverlay {
+ Overlay.ViewPositionChange {
  id: viewPositionChanger
  anchors.fill: parent
  canvas: parent
  settingsInstance: settings
  }
 
- PickLocationOverlay {
+ Overlay.PickLocation {
  id: positionPicker
  anchors.fill: parent
  canvas: parent
  }
+ 
+ // Overlay.Loading {
+ // id: loadingOverlay
+ // anchors.fill: parent
+ // canvas: parent
+ // }
  }
 
  Timer {

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/CustomPropertyList.qml

@@ -20,7 +20,7 @@ import QtQuick
 import QtQuick.Controls
 import Qt.labs.platform as Native
 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-import "../../js/index.mjs" as JS
+import eu.ad5001.LogarithmPlotter.Common
 
 /*!
  \qmltype CustomPropertyList

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/Dialog.qml

@@ -18,11 +18,10 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Dialogs as D
 import Qt.labs.platform as Native
 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 import eu.ad5001.LogarithmPlotter.Popup 1.0 as Popup
-import "../../js/index.mjs" as JS
+import eu.ad5001.LogarithmPlotter.Common
 
 /*!
  \qmltype Dialog

runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml

@@ -19,7 +19,7 @@
 import QtQuick
 import QtQuick.Controls
 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-import "../js/index.mjs" as JS
+import eu.ad5001.LogarithmPlotter.Common
 
 
 /*!