summaryrefslogtreecommitdiffstats
path: root/examples/quick/controls
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove Widgets dependency for QNXAndreas Holzammer2014-06-246-6/+6
| | | | | | | | | | | | | | | | | | Changes.txt says that with Qt 5.2.0 dependency for Widgets have been removed for touch based platforms. But QNX is also a touch based platform and its missing. Change-Id: I140842d4501422537175ac5acb07beebe994f0eb Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Revise and align ToolBar & StatusBar size calculationJ-P Nurmi2014-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of preferring the layout size, and only using the panel size as a fallback, take the maximum of the two. This way styles can provide a default size that will be respected. Furthermore, replace unnecessary function calls with declarative property bindings. Change-Id: Iabc59c694ac8c8302cea72f53c9177462d7f146c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Example: Remove Panel.qml from gallery.pro as the file does not existCaroline Chao2014-05-191-1/+0
| | | | | | | | | | Change-Id: Ife2b4de2cbc5cd08a97b87e014bb2e288326e08c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-05-141-5/+12
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/controls/Private/TabBar.qml Change-Id: Id176e44fe8e402c1c2c021ecb63c8c5c75736d47
| * Fix selection handling in texteditor exampleBerthold Krevert2014-05-131-5/+12
| | | | | | | | | | | | | | Task-number: QTBUG-31784 Change-Id: I7122abbfd346edd85f17c54dfde37db93a1ba0fc Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1120-37/+37
|\| | | | | | | | | | | | | Conflicts: src/controls/ApplicationWindow.qml Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
| * Fix the editable delegate in tableview exampleJens Bache-Wiig2014-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | We re-interpreted what "model" means in TableView to align it with what it means for ListView. Unfortunately the example still assume that "model" refers to the views acual model object and not to the current item data as it did for listview. Change-Id: I3457954a622be38500672edb1c0a910d18760947 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-0717-17/+17
| | | | | | | | | | Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Import QtQuick 2.2J-P Nurmi2014-04-0718-18/+18
| | | | | | | | | | Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Shawn Rutledge2014-03-254-22/+42
|\| | | | | | | refs/staging/dev
| * Styling improvements for CalendarJens Bache-Wiig2014-03-123-21/+41
| | | | | | | | | | | | | | | | | | Also - added the property Calendar::frameVisible. - moved the gridVisible property to CalendarStyle Change-Id: I57da65af130098ac5d0b858c9f964e52e3ba6922 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Fix some typosSergio Ahumada2014-03-031-1/+1
| | | | | | | | | | Change-Id: Ic2e2060b57b0d74e96d6aad0ceff4679d986a26c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Fix shaders for OpenGL core profilesLaszlo Agocs2014-03-241-0/+8
|/ | | | | | | | | | | | Add also a --coreprofile command-line parameter to the gallery and systemdialogs examples to allow testing Quick Controls with an OpenGL 3.2+ core profile. This depends on the new features introduced to qtdeclarative in I75a47182 and I41b513e9. Change-Id: I408263a108a71df221943915849a4c3e18e0d3e4 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Calendar example: sql module requiredCaroline Chao2014-02-211-1/+4
| | | | | | Change-Id: I75eb50a053f429135d1d49d1769b85a247c30311 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Calendar example: add needed QTPLUGIN for static buildsCaroline Chao2014-02-211-0/+2
| | | | | | Change-Id: Ieea1b38f5213f54c8e7de5fc572dcf2de6dfed18 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-171-10/+6
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-10/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/layouts/qquicklinearlayout.cpp Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
| | * Touch example: Fix back navigationCaroline Chao2014-02-031-10/+6
| | | | | | | | | | | | | | | | | | | | | The Key event needs to be in a item that has focus. Change-Id: I6f7293ac74b477e37c200dbb7ee8629d4f769d05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Add Calendar to Qt Quick Controls.Mitch Curtis2014-02-1410-0/+594
|/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29948 [ChangeLog][QtQuickControls] Calendar was added. Calendar allows selection of dates from a grid of days, similar to QCalendarWidget. Change-Id: I279130e704bc0dfd8dfe114ec9b6b49e111faf96 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* / Accessible slider should not have value as nameFrederik Gladhorn2014-02-071-0/+1
|/ | | | | | | | The value is provided though the value interface which works already. Having the value as name as well leads to the value being read twice. Change-Id: I97483567c120aa149b52ba35f430aa5c63ad08b7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Make Label accessibleFrederik Gladhorn2014-01-031-3/+3
| | | | | Change-Id: If364332017669732fa429efe90c26000b01b0580 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* gallery: run particles only when visibleJ-P Nurmi2013-12-051-1/+1
| | | | | | Change-Id: I7c0f5565161719905e973d3fd1a75b3c9d8a4007 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-031-1/+1
|\ | | | | | | Change-Id: I1b4f7508ead5631abb70b4cdf29d6efa05f33b5b
| * Fix typo in tableview example.Mitch Curtis2013-11-301-1/+1
| | | | | | | | | | | | | | Sortindicator => Sort indicator Change-Id: Id9897268bb21e9ba0dc14de2c4cc9e7f9f9a66d4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Revise main() in examplesJ-P Nurmi2013-11-2820-56/+69
|/ | | | | | | | | | | | Replace the inconvenient QT_QUICK_CONTROLS_EXAMPLE_MAIN macro with a simpler macro that merely defines the actual application type. This way it's easier to do tweaks to main() when for example testing a different application font size. Moreover, browsing the example code becomes more convenient (especially online). Task-number: QTBUG-35083 Change-Id: I8203816a9112bf29b4661baa86bf4a196554db05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* TextEditor example: use the MessageDialog for the About boxShawn Rutledge2013-11-151-30/+6
| | | | | | Change-Id: I0813b7d392dfe7143d438b4057c5d787d223ad5e Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Gallery example: add an About boxShawn Rutledge2013-11-134-0/+62
| | | | | Change-Id: Ie683c9d6dca577193f6a5a2cee40916b263719d6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* More styling improvements for Base StyleJens Bache-Wiig2013-10-311-4/+0
| | | | | | | | | | - Better scalability - Retina support - Added glow filter to Private - Added focus rects Change-Id: I2ec36a9db546c21e20408429c5e17fde8d67b7c3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Don't add any extra space to RadioButton and CheckBox by defaultJens Bache-Wiig2013-10-241-0/+6
| | | | | | | | | We instead do this in the layout code. It seems to make sense to support the use case where only the indicator is visible without adding extra padding to it. Change-Id: Ib55c3a97d7c23a52a14121b46be84299d1ad2132 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix custom styled transient scrollbarsJ-P Nurmi2013-10-234-0/+88
| | | | | Change-Id: I41d86f2f27e4250361c4fad21dd37995e5cbbc3d Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Remove widget dependency on touch platformsJens Bache-Wiig2013-10-178-21/+16
| | | | | | | | We don't want native styling on touch enabled devices and there is no reason to link against widgets there. Change-Id: I70116a0a94227cb58ae25980b97c4177da75a3c8 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix some issues in the modelview exampleJens Bache-Wiig2013-10-161-8/+1
| | | | | | | | | | The edit menu was never implemented and should not be exposed. Fading out the combo box is not really intuitive and doesnt actually disable the control. task-number: QTBUG-33818 Change-Id: I76190b675fd9400caac2754277ba9960b7f6dd06 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Improved font scalability for Base styleJens Bache-Wiig2013-10-152-38/+41
| | | | | | | | | | This should make it useable on hight dpi tablets and desktops where font sizes are larger. Change-Id: I8c8e7688927a0b54e3f95c276c743aaa31e8a4d9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add a basic Switch controlJens Bache-Wiig2013-09-221-2/+58
| | | | | | | | | This is a very simple switch. I left out text label as this is very mobile oriented. A clicked signal is also debatable as you dont really click on a switch. Change-Id: I84269297cba48f0e81af8f25af5b97acadecdd6a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* ComboBox: Make popup scrollableGabriel de Dietrich2013-09-191-0/+5
| | | | | | | | | | | | | | | | We factor out part the menu item container logic from Menu into ColumnMenuContent, which takes care of scrolling and mouse hovering, and selection. This makes possible to extend the menu items layout. The pop-over and pull-down look is specified by the menu style component by overriding the ScrollView style. The popup's maximum height is also specified by the menu style. The gallery example can finally use a font families combo box. Task-number: QTBUG-31568 Change-Id: I34a7278f476471c0eb51ef51dde3dd83e13002fe Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge branch 'stable' into devGabriel de Dietrich2013-09-181-9/+9
|\ | | | | | | | | | | | | Conflicts: src/controls/qquickaction.cpp Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
| * Menu: Enable mnemonic menu navigationGabriel de Dietrich2013-09-131-9/+9
| | | | | | | | | | | | | | | | | | | | | | We also added a new mnemonic specific shortcut context matcher. This prevents two menu items with the same mnemonic but within different menus to be reported as ambiguous. Task-number: QTBUG-33030 ChangeLog: Added mnemonic navigation for menus Change-Id: I192c9aacba4d15851fe65bf9201251962fe976d5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Make ComboBox editableJens Bache-Wiig2013-09-171-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition - Added text completion - Added validator - Added accepted signal - Added activated signal - Added textAt function - Added find function - Added keyboard indexing for non-editable as well Note that we do not support adding values to the model, but leave this up to the user to handle in onAccepted. Change-Id: I1d76fa83aea0e488959c418d22ce7b6027675d86 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Add TableViewColumn::movableJ-P Nurmi2013-09-171-1/+8
| | | | | | | | | | Change-Id: Ibf1b68d4c63ca02c603d5203128bb94984a809f2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Rename Control tab to Controls.Mitch Curtis2013-09-131-1/+1
| | | | | | | | | | Change-Id: I009877b3ab19302aa7eb951acb4668371aa60b38 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-1015-21/+21
| | | | | | | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | BusyIndicatorJens Bache-Wiig2013-09-092-2/+13
| | | | | | | | | | | | | | | | A basic BusyIndicator to indicate activity while blocking the UI. Change-Id: Iec88b6a4c7f23b630ebdf445c4cb288684c24cb7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Example: Rename Text example to TextEditorCaroline Chao2013-08-2730-2/+2
| | | | | | | | | | | | | | | | | | Text is too generic. Change-Id: I68d304345d2982a8acc8843c4c843e9f5e696954 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Support StandardKeys for Action/MenuItem::shortcutJ-P Nurmi2013-08-201-6/+6
| | | | | | | | | | | | Change-Id: I2054a59fcda26795721e5d7d04cc644220da372b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Remove broken links from gallery exampleJens Bache-Wiig2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | While it is nice to have a manual test for this, I don't belive the gallery is the best way to do so. Instead I moved the lorem ipsum text link to testbench. Change-Id: I4451aedc9ae6f42d5074b633052cc307f2880ac3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Add support for drawing tick marks with base styleJens Bache-Wiig2013-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | Before this was simply not implemented. It is still a bit unclear how we should treat stepSize == 0 as the results are somewhat undefined. Task-number: QTBUG-31261 Change-Id: I7a8b877649a945cd6cb303cc034df677b0199a90 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-273-3/+3
|\| | | | | | | Change-Id: I05931c5fbcd0ce61e09803239f97713f910588cc
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-253-3/+3
| |\ | | | | | | | | | Change-Id: I1684510ce4f1b52e3569d8c04e272b1c8fd63c1a
| | * Adapt to Qt.platform.os rename ("mac" -> "osx")v5.1.0-rc2v5.1.0J-P Nurmi2013-06-243-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I089a01bee10b92f85dcdd338c695a3b796b0ecd1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| | * Revert "Add qml/js files in resource files"Caroline Chao2013-06-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to investigate more this solution. Deployment issue for Qt Quick Controls will be a known limitation in 5.1.0. This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf. Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>