Model undo stack is accessible in QML. Added Undo & Redo buttons, which are properly en-/disabled and have informative texts.

This commit is contained in:
2026-03-09 12:26:41 +01:00
parent e76fdaae9f
commit d08325cc3c
2 changed files with 38 additions and 14 deletions

View File

@ -5,24 +5,45 @@ import QtQuick.Controls.Material
Page { Page {
id: page id: page
ListView { ColumnLayout {
id: listView
anchors.fill: parent anchors.fill: parent
focus: true
clip: true
model: mainModel ListView {
id: listView
Layout.fillWidth: true
Layout.fillHeight: true
focus: true
clip: true
// delegate: ListItemDelegate {} model: mainModel
delegate: ExpandableItemDelegate {}
// delegate: EditableItemDelegate {}
delegateModelAccess: DelegateModel.ReadWrite
header: bannercomponent // delegate: ListItemDelegate {}
footer: Rectangle { delegate: ExpandableItemDelegate {}
width: parent.width // delegate: EditableItemDelegate {}
height: 30 delegateModelAccess: DelegateModel.ReadWrite
gradient: mainGradient
header: bannercomponent
footer: Rectangle {
width: parent.width
height: 30
gradient: mainGradient
}
}
Button {
Layout.fillWidth: true
text: "Undo: " + appUndoStack.undoText
enabled: appUndoStack.canUndo
onClicked: {
appUndoStack.undo()
}
}
Button {
Layout.fillWidth: true
text: "Redo: " + appUndoStack.redoText
enabled: appUndoStack.canRedo
onClicked: {
appUndoStack.redo()
}
} }
} }

View File

@ -1,6 +1,7 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QQmlContext> #include <QQmlContext>
#include <QUndoCommand>
#include <model/generalsortfiltermodel.h> #include <model/generalsortfiltermodel.h>
@ -18,6 +19,7 @@ int main(int argc, char* argv[]) {
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
std::unique_ptr<GenericCore> core = std::make_unique<GenericCore>(); std::unique_ptr<GenericCore> core = std::make_unique<GenericCore>();
std::shared_ptr<GeneralSortFilterModel> mainModel = core->getSortFilterModel(); std::shared_ptr<GeneralSortFilterModel> mainModel = core->getSortFilterModel();
QUndoStack* undoStack = core->getModelUndoStack();
// qInfo() << "QMLApp Version:" << QMLAPP_VERSION; // qInfo() << "QMLApp Version:" << QMLAPP_VERSION;
qInfo() << "core->getString():" << core->toString(); qInfo() << "core->getString():" << core->toString();
@ -25,6 +27,7 @@ int main(int argc, char* argv[]) {
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty(QStringLiteral("core"), core.get()); engine.rootContext()->setContextProperty(QStringLiteral("core"), core.get());
engine.rootContext()->setContextProperty(QStringLiteral("mainModel"), mainModel.get()); engine.rootContext()->setContextProperty(QStringLiteral("mainModel"), mainModel.get());
engine.rootContext()->setContextProperty(QStringLiteral("appUndoStack"), undoStack);
QObject::connect( QObject::connect(
&engine, &QQmlApplicationEngine::objectCreationFailed, &app, &engine, &QQmlApplicationEngine::objectCreationFailed, &app,