Finishing touches on putting History off QML.

common/src/events.mjs

@@ -58,7 +58,6 @@ export class BaseEventEmitter {
             for(const type of eventType.split(" "))
                 this.on(type, eventListener)
         else {
-            console.log("Listening to", eventType)
             if(!this.constructor.emits.includes(eventType)) {
                 const className = this.constructor.name
                 const eventTypes = this.constructor.emits.join(", ")

common/src/module/history.mjs

@@ -29,6 +29,12 @@ class ClearedEvent extends BaseEvent {
     }
 }
 
+class LoadedEvent extends BaseEvent {
+    constructor() {
+        super("loaded")
+    }
+}
+
 class AddedEvent extends BaseEvent {
     constructor(action) {
         super("added")
@@ -51,7 +57,7 @@ class RedoneEvent extends BaseEvent {
 }
 
 class HistoryAPI extends Module {
-    static emits = ["cleared", "added", "undone", "redone"]
+    static emits = ["cleared", "loaded", "added", "undone", "redone"]
 
     #helper
 
@@ -154,7 +160,7 @@ class HistoryAPI extends Module {
             this.redoStack.push(
                 new Actions[name](...args)
             )
-        this.emit(new UpdatedEvent())
+        this.emit(new LoadedEvent())
     }
 
     /**

common/src/module/io.mjs

@@ -59,7 +59,6 @@ class IOAPI extends Module {
         })
 
         // Settings.on("changed", this.__emitModified.bind(this))
-        console.log("Init IO", this)
         History.on("added undone redone", this.__emitModified.bind(this))
     }
 
@@ -125,6 +124,7 @@ class IOAPI extends Module {
         }
         Helper.write(filename, JSON.stringify(settings))
         this.#alert.show(qsTranslate("io", "Saved plot to '%1'.").arg(filename.split("/").pop()))
+        this.#saved = true
         this.emit(new SavedEvent())
     }
 
@@ -203,6 +203,7 @@ class IOAPI extends Module {
         }
         Canvas.redraw()
         this.#alert.show(qsTranslate("io", "Loaded file '%1'.").arg(basename))
+        this.#saved = true
         this.emit(new LoadedEvent())
     }
 

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

@@ -1,112 +0,0 @@
-/**
- *  LogarithmPlotter - 2D plotter software to make BODE plots, sequences and distribution functions.
- *  Copyright (C) 2021-2024  Ad5001
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQml
-import QtQuick.Window
-import "../js/index.mjs" as JS
-
-/*!
-    \qmltype History
-    \inqmlmodule eu.ad5001.LogarithmPlotter.History
-    \brief QObject holding persistantly for undo & redo stacks.
-        
-    \sa HistoryBrowser, HistoryLib
-*/
-Item {
-    // Using a QtObject is necessary in order to have proper property propagation in QML
-    id: historyObj
-
-    /*!
-       \qmlproperty int History::undoCount
-       Count of undo actions.
-    */
-    property int undoCount: 0
-    /*!
-       \qmlproperty int History::redoCount
-       Count of redo actions.
-    */
-    property int redoCount: 0
-    /*!
-       \qmlproperty var History::undoStack
-       Stack of undo actions.
-    */
-    property var undoStack: []
-    /*!
-       \qmlproperty var History::redoStack
-       Stack of redo actions.
-    */
-    property var redoStack: []
-    /*!
-       \qmlproperty bool History::saved
-       true when no modification was done to the current working file, false otherwise.
-    */
-    property bool saved: true
-    
-    
-    /*!
-        \qmlmethod void History::clear()
-        Clears both undo and redo stacks completly.
-    */
-    function clear() {
-        Modules.History.clear()
-    }
-    
-    
-    /*!
-        \qmlmethod var History::serialize()
-        Serializes history into JSON-able content.
-    */
-    function serialize() {
-        return Modules.History.serialize()
-    }
-    
-    /*!
-        \qmlmethod void History::unserialize(var undoSt, var redoSt)
-        Unserializes both \c undoSt stack and \c redoSt stack from serialized content.
-    */
-    function unserialize(undoSt, redoSt) {
-        Modules.History.unserialize(undoSt, redoSt)
-    }
-    
-    /*!
-        \qmlmethod void History::addToHistory(var action)
-        Adds an instance of HistoryLib.Action to history.
-    */
-    function addToHistory(action) {
-        Modules.History.addToHistory(action)
-    }
-    
-    /*!
-        \qmlmethod void History::undo(bool updateObjectList = true)
-        Undoes the HistoryLib.Action at the top of the undo stack and pushes it to the top of the redo stack.
-        By default, will update the graph and the object list. This behavior can be disabled by setting the \c updateObjectList to false.
-    */
-    function undo(updateObjectList = true) {
-        Modules.History.undo()
-    }
-    
-    /*!
-        \qmlmethod void History::redo(bool updateObjectList = true)
-        Redoes the HistoryLib.Action at the top of the redo stack and pushes it to the top of the undo stack.
-        By default, will update the graph and the object list. This behavior can be disabled by setting the \c updateObjectList to false.
-    */
-    function redo(updateObjectList = true) {
-        Modules.History.redo()
-    }
-}

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

@@ -225,7 +225,7 @@ Item {
             imageDepth: Screen.devicePixelRatio,
             fontSize: 14
         })
-        Modules.History.on("cleared added undone redone", () => {
+        Modules.History.on("cleared loaded added undone redone", () => {
             undoCount = Modules.History.undoStack.length
             redoCount = Modules.History.redoStack.length
         })

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

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

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

@@ -183,7 +183,7 @@ ApplicationWindow {
     }
     
     onClosing: function(close) {
-        if(!Modules.History.saved) {
+        if(!Modules.IO.saved) {
             close.accepted = false
             appMenu.openSaveUnsavedChangesDialog()
         }