summaryrefslogtreecommitdiffstats
path: root/src/controls/GroupBox.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.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>
* 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>
* Doc: Added images and missing snippetsVenu2014-06-271-14/+21
| | | | | | Task-number: QTBUG-33799 Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-071-1/+1
| | | | | 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>
* 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>
* GroupBox: fix the activeFocusOnTab behaviorLiang Qi2013-06-101-1/+3
| | | | | | | | | * change GroupBox to FocusScope * update the autotest Task-number: QTBUG-31306 Change-Id: I72d24b8eb71aa72798e01925691dbb3570518aed Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Improved size calculation of GroupBoxJens Bache-Wiig2013-05-291-1/+3
| | | | | | | | This adds some pixel tweaks on mac, adds minimum size to fit the label and fixes dpi scaling on Windows Change-Id: I4c43ba4a7815be87356336a9dafc1a217437940b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Make GroupBox size respect anchor margins and update GalleryJens Bache-Wiig2013-05-271-2/+6
| | | | | | | | | | | We now implicitly add the margins to GroupBox so that you can easily add them to a layout. This also gets rid of the silly Sidebar example and adds a much more useful Layout tab for effective testing. Change-Id: I6026c32b2a198062d9b11a67245df0529aa61f8a Reviewed-by: J-P Nurmi <jpnurmi@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>
* Update GroupBox to support contentItemJens Bache-Wiig2013-05-231-54/+70
| | | | | | | | | | | | | - Removed contentWidth and contentHeight since it is not needed - Exposed contentItem so that it can be designable. - Respect the implicit width or height of the contentItem if it is the only item of the GroupBox. Otherwise childrenRect is used. - Modified the style so that the style takes care of only the padding size and not the entire size of the group box. - Fixed flat and checkable appearance for custom style Change-Id: I2c7ec4cb7d5e6f96863847e8d8d6d6f52428364e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Ensure that a layout won't shrink the GroupBox..Jan Arve Saether2013-05-091-0/+4
| | | | | | | ..to be smaller than the GroupBox' implicit size. Change-Id: I5dda34de6a55a511516f528e4b6e1bc8db10a86b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Refactor and clean up public style APIJens Bache-Wiig2013-05-081-2/+1
| | | | | Change-Id: I10271c860abd9b45a262e3548628e6a3026e1a4f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: correct for compliancy with Writing GuidelinesNico Vertriest2013-05-071-0/+1
| | | | | | | | Task-number: QTBUG-30318 Change-Id: If3916f3250f202a5da4b1f8034ecfba984367af3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QML Style: disabled text color for textual componentsJ-P Nurmi2013-04-221-0/+1
| | | | | Change-Id: I7795ac01d93769fc8c096f214b20b4d6429460b9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove hard dependency on widgetsJens Bache-Wiig2013-04-151-2/+2
| | | | | Change-Id: I1fabb4efcc931f12f0a65ac5c66e6e085108269b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove StyleItem dependencies from controlsJens Bache-Wiig2013-04-131-2/+2
| | | | | | | | 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>
* Doc: minor language editsNico Vertriest2013-04-051-1/+1
| | | | | | | | | | | | | Concerning vocab., punctuation, syntax and/or Writing Guidelines. Corrected whitespace issues. Replaced "if" with "whether" in Slider.qml Task-number: QTBUG-30318 Change-Id: I0e0e8d2b807f0a6534deb2caa6dbee7eb206f43b Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Improve GroupBox styling and content calculationJens Bache-Wiig2013-03-221-11/+13
| | | | | | | We need this to have expanding layouts. Change-Id: I32ef9da90fa9210febaa23d3f579ec94f03c377d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Size adjustment for GroupBoxJens Bache-Wiig2013-03-211-8/+13
| | | | | Change-Id: Icb1dece74c8fde915d7012c2ec5627c1a791b3bd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Support QQuickItem.activeFocusOnTab in QtQuick.ControlsLiang Qi2013-03-191-0/+2
| | | | | Change-Id: Ie23b504f590e6c4e7f2a1a9090c2dd8671389937 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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>
* Doc - GroupBox: Update documentationCaroline Chao2013-03-111-14/+8
| | | | | | | | And remove a useless property. Change-Id: I970eb1164aab45142b336008fa5981cfb680dc91 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Docs: add missing dots to briefsJ-P Nurmi2013-02-281-1/+1
| | | | | | | | The annotated lists look much better when all brief descriptions consistently end with a dot. Change-Id: I688021e0dda21bb7878c93d82e63482d712b55ea Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* GroupBox: Add title to checkable group boxCaroline Chao2013-02-251-0/+1
| | | | | Change-Id: I66d9916e1a66b9d6a1a3dd94aba84c37022824ae Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* GroupBox: small fix + add basic autotestsCaroline Chao2013-02-231-1/+1
| | | | | | | | And add a GroupBox in the testbench application. Change-Id: I5581a96addf6b1c2cdb684e4a0d45ab101e510d9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@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/+193
Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>