Compare commits

...

3 Commits

2 changed files with 50 additions and 14 deletions

View File

@ -184,7 +184,7 @@ Item {
ComboBox { ComboBox {
// TODO use model from metadata.h (in some way) // TODO use model from metadata.h (in some way)
model: ["A", "B", "C", ""] model: ["A", "B", "C", ""]
// BUG type will probably not been updated due to undo/redo step // BUG type is not been updated due to undo/redo step
currentIndex: find(item.type) currentIndex: find(item.type)
Component.onCompleted: currentIndex = find(item.type) Component.onCompleted: currentIndex = find(item.type)
onCurrentTextChanged: { onCurrentTextChanged: {

View File

@ -4,19 +4,18 @@ import QtQuick.Layouts
import QtQml.Models import QtQml.Models
Window { Window {
id: window
property bool discardChangesOnExit: false
property bool isDataModified: !appUndoStack.isClean property bool isDataModified: !appUndoStack.isClean
property string titleClean: `${Application.name}` property string titleClean: `${Application.name}`
property string titleDirty: `${Application.name}` + " *" property string titleDirty: `${Application.name}` + " *"
id: window
width: 480 width: 480
height: 800 height: 800
visible: true visible: true
title: appUndoStack.clean ? titleClean : titleDirty title: appUndoStack.clean ? titleClean : titleDirty
property int fontSize: 16 property int fontSize: 16
property color textColor: "black" property color textColor: "black"
property color wccDarkDark: "#010101" property color wccDarkDark: "#010101"
@ -36,17 +35,54 @@ Window {
anchors.fill: parent anchors.fill: parent
} }
Component.onCompleted: { // Component.onCompleted: {
// core.displayStatusMessage.connect(displayStatusMessage) // // core.displayStatusMessage.connect(displayStatusMessage)
appUndoStack.cleanChanged.connect(cleanChanged) // appUndoStack.cleanChanged.connect(cleanChanged)
// core.userConfigChanged.connect(onUserConfigChanged) // // core.userConfigChanged.connect(onUserConfigChanged)
// }
// function cleanChanged() {
// let clean = appUndoStack.clean
// console.debug("Clean state changed to: " + clean)
// // if (!clean) {
// // footerText.text = ""
// // }
// }
onClosing: event => {
if (appUndoStack.clean) {
console.debug("Closing on a clean undo stack.");
} else {
console.debug("Closing on an unclean undo stack!");
if (!window.discardChangesOnExit) {
event.accepted = false;
exitOnUnsavedChangesDialog.open();
}
}
} }
function cleanChanged() { Dialog {
let clean = appUndoStack.clean id: exitOnUnsavedChangesDialog
console.debug("Clean state changed to: " + clean) title: "Unsaved Changes"
// if (!clean) { modal: false
// footerText.text = "" anchors.centerIn: parent
// } width: 300
standardButtons: Dialog.Yes | Dialog.Cancel | Dialog.Discard
contentItem: Label {
text: "Do you want save your changes?\n" + "Or discard them?"
}
onAccepted: {
core.saveItems();
window.close();
}
onDiscarded: {
window.discardChangesOnExit = true;
window.close();
}
onRejected: {
console.debug("Canceling exit...");
}
} }
} }