diff options
Diffstat (limited to 'examples')
86 files changed, 224 insertions, 1104 deletions
diff --git a/examples/qml/dynamicscene/content/PaletteItem.qml b/examples/qml/dynamicscene/content/PaletteItem.qml index a74d7b6413..62d6efedc6 100644 --- a/examples/qml/dynamicscene/content/PaletteItem.qml +++ b/examples/qml/dynamicscene/content/PaletteItem.qml @@ -49,7 +49,7 @@ Image { source: image - MouseArea { + MouseArea { anchors.fill: parent onPressed: Code.startDrag(mouse); diff --git a/examples/qml/dynamicscene/content/PerspectiveItem.qml b/examples/qml/dynamicscene/content/PerspectiveItem.qml index 509d29320f..d0d1da9228 100644 --- a/examples/qml/dynamicscene/content/PerspectiveItem.qml +++ b/examples/qml/dynamicscene/content/PerspectiveItem.qml @@ -44,9 +44,9 @@ Image { id: rootItem property bool created: false - property string image + property string image - property double scaledBottom: y + (height + height*scale) / 2 + property double scaledBottom: y + (height + height*scale) / 2 property bool onLand: scaledBottom > (window.height / 2 + window.centerOffset) source: image diff --git a/examples/qml/dynamicscene/content/Sun.qml b/examples/qml/dynamicscene/content/Sun.qml index e2101a252b..5e867e45aa 100644 --- a/examples/qml/dynamicscene/content/Sun.qml +++ b/examples/qml/dynamicscene/content/Sun.qml @@ -49,7 +49,7 @@ Image { source: image onCreatedChanged: { if (created) { - sun.z = 1; // above the sky but below the ground layer + sun.z = 1; // above the sky but below the ground layer window.activeSuns++; // once item is created, start moving offscreen dropYAnim.duration = (window.height + window.centerOffset - sun.y) * 16; diff --git a/examples/qml/dynamicscene/content/itemCreation.js b/examples/qml/dynamicscene/content/itemCreation.js index 40f5415f9f..2829a83410 100644 --- a/examples/qml/dynamicscene/content/itemCreation.js +++ b/examples/qml/dynamicscene/content/itemCreation.js @@ -22,7 +22,7 @@ function loadComponent() { itemComponent = Qt.createComponent(paletteItem.componentFile); if (itemComponent.status == Component.Loading) //Depending on the content, it can be ready or error immediately component.statusChanged.connect(createItem); - else + else createItem(); } diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 5994ab221e..b4d6d827fd 100644 --- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -1,7 +1,7 @@ TEMPLATE = app QT += qml quick network -SOURCES += main.cpp +SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc target.path = $$[QT_INSTALL_EXAMPLES]/qml/networkaccessmanagerfactory diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro index 86c830bda9..602898f1b8 100644 --- a/examples/qml/referenceexamples/adding/adding.pro +++ b/examples/qml/referenceexamples/adding/adding.pro @@ -1,7 +1,7 @@ QT += qml SOURCES += main.cpp \ - person.cpp + person.cpp HEADERS += person.h RESOURCES += adding.qrc diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro index 1225a5fcfd..16b585bc45 100644 --- a/examples/qml/referenceexamples/attached/attached.pro +++ b/examples/qml/referenceexamples/attached/attached.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro index 3c1f9565ed..636d0a10f1 100644 --- a/examples/qml/referenceexamples/binding/binding.pro +++ b/examples/qml/referenceexamples/binding/binding.pro @@ -3,7 +3,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ birthdayparty.cpp \ - happybirthdaysong.cpp + happybirthdaysong.cpp HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp index af60dd329c..6e3a9fcf6d 100644 --- a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp +++ b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp @@ -72,10 +72,10 @@ void HappyBirthdaySong::setName(const QString &name) m_lyrics << "Happy birthday dear " + m_name + ","; m_lyrics << "Happy birthday to you!"; m_lyrics << ""; - + emit nameChanged(); } - + void HappyBirthdaySong::advance() { m_line = (m_line + 1) % m_lyrics.count(); diff --git a/examples/qml/referenceexamples/binding/main.cpp b/examples/qml/referenceexamples/binding/main.cpp index 0d4b13d63f..f09b45fed2 100644 --- a/examples/qml/referenceexamples/binding/main.cpp +++ b/examples/qml/referenceexamples/binding/main.cpp @@ -72,7 +72,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro index c501b9cda2..7fca26c15e 100644 --- a/examples/qml/referenceexamples/coercion/coercion.pro +++ b/examples/qml/referenceexamples/coercion/coercion.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro index db4b88413b..c43867fc4a 100644 --- a/examples/qml/referenceexamples/default/default.pro +++ b/examples/qml/referenceexamples/default/default.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro index b38a1753b9..22d8ded708 100644 --- a/examples/qml/referenceexamples/extended/extended.pro +++ b/examples/qml/referenceexamples/extended/extended.pro @@ -1,7 +1,7 @@ QT += qml widgets SOURCES += main.cpp \ - lineedit.cpp + lineedit.cpp HEADERS += lineedit.h RESOURCES += extended.qrc diff --git a/examples/qml/referenceexamples/extended/lineedit.cpp b/examples/qml/referenceexamples/extended/lineedit.cpp index 522f8074ea..9c916a1bd8 100644 --- a/examples/qml/referenceexamples/extended/lineedit.cpp +++ b/examples/qml/referenceexamples/extended/lineedit.cpp @@ -66,7 +66,7 @@ int LineEditExtension::rightMargin() const return r; } -void LineEditExtension::setRightMargin(int m) +void LineEditExtension::setRightMargin(int m) { int l, r, t, b; m_lineedit->getTextMargins(&l, &t, &r, &b); @@ -80,7 +80,7 @@ int LineEditExtension::topMargin() const return t; } -void LineEditExtension::setTopMargin(int m) +void LineEditExtension::setTopMargin(int m) { int l, r, t, b; m_lineedit->getTextMargins(&l, &t, &r, &b); @@ -94,7 +94,7 @@ int LineEditExtension::bottomMargin() const return b; } -void LineEditExtension::setBottomMargin(int m) +void LineEditExtension::setBottomMargin(int m) { int l, r, t, b; m_lineedit->getTextMargins(&l, &t, &r, &b); diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro index 7014d9680d..ef66ea3e1d 100644 --- a/examples/qml/referenceexamples/grouped/grouped.pro +++ b/examples/qml/referenceexamples/grouped/grouped.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro index c1be0713e6..911a460444 100644 --- a/examples/qml/referenceexamples/methods/methods.pro +++ b/examples/qml/referenceexamples/methods/methods.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro index cd1ffeddcc..0349d44091 100644 --- a/examples/qml/referenceexamples/properties/properties.pro +++ b/examples/qml/referenceexamples/properties/properties.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc diff --git a/examples/qml/referenceexamples/signal/main.cpp b/examples/qml/referenceexamples/signal/main.cpp index 8abb7d4234..dce5f71a9d 100644 --- a/examples/qml/referenceexamples/signal/main.cpp +++ b/examples/qml/referenceexamples/signal/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro index 81692d3676..2dbc8e624b 100644 --- a/examples/qml/referenceexamples/signal/signal.pro +++ b/examples/qml/referenceexamples/signal/signal.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc diff --git a/examples/qml/referenceexamples/valuesource/example.qml b/examples/qml/referenceexamples/valuesource/example.qml index e36cf7fc4f..1357536f5f 100644 --- a/examples/qml/referenceexamples/valuesource/example.qml +++ b/examples/qml/referenceexamples/valuesource/example.qml @@ -54,22 +54,22 @@ BirthdayParty { shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 } } - Boy { - name: "Leo Hodges" + Boy { + name: "Leo Hodges" BirthdayParty.rsvp: "2009-07-06" shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 } } - Boy { - name: "Jack Smith" + Boy { + name: "Jack Smith" shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 } } - Girl { - name: "Anne Brown" + Girl { + name: "Anne Brown" BirthdayParty.rsvp: "2009-07-01" shoe.size: 7 shoe.color: "red" shoe.brand: "Marc Jacobs" - shoe.price: 699.99 + shoe.price: 699.99 } // ![1] diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp index e41e3ea074..50fbea6e3c 100644 --- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp +++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp @@ -70,7 +70,7 @@ void HappyBirthdaySong::setName(const QString &name) m_lyrics << "Happy birthday to you!"; m_lyrics << ""; } - + void HappyBirthdaySong::advance() { m_line = (m_line + 1) % m_lyrics.count(); diff --git a/examples/qml/referenceexamples/valuesource/main.cpp b/examples/qml/referenceexamples/valuesource/main.cpp index a7fba9e95e..ec88333ede 100644 --- a/examples/qml/referenceexamples/valuesource/main.cpp +++ b/examples/qml/referenceexamples/valuesource/main.cpp @@ -73,7 +73,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro index 4ec77ff83b..01cfeeb6d8 100644 --- a/examples/qml/referenceexamples/valuesource/valuesource.pro +++ b/examples/qml/referenceexamples/valuesource/valuesource.pro @@ -3,7 +3,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ birthdayparty.cpp \ - happybirthdaysong.cpp + happybirthdaysong.cpp HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml index 441b7f9b82..c757fdaedd 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml @@ -49,9 +49,9 @@ Item { anchors.centerIn: parent width: 100; height: 100 - pieSlice: PieSlice { + pieSlice: PieSlice { anchors.fill: parent - color: "red" + color: "red" } } diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 6d5c7acb6c..1742334107 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,7 +1,7 @@ QT += qml quick HEADERS += piechart.h \ - pieslice.h + pieslice.h SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/app.qml b/examples/qml/tutorials/extending/chapter5-listproperties/app.qml index a57d1b833f..68aa6e0c1d 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/app.qml +++ b/examples/qml/tutorials/extending/chapter5-listproperties/app.qml @@ -49,17 +49,17 @@ Item { width: 100; height: 100 slices: [ - PieSlice { + PieSlice { anchors.fill: parent color: "red" - fromAngle: 0; angleSpan: 110 + fromAngle: 0; angleSpan: 110 }, - PieSlice { + PieSlice { anchors.fill: parent color: "black" - fromAngle: 110; angleSpan: 50 + fromAngle: 110; angleSpan: 50 }, - PieSlice { + PieSlice { anchors.fill: parent color: "blue" fromAngle: 160; angleSpan: 100 diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index 7cc2b40488..ba51dd9093 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -1,7 +1,7 @@ QT += qml quick HEADERS += piechart.h \ - pieslice.h + pieslice.h SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.qml b/examples/qml/tutorials/extending/chapter6-plugins/app.qml index 417fc6651a..d5a474b8d3 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/app.qml +++ b/examples/qml/tutorials/extending/chapter6-plugins/app.qml @@ -48,17 +48,17 @@ Item { width: 100; height: 100 slices: [ - PieSlice { + PieSlice { anchors.fill: parent color: "red" - fromAngle: 0; angleSpan: 110 + fromAngle: 0; angleSpan: 110 }, - PieSlice { + PieSlice { anchors.fill: parent color: "black" - fromAngle: 110; angleSpan: 50 + fromAngle: 110; angleSpan: 50 }, - PieSlice { + PieSlice { anchors.fill: parent color: "blue" fromAngle: 160; angleSpan: 100 diff --git a/examples/qml/tutorials/extending/extending.pro b/examples/qml/tutorials/extending/extending.pro index 967473fda0..a665975382 100644 --- a/examples/qml/tutorials/extending/extending.pro +++ b/examples/qml/tutorials/extending/extending.pro @@ -6,5 +6,5 @@ SUBDIRS += \ chapter3-bindings \ chapter4-customPropertyTypes \ chapter5-listproperties \ - chapter6-plugins + chapter6-plugins diff --git a/examples/qmltest/qmltest/tst_basic.qml b/examples/qmltest/qmltest/tst_basic.qml index 79bf81ab36..ee157cf155 100644 --- a/examples/qmltest/qmltest/tst_basic.qml +++ b/examples/qmltest/qmltest/tst_basic.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.0 import QtTest 1.0 TestCase { diff --git a/examples/quick/animation/behaviors/SideRect.qml b/examples/quick/animation/behaviors/SideRect.qml index be7dad3466..e8b0bea826 100644 --- a/examples/quick/animation/behaviors/SideRect.qml +++ b/examples/quick/animation/behaviors/SideRect.qml @@ -54,8 +54,8 @@ Rectangle { anchors.fill: parent hoverEnabled: true onEntered: { - focusRect.x = myRect.x; - focusRect.y = myRect.y; + focusRect.x = myRect.x; + focusRect.y = myRect.y; focusRect.text = myRect.text; } } diff --git a/examples/quick/animation/behaviors/tvtennis.qml b/examples/quick/animation/behaviors/tvtennis.qml index 4ca909cd8c..b5ad2e8667 100644 --- a/examples/quick/animation/behaviors/tvtennis.qml +++ b/examples/quick/animation/behaviors/tvtennis.qml @@ -64,7 +64,7 @@ Rectangle { PropertyAction { target: ball; property: "direction"; value: "right" } } - // Make y move with a velocity of 200 + // Make y move with a velocity of 200 Behavior on y { SpringAnimation{ velocity: 200; } } diff --git a/examples/quick/animation/states/states.qml b/examples/quick/animation/states/states.qml index 26acaf7bf0..7f3b840956 100644 --- a/examples/quick/animation/states/states.qml +++ b/examples/quick/animation/states/states.qml @@ -45,7 +45,7 @@ Rectangle { width: 640; height: 480 color: "#343434" - Image { + Image { id: userIcon x: topLeftRect.x; y: topLeftRect.y source: "qt-logo.png" diff --git a/examples/quick/animation/states/transitions.qml b/examples/quick/animation/states/transitions.qml index 8216182c06..e90dde35d8 100644 --- a/examples/quick/animation/states/transitions.qml +++ b/examples/quick/animation/states/transitions.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 /* This is exactly the same as states.qml, except that we have appended - a set of transitions to apply animations when the item changes + a set of transitions to apply animations when the item changes between each state. */ @@ -51,7 +51,7 @@ Rectangle { width: 640; height: 480 color: "#343434" - Image { + Image { id: userIcon x: topLeftRect.x; y: topLeftRect.y source: "qt-logo.png" diff --git a/examples/quick/customitems/flipable/content/Card.qml b/examples/quick/customitems/flipable/content/Card.qml index 776a8ac1b0..c34dfb288c 100644 --- a/examples/quick/customitems/flipable/content/Card.qml +++ b/examples/quick/customitems/flipable/content/Card.qml @@ -49,7 +49,7 @@ Flipable { property int yAxis: 0 property int angle: 0 - width: front.width; height: front.height + width: front.width; height: front.height front: Image { id: frontImage } back: Image { source: "back.png" } diff --git a/examples/quick/customitems/flipable/flipable.qml b/examples/quick/customitems/flipable/flipable.qml index f47444a64d..5e809c2085 100644 --- a/examples/quick/customitems/flipable/flipable.qml +++ b/examples/quick/customitems/flipable/flipable.qml @@ -43,7 +43,7 @@ import "content" Rectangle { id: window - + width: 480; height: 320 color: "darkgreen" diff --git a/examples/quick/customitems/searchbox/SearchBox.qml b/examples/quick/customitems/searchbox/SearchBox.qml index cab0058bce..306640ec4d 100644 --- a/examples/quick/customitems/searchbox/SearchBox.qml +++ b/examples/quick/customitems/searchbox/SearchBox.qml @@ -66,7 +66,7 @@ FocusScope { font.italic: true } - MouseArea { + MouseArea { anchors.fill: parent onClicked: { focusScope.focus = true; Qt.inputMethod.show(); } } @@ -84,7 +84,7 @@ FocusScope { source: "images/clear.png" opacity: 0 - MouseArea { + MouseArea { anchors.fill: parent onClicked: { textInput.text = ''; focusScope.focus = true; textInput.openSoftwareInputPanel(); } } diff --git a/examples/quick/customitems/slideswitch/content/Switch.qml b/examples/quick/customitems/slideswitch/content/Switch.qml index 889ceb27bc..51b7185b72 100644 --- a/examples/quick/customitems/slideswitch/content/Switch.qml +++ b/examples/quick/customitems/slideswitch/content/Switch.qml @@ -53,7 +53,7 @@ Item { function toggle() { if (toggleswitch.state == "on") toggleswitch.state = "off"; - else + else toggleswitch.state = "on"; } //![2] diff --git a/examples/quick/demos/tweetsearch/content/FlipBar.qml b/examples/quick/demos/tweetsearch/content/FlipBar.qml index 4b6cd48f93..729bf68c5a 100644 --- a/examples/quick/demos/tweetsearch/content/FlipBar.qml +++ b/examples/quick/demos/tweetsearch/content/FlipBar.qml @@ -59,7 +59,7 @@ Item { width: cur.width height: cur.height - onFrontChanged: resync(); + onFrontChanged: resync(); onBackChanged: resync(); function resync() {//TODO: Are the items ever actually visible? @@ -128,7 +128,7 @@ Item { sourceItem: back hideSource: effect.visible } - + fragmentShader: " uniform lowp float qt_Opacity; uniform sampler2D sourceA; diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quick/dialogs/dialogs.pro deleted file mode 100644 index 538e75686c..0000000000 --- a/examples/quick/dialogs/dialogs.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = \ - systemdialogs diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml deleted file mode 100644 index 0cb42a01aa..0000000000 --- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Dialogs 1.0 -import "../../shared" - -Rectangle { - width: 320 - height: 240 - color: palette.window - SystemPalette { id: palette } - clip: true - - //! [colordialog] - ColorDialog { - id: colorDialog - visible: colorDialogVisible.checked - modality: colorDialogModal.checked ? Qt.WindowModal : Qt.NonModal - title: "Choose a color" - color: "green" - showAlphaChannel: colorDialogAlpha.checked - onAccepted: { console.log("Accepted: " + color) } - onRejected: { console.log("Rejected") } - } - //! [colordialog] - - Column { - anchors.fill: parent - anchors.margins: 12 - spacing: 8 - Text { - font.bold: true - text: "Color dialog properties:" - } - CheckBox { - id: colorDialogModal - text: "Modal" - checked: true - Binding on checked { value: colorDialog.modality != Qt.NonModal } - } - CheckBox { - id: colorDialogAlpha - text: "Show alpha channel" - Binding on checked { value: colorDialog.showAlphaChannel } - } - CheckBox { - id: colorDialogVisible - text: "Visible" - Binding on checked { value: colorDialog.visible } - } - Row { - id: colorRow - spacing: parent.spacing - height: colorLabel.implicitHeight * 2.0 - Rectangle { - color: colorDialog.color - height: parent.height - width: height * 2 - border.color: "black" - MouseArea { - anchors.fill: parent - onClicked: colorDialog.open() - } - } - Text { - id: colorLabel - color: palette.windowText - text: "<b>current color:</b> " + colorDialog.color - anchors.verticalCenter: parent.verticalCenter - } - } - } - - Rectangle { - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - } - height: buttonRow.height * 1.2 - color: Qt.darker(palette.window, 1.1) - border.color: Qt.darker(palette.window, 1.3) - Row { - id: buttonRow - spacing: 6 - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 12 - height: implicitHeight - width: parent.width - Button { - text: "Open" - anchors.verticalCenter: parent.verticalCenter - onClicked: colorDialog.open() - } - Button { - text: "Close" - anchors.verticalCenter: parent.verticalCenter - onClicked: colorDialog.close() - } - Button { - text: "set to green" - anchors.verticalCenter: parent.verticalCenter - onClicked: colorDialog.color = "green" - } - } - } -} diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml deleted file mode 100644 index d6ee1a13ca..0000000000 --- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml +++ /dev/null @@ -1,180 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Dialogs 1.0 -import QtQuick.Window 2.0 -import "../../shared" - -Rectangle { - width: 580 - height: 400 - color: palette.window - SystemPalette { id: palette } - clip: true - - //! [filedialog] - FileDialog { - id: fileDialog - visible: fileDialogVisible.checked - modality: fileDialogModal.checked ? Qt.WindowModal : Qt.NonModal - title: fileDialogSelectFolder.checked ? "Choose a folder" : - (fileDialogSelectMultiple.checked ? "Choose some files" : "Choose a file") - selectExisting: fileDialogSelectExisting.checked - selectMultiple: fileDialogSelectMultiple.checked - selectFolder: fileDialogSelectFolder.checked - nameFilters: [ "Image files (*.png *.jpg)", "All files (*)" ] - selectedNameFilter: "All files (*)" - onAccepted: { - console.log("Accepted: " + fileUrls) - if (fileDialogOpenFiles.checked) - for (var i = 0; i < fileUrls.length; ++i) - Qt.openUrlExternally(fileUrls[i]) - } - onRejected: { console.log("Rejected") } - } - //! [filedialog] - - Column { - anchors.fill: parent - anchors.margins: 12 - spacing: 8 - Text { - color: palette.windowText - font.bold: true - text: "File dialog properties:" - } - CheckBox { - id: fileDialogModal - text: "Modal" - checked: true - Binding on checked { value: fileDialog.modality != Qt.NonModal } - } - CheckBox { - id: fileDialogSelectFolder - text: "Select Folder" - Binding on checked { value: fileDialog.selectFolder } - } - CheckBox { - id: fileDialogSelectExisting - text: "Select Existing Files" - checked: true - Binding on checked { value: fileDialog.selectExisting } - } - CheckBox { - id: fileDialogSelectMultiple - text: "Select Multiple Files" - Binding on checked { value: fileDialog.selectMultiple } - } - CheckBox { - id: fileDialogOpenFiles - text: "Open Files After Accepting" - } - CheckBox { - id: fileDialogVisible - text: "Visible" - Binding on checked { value: fileDialog.visible } - } - Text { - color: palette.windowText - text: "<b>current view folder:</b> " + fileDialog.folder - } - Text { - color: palette.windowText - text: "<b>name filters:</b> {" + fileDialog.nameFilters + "}" - width: parent.width - wrapMode: Text.Wrap - } - Text { - color: palette.windowText - text: "<b>current filter:</b>" + fileDialog.selectedNameFilter - width: parent.width - wrapMode: Text.Wrap - } - Text { - color: palette.windowText - text: "<b>chosen files:</b> " + fileDialog.fileUrls - width: parent.width - wrapMode: Text.Wrap - } - Text { - color: palette.windowText - text: "<b>chosen single path:</b> " + fileDialog.fileUrl - width: parent.width - wrapMode: Text.Wrap - } - } - - Rectangle { - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - } - height: buttonRow.height * 1.2 - color: Qt.darker(palette.window, 1.1) - border.color: Qt.darker(palette.window, 1.3) - Row { - id: buttonRow - spacing: 6 - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 12 - height: implicitHeight - width: parent.width - Button { - text: "Open" - anchors.verticalCenter: parent.verticalCenter - onClicked: fileDialog.open() - } - Button { - text: "Close" - anchors.verticalCenter: parent.verticalCenter - onClicked: fileDialog.close() - } - Button { - text: "go to /tmp" - anchors.verticalCenter: parent.verticalCenter - // TODO: QTBUG-29814 This isn't portable, but we don't expose QDir::tempPath to QML yet. - onClicked: fileDialog.folder = (Qt.platform.os === "windows" ? "/c:/temp" : "/tmp") - } - } - } -} diff --git a/examples/quick/dialogs/systemdialogs/FontDialogs.qml b/examples/quick/dialogs/systemdialogs/FontDialogs.qml deleted file mode 100644 index 7d4328994b..0000000000 --- a/examples/quick/dialogs/systemdialogs/FontDialogs.qml +++ /dev/null @@ -1,153 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.2 -import QtQuick.Dialogs 1.1 -import "../../shared" - -Rectangle { - width: 320 - height: 360 - color: palette.window - SystemPalette { id: palette } - clip: true - - FontDialog { - id: fontDialog - visible: fontDialogVisible.checked - modality: fontDialogModal.checked ? Qt.WindowModal : Qt.NonModal - scalableFonts: fontDialogScalableFonts.checked - nonScalableFonts: fontDialogNonScalableFonts.checked - monospacedFonts: fontDialogMonospacedFonts.checked - proportionalFonts: fontDialogProportionalFonts.checked - title: "Choose a font" - font: Qt.font({ family: "Arial", pointSize: 24, weight: Font.Normal }) - onAccepted: { console.log("Accepted: " + font) } - onRejected: { console.log("Rejected") } - } - - Column { - id: optionsColumn - anchors.fill: parent - anchors.margins: 12 - spacing: 8 - Text { - font.bold: true - text: "Font dialog properties:" - } - CheckBox { - id: fontDialogModal - text: "Modal" - checked: true - Binding on checked { value: fontDialog.modality != Qt.NonModal } - } - CheckBox { - id: fontDialogScalableFonts - text: "Scalable fonts" - Binding on checked { value: fontDialog.scalableFonts } - } - CheckBox { - id: fontDialogNonScalableFonts - text: "Non scalable fonts" - Binding on checked { value: fontDialog.nonScalableFonts } - } - CheckBox { - id: fontDialogMonospacedFonts - text: "Monospaced fonts" - Binding on checked { value: fontDialog.monospacedFonts } - } - CheckBox { - id: fontDialogProportionalFonts - text: "Proportional fonts" - Binding on checked { value: fontDialog.proportionalFonts } - } - CheckBox { - id: fontDialogVisible - text: "Visible" - Binding on checked { value: fontDialog.visible } - } - Text { - text: "Current font:" - } - Text { - id: fontLabel - color: palette.windowText - text: "<b>" + fontDialog.font.family + " - " + fontDialog.font.pointSize + "</b>" - MouseArea { - anchors.fill: parent - onClicked: fontDialog.open() - } - } - } - - Rectangle { - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - } - height: buttonRow.height * 1.2 - color: Qt.darker(palette.window, 1.1) - border.color: Qt.darker(palette.window, 1.3) - Row { - id: buttonRow - spacing: 6 - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 12 - width: parent.width - Button { - text: "Open" - anchors.verticalCenter: parent.verticalCenter - onClicked: fontDialog.open() - } - Button { - text: "Close" - anchors.verticalCenter: parent.verticalCenter - onClicked: fontDialog.close() - } - Button { - text: "set to default" - anchors.verticalCenter: parent.verticalCenter - onClicked: fontDialog.font = Qt.font({ family: "Arial", pointSize: 24, weight: Font.Normal }) - } - } - } -} diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml deleted file mode 100644 index 9c70228046..0000000000 --- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml +++ /dev/null @@ -1,307 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.1 -import QtQuick.Dialogs 1.1 -import QtQuick.Window 2.0 -import "../../shared" - -Rectangle { - width: 580 - height: 400 - color: palette.window - SystemPalette { id: palette } - clip: true - - //! [messagedialog] - MessageDialog { - id: messageDialog - visible: messageDialogVisible.checked - modality: messageDialogModal.checked ? Qt.WindowModal : Qt.NonModal - title: windowTitleField.text - text: customizeText.checked ? textField.text : "" - informativeText: customizeInformativeText.checked ? informativeTextField.text : "" - detailedText: customizeDetailedText.checked ? detailedTextField.text : "" - onButtonClicked: console.log("clicked button " + clickedButton) - onAccepted: lastChosen.text = "Accepted " + - (clickedButton == StandardButton.Ok ? "(OK)" : (clickedButton == StandardButton.Retry ? "(Retry)" : "(Ignore)")) - onRejected: lastChosen.text = "Rejected " + - (clickedButton == StandardButton.Close ? "(Close)" : (clickedButton == StandardButton.Abort ? "(Abort)" : "(Cancel)")) - onHelp: lastChosen.text = "Yelped for help!" - onYes: lastChosen.text = (clickedButton == StandardButton.Yes ? "Yeessss!!" : "Yes, now and always") - onNo: lastChosen.text = (clickedButton == StandardButton.No ? "Oh No." : "No, no, a thousand times no!") - onApply: lastChosen.text = "Apply" - onReset: lastChosen.text = "Reset" - } - //! [messagedialog] - - Column { - anchors.fill: parent - anchors.margins: 12 - spacing: 8 - Text { - color: palette.windowText - font.bold: true - text: "Message dialog properties:" - } - CheckBox { - id: messageDialogModal - text: "Modal" - checked: true - Binding on checked { value: messageDialog.modality != Qt.NonModal } - } - CheckBox { - id: customizeTitle - text: "Window Title" - checked: true - width: parent.width - TextField { - id: windowTitleField - anchors.right: parent.right - width: informativeTextField.width - text: "Alert" - } - } - Row { - spacing: 8 - property bool updating: false - function updateIcon(icon, checked) { - if (updating) return - updating = true - messageDialog.icon = (checked ? icon : StandardIcon.NoIcon) - for (var i = 0; i < children.length; ++i) - if (children[i].icon !== icon) - children[i].checked = false - updating = false - } - - CheckBox { - id: iconInformation - text: "Information" - property int icon: StandardIcon.Information - onCheckedChanged: parent.updateIcon(icon, checked) - } - - CheckBox { - id: iconWarning - text: "Warning" - checked: true - property int icon: StandardIcon.Warning - onCheckedChanged: parent.updateIcon(icon, checked) - Component.onCompleted: parent.updateIcon(icon, true) - } - - CheckBox { - id: iconCritical - text: "Critical" - property int icon: StandardIcon.Critical - onCheckedChanged: parent.updateIcon(icon, checked) - } - - CheckBox { - id: iconQuestion - text: "Question" - property int icon: StandardIcon.Question - onCheckedChanged: parent.updateIcon(icon, checked) - } - } - - CheckBox { - id: customizeText - text: "Primary Text" - checked: true - width: parent.width - TextField { - id: textField - anchors.right: parent.right - width: informativeTextField.width - text: "Attention Please" - } - } - CheckBox { - id: customizeInformativeText - text: "Informative Text" - checked: true - width: parent.width - TextField { - id: informativeTextField - anchors.right: parent.right - width: parent.width - parent.row.spacing - parent.row.width - text: "Be alert!" - } - } - Text { - text: "Buttons:" - } - Flow { - spacing: 8 - width: parent.width - property bool updating: false - function updateButtons(button, checked) { - if (updating) return - updating = true - var buttons = 0 - for (var i = 0; i < children.length; ++i) - if (children[i].checked) - buttons |= children[i].button - if (!buttons) - buttons = StandardButton.Ok - messageDialog.standardButtons = buttons - updating = false - } - - CheckBox { - text: "Help" - property int button: StandardButton.Help - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "Abort" - property int button: StandardButton.Abort - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "Close" - property int button: StandardButton.Close - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "Cancel" - property int button: StandardButton.Cancel - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "NoToAll" - property int button: StandardButton.NoToAll - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "No" - property int button: StandardButton.No - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "YesToAll" - property int button: StandardButton.YesToAll - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "Yes" - property int button: StandardButton.Yes - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "Ignore" - property int button: StandardButton.Ignore - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "Retry" - property int button: StandardButton.Retry - onCheckedChanged: parent.updateButtons(button, checked) - } - - CheckBox { - text: "OK" - checked: true - property int button: StandardButton.Ok - onCheckedChanged: parent.updateButtons(button, checked) - } - } - CheckBox { - id: customizeDetailedText - text: "Detailed Text" - checked: true - width: parent.width - TextField { - id: detailedTextField - anchors.right: parent.right - width: informativeTextField.width - text: "The world needs more lerts." - } - } - CheckBox { - id: messageDialogVisible - text: "Visible" - Binding on checked { value: messageDialog.visible } - } - Text { - id: lastChosen - } - } - - Rectangle { - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - } - height: buttonRow.height * 1.2 - color: Qt.darker(palette.window, 1.1) - border.color: Qt.darker(palette.window, 1.3) - Row { - id: buttonRow - spacing: 6 - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 12 - width: parent.width - Button { - text: "Open" - anchors.verticalCenter: parent.verticalCenter - onClicked: messageDialog.open() - } - Button { - text: "Close" - anchors.verticalCenter: parent.verticalCenter - onClicked: messageDialog.close() - } - } - } -} diff --git a/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg b/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg Binary files differdeleted file mode 100644 index 4517a39308..0000000000 --- a/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg +++ /dev/null diff --git a/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc b/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc deleted file mode 100644 index 9788be7343..0000000000 --- a/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ -/*! - \title Qt Quick System Dialog Examples - \example systemdialogs - \brief This example demonstrates the system dialog types in QML - \image systemdialogs-example.jpg - \ingroup qtquickdialog_examples - - This example demonstrates the system dialogs in the \l{Qt Quick Dialogs} - module. The appearance and behavior is platform-dependent. - - A \l FileDialog is used to choose a single file, multiple files or a - single directory, depending on how it is configured. - \snippet systemdialogs/FileDialogs.qml filedialog - - A \l ColorDialog is used to choose a color, with or without alpha (transparency) - depending on how it is configured. - \snippet systemdialogs/ColorDialogs.qml colordialog - - The example can be built as a standalone executable, but each - type of dialog is demonstrated in a separate QML file which can - also be run separately with qmlscene. -*/ diff --git a/examples/quick/dialogs/systemdialogs/main.cpp b/examples/quick/dialogs/systemdialogs/main.cpp deleted file mode 100644 index f6723bb35b..0000000000 --- a/examples/quick/dialogs/systemdialogs/main.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dialogs/systemdialogs/systemdialogs) diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quick/dialogs/systemdialogs/systemdialogs.pro deleted file mode 100644 index 323ea2fac7..0000000000 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp -RESOURCES += systemdialogs.qrc ../../shared/shared.qrc - -OTHER_FILES += \ - systemdialogs.qml \ - FileDialogs.qml \ - ColorDialogs.qml \ - FontDialogs.qml \ - MessageDialogs.qml - -target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs/systemdialogs -INSTALLS += target diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc deleted file mode 100644 index 2193088cb9..0000000000 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc +++ /dev/null @@ -1,9 +0,0 @@ -<RCC> - <qresource prefix="/dialogs/systemdialogs"> - <file>systemdialogs.qml</file> - <file>FileDialogs.qml</file> - <file>ColorDialogs.qml</file> - <file>FontDialogs.qml</file> - <file>MessageDialogs.qml</file> - </qresource> -</RCC> diff --git a/examples/quick/imageelements/content/ImageCell.qml b/examples/quick/imageelements/content/ImageCell.qml index 4b3fee3522..d7679e3fff 100644 --- a/examples/quick/imageelements/content/ImageCell.qml +++ b/examples/quick/imageelements/content/ImageCell.qml @@ -52,7 +52,7 @@ Item { clip: true // only makes a difference if mode is PreserveAspectCrop } - Text { + Text { id: captionItem anchors.horizontalCenter: parent.horizontalCenter; anchors.bottom: parent.bottom } diff --git a/examples/quick/imageprovider/imageprovider.cpp b/examples/quick/imageprovider/imageprovider.cpp index 873b812d8a..31290578fc 100644 --- a/examples/quick/imageprovider/imageprovider.cpp +++ b/examples/quick/imageprovider/imageprovider.cpp @@ -63,7 +63,7 @@ public: if (size) *size = QSize(width, height); QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width, - requestedSize.height() > 0 ? requestedSize.height() : height); + requestedSize.height() > 0 ? requestedSize.height() : height); pixmap.fill(QColor(id).rgba()); //![0] diff --git a/examples/quick/keyinteraction/focus/Core/ContextMenu.qml b/examples/quick/keyinteraction/focus/Core/ContextMenu.qml index 3bbce04b07..ff69f0b81d 100644 --- a/examples/quick/keyinteraction/focus/Core/ContextMenu.qml +++ b/examples/quick/keyinteraction/focus/Core/ContextMenu.qml @@ -54,7 +54,7 @@ FocusScope { focus: true Keys.onRightPressed: mainView.focus = true - Text { + Text { anchors { top: parent.top; horizontalCenter: parent.horizontalCenter; margins: 30 } color: "black" font.pixelSize: 14 diff --git a/examples/quick/keyinteraction/focus/Core/GridMenu.qml b/examples/quick/keyinteraction/focus/Core/GridMenu.qml index 0fba859466..22016c37d2 100644 --- a/examples/quick/keyinteraction/focus/Core/GridMenu.qml +++ b/examples/quick/keyinteraction/focus/Core/GridMenu.qml @@ -44,7 +44,7 @@ FocusScope { property alias interactive: gridView.interactive onActiveFocusChanged: { - if (activeFocus) + if (activeFocus) mainView.state = "showGridViews" } diff --git a/examples/quick/keyinteraction/focus/Core/ListMenu.qml b/examples/quick/keyinteraction/focus/Core/ListMenu.qml index 27ed804f63..8ca751b7f1 100644 --- a/examples/quick/keyinteraction/focus/Core/ListMenu.qml +++ b/examples/quick/keyinteraction/focus/Core/ListMenu.qml @@ -44,7 +44,7 @@ FocusScope { clip: true onActiveFocusChanged: { - if (activeFocus) + if (activeFocus) mainView.state = "showListViews" } diff --git a/examples/quick/keyinteraction/focus/Core/TabMenu.qml b/examples/quick/keyinteraction/focus/Core/TabMenu.qml index a803e5289b..470252f4da 100644 --- a/examples/quick/keyinteraction/focus/Core/TabMenu.qml +++ b/examples/quick/keyinteraction/focus/Core/TabMenu.qml @@ -42,7 +42,7 @@ import QtQuick 2.1 FocusScope { onActiveFocusChanged: { - if (activeFocus) + if (activeFocus) mainView.state = "showTabViews" } diff --git a/examples/quick/keyinteraction/focus/focus.qml b/examples/quick/keyinteraction/focus/focus.qml index 4e58d4b8cc..11139cd361 100644 --- a/examples/quick/keyinteraction/focus/focus.qml +++ b/examples/quick/keyinteraction/focus/focus.qml @@ -43,7 +43,7 @@ import "Core" Rectangle { id: window - + width: 800; height: 640 color: "#3E606F" @@ -73,11 +73,11 @@ Rectangle { activeFocusOnTab: true } - Rectangle { + Rectangle { id: shade anchors.fill: parent color: "black" - opacity: 0 + opacity: 0 } states: [ diff --git a/examples/quick/models/abstractitemmodel/model.h b/examples/quick/models/abstractitemmodel/model.h index be6a6b4933..b90e8ef039 100644 --- a/examples/quick/models/abstractitemmodel/model.h +++ b/examples/quick/models/abstractitemmodel/model.h @@ -41,7 +41,7 @@ #include <QStringList> //![0] -class Animal +class Animal { public: Animal(const QString &type, const QString &size); diff --git a/examples/quick/models/stringlistmodel/stringlistmodel.pro b/examples/quick/models/stringlistmodel/stringlistmodel.pro index 2d1f99d4ed..fe561083f7 100644 --- a/examples/quick/models/stringlistmodel/stringlistmodel.pro +++ b/examples/quick/models/stringlistmodel/stringlistmodel.pro @@ -1,6 +1,6 @@ QT += qml quick -SOURCES += main.cpp +SOURCES += main.cpp RESOURCES += stringlistmodel.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/models/stringlistmodel diff --git a/examples/quick/particles/affectors/content/spritegoal.qml b/examples/quick/particles/affectors/content/spritegoal.qml index ab108bb065..f5702fb9a7 100644 --- a/examples/quick/particles/affectors/content/spritegoal.qml +++ b/examples/quick/particles/affectors/content/spritegoal.qml @@ -149,7 +149,7 @@ Item { Item { id: circle - x: root.width / 1.2 + x: root.width / 1.2 y: root.height / 1.7 property real percent: 0 @@ -167,7 +167,7 @@ Item { } ImageParticle { - z:0 + z:0 system: sys groups: ["exhaust"] source: "qrc:///particleresources/fuzzydot.png" @@ -199,7 +199,7 @@ Item { lifeSpan: 500 y: holder.y - x: holder.x + x: holder.x velocity: PointDirection { xVariation: 40; yVariation: 40; } velocityFromMovement: 16 diff --git a/examples/quick/particles/affectors/content/wander.qml b/examples/quick/particles/affectors/content/wander.qml index f28aa03459..da0dcf261e 100644 --- a/examples/quick/particles/affectors/content/wander.qml +++ b/examples/quick/particles/affectors/content/wander.qml @@ -57,7 +57,7 @@ Rectangle { } //! [0] - Wander { + Wander { id: wanderer system: particles anchors.fill: parent diff --git a/examples/quick/particles/customparticle/content/blurparticles.qml b/examples/quick/particles/customparticle/content/blurparticles.qml index a5abb07ce6..583d5c251c 100644 --- a/examples/quick/particles/customparticle/content/blurparticles.qml +++ b/examples/quick/particles/customparticle/content/blurparticles.qml @@ -67,14 +67,14 @@ Rectangle { } CustomParticle { - system: sys + system: sys //! [vertex] vertexShader:" uniform lowp float qt_Opacity; varying lowp float fFade; varying lowp float fBlur; - void main() { + void main() { defaultMain(); highp float t = (qt_Timestamp - qt_ParticleData.x) / qt_ParticleData.y; highp float fadeIn = min(t * 10., 1.); diff --git a/examples/quick/particles/customparticle/content/fragmentshader.qml b/examples/quick/particles/customparticle/content/fragmentshader.qml index ed61720419..04646f811e 100644 --- a/examples/quick/particles/customparticle/content/fragmentshader.qml +++ b/examples/quick/particles/customparticle/content/fragmentshader.qml @@ -73,7 +73,7 @@ ParticleSystem { varying lowp float fFade; varying highp vec2 fPos; - void main() { + void main() { qt_TexCoord0 = qt_ParticleTex; highp float size = qt_ParticleData.z; highp float endSize = qt_ParticleData.w; diff --git a/examples/quick/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml index 3fb4c9f378..0702e33a2d 100644 --- a/examples/quick/particles/customparticle/content/imagecolors.qml +++ b/examples/quick/particles/customparticle/content/imagecolors.qml @@ -81,7 +81,7 @@ Rectangle { varying lowp float fFade; uniform lowp float qt_Opacity; - void main() { + void main() { fTex2 = vec2(qt_ParticlePos.x, qt_ParticlePos.y); //Uncomment this next line for each particle to use full texture, instead of the solid color at the center of the particle. diff --git a/examples/quick/particles/imageparticle/content/allatonce.qml b/examples/quick/particles/imageparticle/content/allatonce.qml index 737b6955e2..068093cc19 100644 --- a/examples/quick/particles/imageparticle/content/allatonce.qml +++ b/examples/quick/particles/imageparticle/content/allatonce.qml @@ -46,7 +46,7 @@ Rectangle { width: 640 height: 480 ParticleSystem { - id: sys + id: sys } ImageParticle { diff --git a/examples/quick/particles/itemparticle/content/Delegate2.qml b/examples/quick/particles/itemparticle/content/Delegate2.qml index ba6d725a45..d4cb81261d 100644 --- a/examples/quick/particles/itemparticle/content/Delegate2.qml +++ b/examples/quick/particles/itemparticle/content/Delegate2.qml @@ -43,7 +43,7 @@ import QtQuick 2.0 //![0] Package { Item { id: gridDelegate; width: w; height: h; Package.name: 'grid' } - Item { id: particleDelegate; width: w; height: h; Package.name: 'particles' + Item { id: particleDelegate; width: w; height: h; Package.name: 'particles' Rectangle { id: wrapper diff --git a/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml index c2a679b4ef..28e490787c 100644 --- a/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml +++ b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml @@ -103,7 +103,7 @@ import "../../../modelviews/listview/content" width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } @@ -185,7 +185,7 @@ import "../../../modelviews/listview/content" } transitions: Transition { - //The only strictly necessary particle specific lines + //The only strictly necessary particle specific lines to: "Details" reversible: true ScriptAction {script: { diff --git a/examples/quick/particles/itemparticle/particleview.qml b/examples/quick/particles/itemparticle/particleview.qml index 2637e13107..89dcf61a05 100644 --- a/examples/quick/particles/itemparticle/particleview.qml +++ b/examples/quick/particles/itemparticle/particleview.qml @@ -224,7 +224,7 @@ Item { anchors.centerIn: parent antialiasing: true; source: "http://" + Script.getImagePath(content); cache: true - fillMode: Image.PreserveAspectFit; + fillMode: Image.PreserveAspectFit; width: parent.width-4; height: parent.height-4 onStatusChanged: if (img.status == Image.Ready) { loading.opacity = 0; diff --git a/examples/quick/positioners/positioners-transitions.qml b/examples/quick/positioners/positioners-transitions.qml index 64ee15af32..8341d6c442 100644 --- a/examples/quick/positioners/positioners-transitions.qml +++ b/examples/quick/positioners/positioners-transitions.qml @@ -73,7 +73,7 @@ Rectangle { width: 100; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -86,7 +86,7 @@ Rectangle { width: 100; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -129,7 +129,7 @@ Rectangle { width: 50; height: 100 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -161,7 +161,7 @@ Rectangle { width: 50; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -174,7 +174,7 @@ Rectangle { width: 50; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -187,7 +187,7 @@ Rectangle { width: 50; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -226,7 +226,7 @@ Rectangle { width: 60; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } @@ -239,20 +239,20 @@ Rectangle { width: 60; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 } - Rectangle { + Rectangle { id: blueF3 visible: opacity != 0 width: 40; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } opacity: effectiveOpacity } diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 027faaa4c9..1f96111b04 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -21,7 +21,6 @@ SUBDIRS = quick-accessibility \ customitems \ imageprovider \ window \ - dialogs \ particles \ demos diff --git a/examples/quick/text/textselection/textselection.qml b/examples/quick/text/textselection/textselection.qml index 80ce532369..047a3e7b79 100644 --- a/examples/quick/text/textselection/textselection.qml +++ b/examples/quick/text/textselection/textselection.qml @@ -137,9 +137,9 @@ Rectangle { Text { anchors.centerIn: parent; text: "Cut" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { edit.cut(); editor.state = "" } + onClicked: { edit.cut(); editor.state = "" } } } @@ -152,9 +152,9 @@ Rectangle { Text { anchors.centerIn: parent; text: "Copy" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { edit.copy(); editor.state = "selection" } + onClicked: { edit.copy(); editor.state = "selection" } } } @@ -167,9 +167,9 @@ Rectangle { Text { anchors.centerIn: parent; text: "Paste" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { edit.paste(); edit.cursorPosition = edit.selectionEnd; editor.state = "" } + onClicked: { edit.paste(); edit.cursorPosition = edit.selectionEnd; editor.state = "" } } } @@ -182,13 +182,13 @@ Rectangle { Text { anchors.centerIn: parent; text: "Deselect" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { + onClicked: { edit.cursorPosition = edit.selectionEnd; edit.deselect(); - editor.state = "" - } + editor.state = "" + } } } } diff --git a/examples/quick/touchinteraction/flickable/corkboards.qml b/examples/quick/touchinteraction/flickable/corkboards.qml index 34b0e3108a..3f04c49073 100644 --- a/examples/quick/touchinteraction/flickable/corkboards.qml +++ b/examples/quick/touchinteraction/flickable/corkboards.qml @@ -50,13 +50,13 @@ Rectangle { ListElement { name: "Panel One" - notes: [ + notes: [ ListElement { noteText: "Tap to edit" }, ListElement { noteText: "Drag to move" }, ListElement { noteText: "Flick to scroll" } ] } - + ListElement { name: "Panel Two" notes: [ diff --git a/examples/quick/tutorials/samegame/samegame1/samegame.qml b/examples/quick/tutorials/samegame/samegame1/samegame.qml index 83ab84a4cf..fa87d85f97 100644 --- a/examples/quick/tutorials/samegame/samegame1/samegame.qml +++ b/examples/quick/tutorials/samegame/samegame1/samegame.qml @@ -68,7 +68,7 @@ Rectangle { Button { anchors { left: parent.left; verticalCenter: parent.verticalCenter } - text: "New Game" + text: "New Game" onClicked: console.log("This doesn't do anything yet...") } diff --git a/examples/quick/tutorials/samegame/samegame3/Block.qml b/examples/quick/tutorials/samegame/samegame3/Block.qml index cd382f85b8..ff62bb5ec4 100644 --- a/examples/quick/tutorials/samegame/samegame3/Block.qml +++ b/examples/quick/tutorials/samegame/samegame3/Block.qml @@ -53,7 +53,7 @@ Item { source: { if (type == 0) return "../shared/pics/redStone.png"; - else if (type == 1) + else if (type == 1) return "../shared/pics/blueStone.png"; else return "../shared/pics/greenStone.png"; diff --git a/examples/quick/tutorials/samegame/samegame3/samegame.js b/examples/quick/tutorials/samegame/samegame3/samegame.js index df5bdfb049..01edc5bd41 100644 --- a/examples/quick/tutorials/samegame/samegame3/samegame.js +++ b/examples/quick/tutorials/samegame/samegame3/samegame.js @@ -160,7 +160,7 @@ function victoryCheck() { } //![2] -//only floods up and right, to see if it can find adjacent same-typed blocks +//only floods up and right, to see if it can find adjacent same-typed blocks function floodMoveCheck(column, row, type) { if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) return false; diff --git a/examples/quick/tutorials/samegame/samegame4/content/samegame.js b/examples/quick/tutorials/samegame/samegame4/content/samegame.js index 7f1c976480..80b175d450 100755 --- a/examples/quick/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/quick/tutorials/samegame/samegame4/content/samegame.js @@ -177,7 +177,7 @@ function victoryCheck() { } //![4] -//only floods up and right, to see if it can find adjacent same-typed blocks +//only floods up and right, to see if it can find adjacent same-typed blocks function floodMoveCheck(column, row, type) { if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) return false; diff --git a/examples/quick/tutorials/samegame/samegame4/highscores/scores.php b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php index daf480e21b..86e4187acd 100755 --- a/examples/quick/tutorials/samegame/samegame4/highscores/scores.php +++ b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php @@ -8,8 +8,8 @@ $time = $_POST["time"]; if($name == "") $name = "Anonymous"; - $file = fopen("score_data.xml", "a"); - $ret = fwrite($file, "<record><score>". $score . "</score><name>" + $file = fopen("score_data.xml", "a"); + $ret = fwrite($file, "<record><score>". $score . "</score><name>" . $name . "</name><gridSize>" . $grid . "</gridSize><seconds>" . $time . "</seconds></record>\n"); echo "Your score has been recorded. Thanks for playing!"; @@ -18,7 +18,7 @@ }else{#Read high score list #Now uses XSLT to display. So just print the file. With XML cruft added. #Note that firefox at least won't apply the XSLT on a php file. So redirecting - $file = fopen("scores.xml", "w"); + $file = fopen("scores.xml", "w"); $ret = fwrite($file, '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<?xml-stylesheet type="text/xsl" href="score_style.xsl"?>' . "\n" . "<records>\n" . file_get_contents("score_data.xml") . "</records>\n"); diff --git a/examples/quick/views/listview/content/RecipesModel.qml b/examples/quick/views/listview/content/RecipesModel.qml index 0cdb8919b6..9830aa60d0 100644 --- a/examples/quick/views/listview/content/RecipesModel.qml +++ b/examples/quick/views/listview/content/RecipesModel.qml @@ -44,20 +44,20 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> - <ul> - <li> 1 cup (150g) self-raising flour - <li> 1 tbs caster sugar - <li> 3/4 cup (185ml) milk - <li> 1 egg - </ul> + ingredients: "<html> + <ul> + <li> 1 cup (150g) self-raising flour + <li> 1 tbs caster sugar + <li> 3/4 cup (185ml) milk + <li> 1 egg + </ul> </html>" - method: "<html> - <ol> - <li> Sift flour and sugar together into a bowl. Add a pinch of salt. - <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. - <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. - <li> Turn over and cook other side until golden. + method: "<html> + <ol> + <li> Sift flour and sugar together into a bowl. Add a pinch of salt. + <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. + <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. + <li> Turn over and cook other side until golden. </ol> </html>" } @@ -70,60 +70,60 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> - <ul> - <li> 1 onion - <li> 1 turnip - <li> 1 potato - <li> 1 carrot - <li> 1 head of celery - <li> 1 1/2 litres of water - </ul> + ingredients: "<html> + <ul> + <li> 1 onion + <li> 1 turnip + <li> 1 potato + <li> 1 carrot + <li> 1 head of celery + <li> 1 1/2 litres of water + </ul> </html>" - method: "<html> - <ol> - <li> Chop vegetables. - <li> Boil in water until vegetables soften. - <li> Season with salt and pepper to taste. - </ol> + method: "<html> + <ol> + <li> Chop vegetables. + <li> Boil in water until vegetables soften. + <li> Season with salt and pepper to taste. + </ol> </html>" } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> - <ul> - <li> 500g minced beef - <li> Seasoning - <li> lettuce, tomato, onion, cheese - <li> 1 hamburger bun for each burger - </ul> + ingredients: "<html> + <ul> + <li> 500g minced beef + <li> Seasoning + <li> lettuce, tomato, onion, cheese + <li> 1 hamburger bun for each burger + </ul> </html>" - method: "<html> - <ol> - <li> Mix the beef, together with seasoning, in a food processor. - <li> Shape the beef into burgers. - <li> Grill the burgers for about 5 mins on each side (until cooked through) - <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. - </ol> + method: "<html> + <ol> + <li> Mix the beef, together with seasoning, in a food processor. + <li> Shape the beef into burgers. + <li> Grill the burgers for about 5 mins on each side (until cooked through) + <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. + </ol> </html>" } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> - <ul> - <li> 1 cup Lemon Juice - <li> 1 cup Sugar - <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) - </ul> + ingredients: "<html> + <ul> + <li> 1 cup Lemon Juice + <li> 1 cup Sugar + <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) + </ul> </html>" - method: "<html> - <ol> - <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. - <li> Pour in lemon juice, stir again, and add 4 cups of cold water. - <li> Chill or serve over ice cubes. - </ol> + method: "<html> + <ol> + <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. + <li> Pour in lemon juice, stir again, and add 4 cups of cold water. + <li> Chill or serve over ice cubes. + </ol> </html>" } } diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qml b/examples/quick/views/listview/displaymargin.qml index 1600e88812..c3402f6baa 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qml +++ b/examples/quick/views/listview/displaymargin.qml @@ -37,35 +37,57 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +import QtQuick 2.3 -import QtQuick 2.2 -import "../../shared" +Item { + width: 480; height: 320 -TabSet { - width: 580 - height: 440 + ListView { + id: view + anchors.top: header.bottom + anchors.bottom: footer.top + width: parent.width - FileDialogs { - property string title: "File Dialog" - anchors.fill: parent - color: "#e3e3e3" // to match tab.png - } + cacheBuffer: 0 + displayMarginBeginning: 40 + displayMarginEnd: 40 - ColorDialogs { - property string title: "Color Dialog" - anchors.fill: parent - color: "#e3e3e3" // to match tab.png + model: 100 + delegate: Rectangle { + objectName: "delegate" + width: parent.width + height: 25 + color: index % 2 ? "steelblue" : "lightsteelblue" + Text { + anchors.centerIn: parent + color: "white" + text: "Item " + (index + 1) + } + } } - FontDialogs { - property string title: "Font Dialog" - anchors.fill: parent - color: "#e3e3e3" // to match tab.png + Rectangle { + id: header + width: parent.width; height: 40 + color: "#AAFF0000" + + Text { + anchors.centerIn: parent + font.pixelSize: 24 + text: "Header" + } } - MessageDialogs { - property string title: "Message Dialog" - anchors.fill: parent - color: "#e3e3e3" // to match tab.png + Rectangle { + id: footer + anchors.bottom: parent.bottom + width: parent.width; height: 40 + color: "#AAFF0000" + + Text { + anchors.centerIn: parent + font.pixelSize: 24 + text: "Footer" + } } } diff --git a/examples/quick/views/listview/dynamiclist.qml b/examples/quick/views/listview/dynamiclist.qml index a3e6026d16..fc09372602 100644 --- a/examples/quick/views/listview/dynamiclist.qml +++ b/examples/quick/views/listview/dynamiclist.qml @@ -204,7 +204,7 @@ Rectangle { anchors { left: parent.left; bottom: parent.bottom; margins: 20 } spacing: 10 - TextButton { + TextButton { text: "Add an item" onClicked: { fruitModel.append({ @@ -215,8 +215,8 @@ Rectangle { } } - TextButton { - text: "Remove all items" + TextButton { + text: "Remove all items" onClicked: fruitModel.clear() } } diff --git a/examples/quick/views/listview/expandingdelegates.qml b/examples/quick/views/listview/expandingdelegates.qml index c19e75f7bd..139ce6bd0d 100644 --- a/examples/quick/views/listview/expandingdelegates.qml +++ b/examples/quick/views/listview/expandingdelegates.qml @@ -103,7 +103,7 @@ Rectangle { width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } diff --git a/examples/quick/views/listview/highlight.qml b/examples/quick/views/listview/highlight.qml index 9564ea11b3..d4c57277b1 100644 --- a/examples/quick/views/listview/highlight.qml +++ b/examples/quick/views/listview/highlight.qml @@ -67,7 +67,7 @@ Rectangle { PropertyChanges { target: wrapper; x: 20 } } transitions: Transition { - NumberAnimation { properties: "x"; duration: 200 } + NumberAnimation { properties: "x"; duration: 200 } } MouseArea { anchors.fill: parent diff --git a/examples/quick/views/listview/highlightranges.qml b/examples/quick/views/listview/highlightranges.qml index 8b4eed7400..eaa4470ef0 100644 --- a/examples/quick/views/listview/highlightranges.qml +++ b/examples/quick/views/listview/highlightranges.qml @@ -79,8 +79,8 @@ Rectangle { width: 320; height: 480 - // This example shows the same model in three different ListView items, - // with different highlight ranges. The highlight ranges are set by the + // This example shows the same model in three different ListView items, + // with different highlight ranges. The highlight ranges are set by the // preferredHighlightBegin and preferredHighlightEnd properties in ListView. // // The first ListView does not set a highlight range, so its currentItem diff --git a/examples/quick/views/listview/sections.qml b/examples/quick/views/listview/sections.qml index 636f78fdbd..64d3dc8d71 100644 --- a/examples/quick/views/listview/sections.qml +++ b/examples/quick/views/listview/sections.qml @@ -70,7 +70,7 @@ Rectangle { //! [0] // The delegate for each section header - Component { + Component { id: sectionHeading Rectangle { width: container.width diff --git a/examples/quick/views/parallax/parallax.qml b/examples/quick/views/parallax/parallax.qml index ddcafc1ee1..fad5bee36c 100644 --- a/examples/quick/views/parallax/parallax.qml +++ b/examples/quick/views/parallax/parallax.qml @@ -68,7 +68,7 @@ Rectangle { Loader { anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter } width: 300; height: 400 - clip: true; + clip: true; source: "../../demos/samegame/samegame.qml" } } diff --git a/examples/quick/views/views.qml b/examples/quick/views/views.qml index 1bc6f6a3d8..2fbf9c5470 100644 --- a/examples/quick/views/views.qml +++ b/examples/quick/views/views.qml @@ -58,6 +58,7 @@ Item { addExample("Packages", "Transitions between a ListView and GridView", Qt.resolvedUrl("package/view.qml")) addExample("PathView", "A simple PathView", Qt.resolvedUrl("pathview/pathview-example.qml")) addExample("ObjectModel", "Using a ObjectModel", Qt.resolvedUrl("objectmodel/objectmodel.qml")) + addExample("Display Margins", "A ListView with display margins", Qt.resolvedUrl("listview/displaymargin.qml")) } } } diff --git a/examples/quick/views/views.qrc b/examples/quick/views/views.qrc index 434fa788bf..52abb68659 100644 --- a/examples/quick/views/views.qrc +++ b/examples/quick/views/views.qrc @@ -65,5 +65,6 @@ <file>visualdatamodel/dragselection.qml</file> <file>objectmodel/objectmodel.qml</file> <file>views.qml</file> + <file>listview/displaymargin.qml</file> </qresource> </RCC> |
