aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/wearable
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Replace the "Qt Quick Controls 2" instancesVenugopal Shivashankar2019-08-221-2/+2
| | | | | | | | | Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-0519-24/+24
|\ | | | | | | Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
| * Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-0219-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Doc: Update \titles with "Controls 2" in itVenugopal Shivashankar2018-12-041-1/+2
|/ | | | | | | | Alternatively, the old \title is now a \keyword, to avoid broken links to the page. Change-Id: Ib8b97efe8be13559c45c7ca430b2afc93edaa3e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-291-0/+1
| | | | | | | | | | The name of the documentation module is also changed from 'qtquickcontrols2' to 'qtquickcontrols', and this is reflected in other modules' dependencies and licensing source files (qt_attribution.json). Task-number: QTBUG-70333 Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* wearable: add demo modev5.12.0-beta1Mitch Curtis2018-09-2720-24/+507
| | | | | | | | | | | This change adds a switch in the settings page that enables demo mode. In this mode, each screen and UI control will be visited and interacted with in a loop until the screen is tapped, at which point it returns to the launcher page. Change-Id: Icb306e23985d8c1f82725a95ed7f2e34b3d6c03f Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* wearable: add a dark theme with a runtime switch on the Settings pageMitch Curtis2018-09-2799-105/+291
| | | | | Change-Id: Iaa205c19aa413de7a5537f17f74d969547d5e558 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* wearable: bump import versions to 5.10Mitch Curtis2018-09-2717-33/+33
| | | | | | | | Some API we need is only available in later versions. Don't go past 5.10 for now, because the support isn't there yet. Change-Id: I6915d34ef37b47b9b07e6e4aa85c90ff2e8b59b2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* wearable: fix items still being visible when returning to LauncherPageMitch Curtis2018-09-107-10/+77
| | | | | | | Hide SwipeView items when appropriate, as it's not done automatically. Change-Id: Ic716da004794b7d0eba65c220f6242d4113302d9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Wearable Demo: make use of the icon supportJ-P Nurmi2017-11-0219-30/+67
| | | | | Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Edit languagev5.10.0-alpha1Venugopal Shivashankar2017-09-071-27/+26
| | | | | | | | | - Fixed pucntuation issues and typos - Removed redundant text Task-number: QTBUG-60647 Change-Id: I1ab0e8e62a2e3f4997629653b659f130c13db007 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable Demo: fix fuzzy images on retina screensJ-P Nurmi2017-05-1545-1/+39
| | | | | | | | | Even though retina screens are not the primary target of the wearable demo, users can try out the demo on desktop. Provide crispy @2x image assets to give a better impression for those who have retina screens. Change-Id: If88367e14c586fd9718f43bbae73dee547d54aaf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: prepare the launcher page icons for high DPI and stylingJ-P Nurmi2017-03-2912-12/+12
| | | | | | | | | | Separate the icon and its background to make the background stylable and to provide the icons in high DPI versions later. Some icon files have been renamed to match the sub-app name. When this example reaches dev, we can use the built-in icon support with named icons. Change-Id: Id87d1a001476194eb7e803802c90e7089f92b3b1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: update the Wearable Demo docsJ-P Nurmi2017-03-282-99/+111
| | | | | | | | | | The demo was originally written to become a Qt Quick demo. Focus on the QQC2 specifics now that it became a QQC2 demo instead. There were also some outdated references after being refactored a bit after the initial submission. Change-Id: I96ef3f4745a295b2d8ab12a30fcbdf41a2c50626 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: get rid of the UIStyle dimensionsJ-P Nurmi2017-03-132-13/+2
| | | | | Change-Id: Ia4896fd2253cea9bc83bdd59bfdbaace216a9cb9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup FitnessPageJ-P Nurmi2017-03-131-4/+0
| | | | | Change-Id: I0ed565b04236ad4550b278e0a223636794d52bbf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup WeatherPageJ-P Nurmi2017-03-131-51/+16
| | | | | Change-Id: Iaed6c6370e9a8ec7e6e523ee87802d51531f5bba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup NotificationsPageJ-P Nurmi2017-03-131-74/+41
| | | | | Change-Id: Idc8376405e113a9837fbe43fbf85681cf9ed8737 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup NavigationPageJ-P Nurmi2017-03-132-19/+12
| | | | | Change-Id: I3e6a3ffbcca962602d08aa9effce981396cc3cdb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: center align the world clocksJ-P Nurmi2017-03-131-6/+1
| | | | | Change-Id: I9389597db13acee93e66ee6979fae5e2dd5a0e90 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup AlarmsPageJ-P Nurmi2017-03-133-140/+31
| | | | | Change-Id: I918e69a8396cf57dd685cc2116722618a3d7fda4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: tweak the page indicatorsJ-P Nurmi2017-03-137-30/+13
| | | | | | | Move bottom margin from anchors as bottom padding to define it once. Change-Id: I2a93f86e2029c38f1d39555a55d969faec716d04 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup unnecessary currentIndex & clippingJ-P Nurmi2017-03-138-15/+0
| | | | | Change-Id: Ic0071690388871fcbb09af5f3b7255f1a7f81bcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove unnecessary wrapper itemsJ-P Nurmi2017-03-135-533/+496
| | | | | | | | | | | Almost all pages were centering a fixed-size SwipeView. If the window was larger than assumed, swipes would only work in the center are of the window. Therefore it's better to stretch the view, and just center the content instead. This way swipes work consistently in the whole content area of the page. Change-Id: Idc2a2bc327a49314cbf1271fa34b74df5f633ed8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: move app-specific images into each app's own folderJ-P Nurmi2017-03-1351-68/+68
| | | | | Change-Id: Ie378f19a1ccfd962528f47263d03cac6bf7dc03f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup SettingsPageJ-P Nurmi2017-03-133-172/+77
| | | | | | | | | Replace the SettingsData (Item) type with QML Settings from Qt.labs.settings, and get rid of an unnecessary wrapper items and hard-coded image sizes. Change-Id: If41fbef5247c1648b881a97cbb94d4378b334f85 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: add style for PageIndicatorJ-P Nurmi2017-03-138-98/+90
| | | | | Change-Id: Id8f4948372f394ec5dbb4c2268f453724f65b594 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: rename WatchFace to WorldClockJ-P Nurmi2017-03-1316-14/+14
| | | | | | | To be consistent how the pages/apps are called in the UI vs. code. Change-Id: I721d3ebb8631aa97a1ab43e6924cd0e4d0f39d24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup and make LauncherPage scalableJ-P Nurmi2017-03-132-136/+123
| | | | | Change-Id: I2c9bf50b1519976643bebe87198c02fcdca45a64 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: use AbstractButton for the PathView delegateJ-P Nurmi2017-03-131-53/+39
| | | | | | | | Move the app title outside the delegate. Its position is static, and its visible in one place only, so one instance is enough. Change-Id: If5a9f4cb7893980cef6a08fdc8adde929f187460 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: rename the pagesJ-P Nurmi2017-03-1310-16/+16
| | | | | | | | Even the code and the documentation talks about "pages", so call the types pages too. Change-Id: Ie0151be1b2344af6f7122ed22da6cc3b1ea634e4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: merge MainContainer.qml into wearable.qmlJ-P Nurmi2017-03-133-108/+28
| | | | | | | Utilize the header-content-footer layout of AppWindow. Change-Id: I50a53fd5c372161af738e5d53085c669cf2614b8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: add NaviButtonJ-P Nurmi2017-03-133-124/+98
| | | | | | | | Replace the hand-made home/back buttons with an AbstractButton-based custom type. Change-Id: Icc2555e9ef67ae7461a072caf2dae780aaeafba2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove unused importsJ-P Nurmi2017-03-132-3/+0
| | | | | | | | qmlimportscanner would detect these as dependencies and deploy them for nothing, which would be wasteful on a wearable device. Change-Id: I687a9f7e136210d1213eb6575429102bcb472d78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: set the application background in the windowJ-P Nurmi2017-03-133-19/+7
| | | | | | | ApplicationWindow comes with built-in support for custom backgrounds. Change-Id: I524d346a39f28e916d87bef738ad0492ee686c0c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: utilize the styling systemJ-P Nurmi2017-03-1319-66/+70
| | | | | Change-Id: I6b7068c0416cdd16a98752241f6c3105652c9c08 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: replace translucent borderless Rectangles with plain ItemsJ-P Nurmi2017-03-135-20/+6
| | | | | Change-Id: Ie27fe1f7181dd7aad49062d2a37eb3a4a7db3781 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: remove PageContainerJ-P Nurmi2017-03-1311-69/+8
| | | | | | | The init() function and done() signal were both unused. Change-Id: I302e196ad6b0da423f0efb3394e307f6c3ed8c8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add Wearable demoShrikant Dhumal2017-03-1373-0/+3276
Change-Id: I3e287b85517c04803964c068e32bf8b6bcae5cb6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>