Paste P519

Masterwork From Distant Lands
ActivePublic

Authored by davidedmundson on Jan 21 2020, 3:45 PM.
diff --git a/src/qtquick/qml/Dialog.qml b/src/qtquick/qml/Dialog.qml
index 95e6180..6845550 100644
--- a/src/qtquick/qml/Dialog.qml
+++ b/src/qtquick/qml/Dialog.qml
@@ -30,13 +30,13 @@
*/
import QtQuick 2.11
+import QtQuick.Window 2.11
+
import QtQuick.Controls 2.5 as QtControls
import QtQuick.Layouts 1.11 as QtLayouts
-import QtQuick.Dialogs 1.3 as QtDialogs
-
import org.kde.newstuff 1.62 as NewStuff
-QtDialogs.Dialog {
+Window {
id: component
/**
@@ -86,7 +86,22 @@ QtDialogs.Dialog {
}
}
- contentItem: QtLayouts.ColumnLayout {
+ SystemPalette {
+ id: palette
+ }
+ color: palette.window
+
+ function open() { // for compatibility with when this used to be a Dialog
+ show();
+ }
+
+ width: mainContent.implicitWidth
+ height: mainContent.implicitHeight
+
+ QtLayouts.ColumnLayout {
+ id: mainContent
+ anchors.fill: parent
+ anchors.margins: 4
NewStuff.DialogContent {
id: newStuffPage
QtLayouts.Layout.fillWidth: true
@@ -103,7 +118,6 @@ QtDialogs.Dialog {
component.close();
}
}
- QtControls.DialogButtonBox.buttonRole: QtControls.DialogButtonBox.RejectRole // this is a close button, dialog close buttons have a rejection role...
}
}
}
davidedmundson edited the content of this paste. (Show Details)Jan 21 2020, 3:45 PM
davidedmundson changed the title of this paste from untitled to Masterwork From Distant Lands.