summaryrefslogtreecommitdiff
path: root/src/controls/ToolBar.qml
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix Controls 1 types linking to Controls 2"Topi Reinio2016-06-221-1/+0
| | | | | | | | | | | This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Controls 1 types linking to Controls 2v5.7.0-rc1v5.7.05.7.0Mitch Curtis2016-05-261-0/+1
| | | | | | Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Unify license header usageAntti Kokko2016-02-041-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Doc: Create proper QHP TOC entries for QML types, examples and tutorialsTopi Reinio2015-08-051-0/+1
| | | | | | | | | | QDoc now supports using a \group name as a selector for QHP subprojects. Use this to have the correct division of Qt Quick Controls and Controls Styles QML types, as well as a TOC entry for examples and tutorials. Change-Id: I8e4b44c8876fd6bb3b2baebd956d6dc5d5223715 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Revert "iOS: Make ApplicationWindow fill entire screen, including under ↵J-P Nurmi2015-05-261-5/+5
| | | | | | | | | | | | | | | | statusbar" This is a nice to have iOS feature, but it breaks all the other platforms. This reverts commit 10a57f37d0f03e8642a7c92dcacf287c95777342. Change-Id: Iec7cfa8be1bb214d0f86047826a5c0cdcf447c1e Task-number: QTBUG-45973 Task-number: QTBUG-46119 Task-number: QTBUG-46134 Task-number: QTBUG-46180 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* iOS: Make ApplicationWindow fill entire screen, including under statusbarTor Arne Vestbø2015-03-271-5/+5
| | | | | | | | | | | | | | We take advantage of the new Qt::WindowFlag that asks the OS to maximize the window using as much as possible of the available screen geometry, and then make sure that the contentItem is shifted accordingly so that it doesn't end up under the statusbar. This allow setting a custom background image/color on the application window, or adding toolbars or menu bars that underlay the iOS system status bar. Change-Id: I6efab2aced7efd274a65f2524ae8c270d20de187 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* Merge Extras' styling system into Controls'.Mitch Curtis2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: update license headersJ-P Nurmi2015-02-111-28/+24
| | | | | | | Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* ToolBar: fix spacing between menu button & contentJ-P Nurmi2014-10-301-1/+1
| | | | | Change-Id: I0e46e77186a8572c63c3eed7a99f35b948b87de3 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* ToolBar: fix the right marginJ-P Nurmi2014-10-031-1/+1
| | | | | | | A regression introduced by 7909cd1 Change-Id: Ia7f1dd4da53619e39245cdd9cf3752c13cefad94 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* ToolBar: add support for a stylable menu buttonJ-P Nurmi2014-09-301-2/+17
| | | | | Change-Id: I75021d5a4b54104cccaf5988f0bc79efce3c4c9f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-07-091-7/+19
|\ | | | | | | | | | | | | Conflicts: src/controls/ToolBar.qml Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6
| * Doc: Added images and missing snippetsVenu2014-06-271-7/+20
| | | | | | | | | | | | Task-number: QTBUG-33799 Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Revise and align ToolBar & StatusBar size calculationJ-P Nurmi2014-06-071-11/+15
|/ | | | | | | | | | 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>
* Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-071-2/+2
| | | | | Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Import QtQuick 2.2J-P Nurmi2014-04-071-1/+1
| | | | | Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Make StatusBar and ToolBar focus scopesJens Bache-Wiig2013-12-041-1/+1
| | | | | | | | | | | | | | The problem is that the content item of both these controls have the focus property set to true. This property will then affect the implicit focus logic and should be protected by a focusscope. Currently adding a ToolBar or StatusBar to an application could result in this content item grabbing focus implicitly even if the application only sets focus: true on a single item. Task-number: QTBUG-34713 Change-Id: I94cb79d25e4cfd727915f5b5ab612ad5c0132db7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Changed the \since argument to the Qt version.Jerome Pasion2013-09-261-1/+1
| | | | | | | | | | | | | | -1.0 types were introduced in Qt 5.1 -1.1 types were introduced in Qt 5.2 -The module versions are now taken from the \qmlmodule This change was only applied to \qmltype. For methods, signals, and properties, we keep the \since QtQuick.Controls <version> Task-number: QTBUG-32172 Change-Id: Iefa73d4a489aa285bae873f68ae9a228030f0115 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-101-3/+3
| | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* ToolBar: add RTL supportJ-P Nurmi2013-08-151-0/+2
| | | | | Change-Id: Ib0f78310c96cda29cc6ea4551b3a2c98011a11c9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix incorrect size hint for ToolBar and StatusBarJens Bache-Wiig2013-06-031-1/+5
| | | | | | | | | | We only cared about reserving space for the height but while trying to actually get the minimumSize for a window based on the toolbar content I realized that we really need to calculate the width as well. Change-Id: I7b55b66a2475a2355d30614095f173a39f47f2f1 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix missing margins and incorrect size for ToolBar and StatusBarJens Bache-Wiig2013-05-311-11/+70
| | | | | | | | | | | Using the implicitHeight of an item makes ToolBar and StatusBar a lot more useable with layouts. In addition we enable the padding property from the style, allowing its content to be positioned in a more convenient way. This is similar to how we already do it for GroupBox. Change-Id: Ia2aa1bcb9ae109718fd752401400222adec242ac Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Make QQuickSettings::style a property with a notifier signalJ-P Nurmi2013-05-241-1/+1
| | | | | Change-Id: I9f1690524e29cd7fe0ab35be216aca9a6edd35ca Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Automatically set toolbar widthJens Bache-Wiig2013-05-101-0/+1
| | | | | Change-Id: I4038afc1cb22102f8873014d90dedec79cbaa376 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Refactor and clean up public style APIJens Bache-Wiig2013-05-081-0/+1
| | | | | Change-Id: I10271c860abd9b45a262e3548628e6a3026e1a4f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: check and correct for compliancy with Writing GuidelinesNico Vertriest2013-05-061-0/+1
| | | | | | | Task-number: QTBUG-30318 Change-Id: I9839470fbac1d14c1788766d275aba3fac6ec8b1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Remove hard dependency on widgetsJens Bache-Wiig2013-04-151-2/+1
| | | | | Change-Id: I1fabb4efcc931f12f0a65ac5c66e6e085108269b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove StyleItem dependencies from controlsJens Bache-Wiig2013-04-131-5/+8
| | | | | | | | This is another step towards making controls work without the widgets module. Change-Id: I7066d79f42d90199cfd1a5d6f6ce6cf6cae381d6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ToolBar: Fix height on MacGabriel de Dietrich2013-03-221-1/+1
| | | | | | | Would not contain the toolbuton's pressed shadow. Change-Id: I989e6ec38d0632fcd4c09e1805ec3fa0133d9b93 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Support QQuickItem.activeFocusOnTab in QtQuick.ControlsLiang Qi2013-03-191-0/+1
| | | | | Change-Id: Ie23b504f590e6c4e7f2a1a9090c2dd8671389937 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: corrected punctuation (,)Nico Vertriest2013-03-151-1/+1
| | | | | | Change-Id: Id1b7bf4c6ff1fa7286cafdc5ffe7cdab636a622b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change imports from QtQuick 2.0 to QtQuick 2.1Caroline Chao2013-03-141-1/+1
| | | | | | Change-Id: If9df032c76e36f385aacd30cc31d6f02574c6f11 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix ToolBar sizeJens Bache-Wiig2013-03-111-2/+0
| | | | | | | | We should not override the implicit size. Change-Id: I12b8639c527e6c2170507c3ce36605ae1d839b90 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Small doc changes to StatusBar and ToolBarJerome Pasion2013-03-111-6/+6
| | | | | Change-Id: I82bdec248223de2dfb4ab8d1cd6cc04d5560ca5f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Replaced BSD with LGPL license to conform with Qt Project modulesShawn Rutledge2013-02-211-2/+2
| | | | | | | | We want to use the same license as the other Qt modules. QML files stay as BSD for now. Change-Id: I10b1484f5ab0dfe2138ff7e045d0ecfd85556aa1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename QtDesktop to QtQuick.ControlsJens Bache-Wiig2013-02-211-0/+82
Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
View Lorry Controller Status