diff --git a/applets/testcomponentsapplet/contents/ui/DialogsPage.qml b/applets/testcomponentsapplet/contents/ui/DialogsPage.qml index aa9cc9db9..936248036 100644 --- a/applets/testcomponentsapplet/contents/ui/DialogsPage.qml +++ b/applets/testcomponentsapplet/contents/ui/DialogsPage.qml @@ -39,6 +39,33 @@ PlasmaComponents.Page { width: parent.width text: "Dialogs" } + Row { + height: _h + spacing: _s + PlasmaComponents.Button { + id: radio + checkable: true + iconSource: "dialog-ok" + text: "QtQuick2.Window" + } + Window { + id: qWindow + visible: radio.checked + width: childrenRect.width + height: childrenRect.height + color: Qt.rgba(0,0,0,0) + DialogContent { + id: dContent + onCloseMe: { + qWindow.visible = false + } + } + } + + PlasmaComponents.Label { + text: qWindow.visible ? "shown" : "hidden" + } + } Row { height: _h spacing: _s @@ -46,7 +73,8 @@ PlasmaComponents.Page { text: "PlasmaCore.Dialog" iconSource: "dialog-ok-apply" checkable: true - onCheckedChanged: pcDialog.visible = checked + //onCheckedChanged: pcDialog.visible = checked + onCheckedChanged: pcompDialog.visible = checked } PlasmaComponents.Label { text: pcDialog.visible ? "shown" : "hidden" @@ -58,10 +86,7 @@ PlasmaComponents.Page { mainItem: dContent2 DialogContent { id: dContent2 - onCloseMe: { - pcDialog.close() - //pcDialog.visible = false - } + onCloseMe: pcDialog.visible = false } } } @@ -69,42 +94,23 @@ PlasmaComponents.Page { height: _h spacing: _s PlasmaComponents.Button { - id: radio + text: "PlasmaComponents.Dialog" + iconSource: "dialog-ok-apply" checkable: true - iconSource: "dialog-ok" - text: "QtQuick2.Window" + onCheckedChanged: pcompDialog.visible = checked } - Window { - id: qWindow - visible: radio.checked - width: childrenRect.width - height: childrenRect.height - color: Qt.rgba(0,0,0,0) -// Column { -// width: dialogsPage.width/2 -// PlasmaComponents.TextArea { -// //anchors { left: parent.left; right: parent.right; top: parent.top; } -// width: parent.width -// height: _h*2 -// } -// -// PlasmaComponents.Button { -// id: thanks -// iconSource: "dialog-ok" -// text: "Thanks." -// onClicked: selectionDialog.visible = false; -// } -// } - DialogContent { - id: dContent - onCloseMe: { - qWindow.visible = false - } - } + PlasmaComponents.Label { + text: pcompDialog.visible ? "shown" : "hidden" } - PlasmaComponents.Label { - text: qWindow.visible ? "shown" : "hidden" + PlasmaCore.Dialog { + id: pcompDialog + windowFlags: Qt.Popup + mainItem: dContent3 + DialogContent { + id: dContent3 + onCloseMe: pcompDialog.visible = false + } } } }