Commit c2978e83 authored by Marco Martin's avatar Marco Martin
Browse files

test latest additions and refactors

parent 8d6e8252
......@@ -100,8 +100,10 @@ Kirigami.ApplicationWindow {
text: "Global Drawer Mode..."
iconName: "go-next"
visible: !Kirigami.Settings.isMobile
expandible: true
Kirigami.Action {
text: "Overlay Drawer"
icon.name: "acrobat"
checked: globalDrawer.modal && !globalDrawer.collapsible
onTriggered: {
globalDrawer.modal = true;
......
......@@ -54,9 +54,25 @@ ScrollablePage {
}
contextualActions: [
Action {
text:"Action for buttons"
text:"Action Parent Expandible"
iconName: "bookmarks"
onTriggered: showPassiveNotification("Action 1 clicked")
expandible: true
Action {
text: "Sub action 1"
}
Action {
text: "Sub action 1"
}
},
Action {
text:"Action Parent"
iconName: "bookmarks"
Action {
text: "Sub action 1"
}
Action {
text: "Sub action 1"
}
},
Action {
text:"Disabled Action"
......@@ -155,6 +171,21 @@ ScrollablePage {
width: page.width
spacing: Units.smallSpacing
Controls.ComboBox {
Layout.alignment: Qt.AlignHCenter
textRole: "text"
model: [{"text": "Default", "value": -1},
{"text": "Toolbar", "value": ApplicationHeaderStyle.ToolBar},
{"text": "Titles", "value": ApplicationHeaderStyle.Titles},
{"text": "None", "value": ApplicationHeaderStyle.None}]
onActivated: {
if (index == 0) {
page.globalToolBarStyle = applicationWindow().pageStack.globalToolBar.actualStyle
} else {
page.globalToolBarStyle = model[index].value;
}
}
}
Controls.Button {
text: "Open &Bottom drawer"
Layout.alignment: Qt.AlignHCenter
......
......@@ -156,6 +156,11 @@ ScrollablePage {
model: ["First", "Second", "Third"]
Layout.alignment: Qt.AlignHCenter
}
Controls.ComboBox {
editable: true
model: ["First", "Second", "Third"]
Layout.alignment: Qt.AlignHCenter
}
Controls.GroupBox {
title: "Title"
Layout.alignment: Qt.AlignHCenter
......
......@@ -117,16 +117,21 @@ ScrollablePage {
}
Controls.Button {
text: "Push Another Page"
anchors.horizontalCenter: parent.horizontalCenter
Layout.alignment: Qt.AlignHCenter
onClicked: pageStack.push(Qt.resolvedUrl("MultipleColumnsGallery.qml"), {"depth": root.depth + 1});
}
Controls.Button {
text: "Push Two Pages"
Layout.alignment: Qt.AlignHCenter
onClicked: pageStack.push([Qt.resolvedUrl("MultipleColumnsGallery.qml"), Qt.resolvedUrl("MultipleColumnsGallery.qml")], [{"depth": root.depth + 1}, {"depth": root.depth + 2}]);
}
Controls.Button {
text: "Pop A Page"
anchors.horizontalCenter: parent.horizontalCenter
Layout.alignment: Qt.AlignHCenter
onClicked: pageStack.pop();
}
RowLayout {
anchors.horizontalCenter: parent.horizontalCenter
Layout.alignment: Qt.AlignHCenter
Controls.TextField {
id: edit
text: root.title
......
......@@ -43,6 +43,7 @@
Q_DECL_EXPORT int main(int argc, char *argv[])
{
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
//The desktop QQC2 style needs it to be a QApplication
#ifdef Q_OS_ANDROID
QGuiApplication app(argc, argv);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment