summaryrefslogtreecommitdiff
path: root/src/controls/TabView.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>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-171-4/+11
|\ | | | | | | Change-Id: Ic1a33d305dc57a42f020389277d95aad1a6da407
| * Fix addTab()/insertTab() documentationMitch Curtis2015-11-091-4/+11
| | | | | | | | | | | | Change-Id: I106b1e042434b168333283aa792b67727b8f40b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@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>
* Doc: Fix qml method signaturesCaroline Chao2015-03-131-5/+10
| | | | | | | | | | So the return value and parameters can be seen in the documentation. + Fix minor doc issues Change-Id: I99e520c103bb0faeb88b26eb7b9ff73922851abc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix qtdoc warningsCaroline Chao2015-03-061-1/+1
| | | | | | | | | Mostly link errors and missing documentation. And removed useless references to {QtQuick.Controls.Styles} in the doc. Change-Id: Iad211a574c0bd23c84e067e0cbcc18c3e719cde7 Reviewed-by: Topi Reiniö <topi.reinio@digia.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>
* Not update TabView.currentIndex when loader insertingLiang Qi2015-02-021-1/+0
| | | | | | | | Autotest is included. Task-number: QTBUG-43701 Change-Id: I60664d78988ee8d099e502e49711d69552e08312 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-07-091-1/+26
|\ | | | | | | | | | | | | Conflicts: src/controls/ToolBar.qml Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6
| * Doc: Add a link to Tab in TabView documentationCaroline Chao2014-06-281-0/+2
| | | | | | | | | | | | Task-number: QTBUG-39671 Change-Id: I5a9ddf064c9095c89906ac75665d67d7a51ce615 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Added images and missing snippetsVenu2014-06-271-1/+24
| | | | | | | | | | | | Task-number: QTBUG-33799 Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-05-141-5/+20
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/controls/Private/TabBar.qml Change-Id: Id176e44fe8e402c1c2c021ecb63c8c5c75736d47
| * Fix the update of TabView.currentIndex when inserting/removing tabsJocelyn Turcotte2014-05-071-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update currentIndex when adding or inserting tabs. - Make sure that we update the current index before updating the array to avoid a state of currentIndex > count -1 when removing the last tab, where a property binding on TabView.count could try fetching a tab past the array limit through TabView.getTab. - Only decrease currentIndex when removedIndex <= currentIndex to keep the current tab active when possible. Activate the next tab instead of the previous one when the current tab is removed to make it more instinctive to remove multiple tabs successively. - Keep the current behavior of leaving currentIndex to 0 when removing the last tab. Change-Id: I030b86a03ce73f1177b1f04857abbdc2f7ec5835 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Handle invalid indexes for TabView.getTabJocelyn Turcotte2014-05-071-1/+2
| | | | | | | | | | | | | | | | Return undefined if ListModel.get returned undefined instead of throwing an exception. Change-Id: I38cbd21472e8c409390e8269e5fa0a800106392e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Fix missing tabs in touch exampleJens Bache-Wiig2014-04-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only reason that the we calculated the tab count explicitly before was that we were using an array. Now that we are using a model there is no longer any need to keep track of the count independently of the model. This fix prevents the count from originally showing as 0 and prevents an extra value change. In addition the count is now correctly marked as readonly. Task-number: QTBUG-38421 Change-Id: I53a5d0df3367c850a7c6846729660dd0f63238d5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jonathan Liu <net147@gmail.com>
* | Add TabView::contentItemJ-P Nurmi2014-04-301-0/+10
|/ | | | | | | | Task-number: QTBUG-38425 Change-Id: I9e2b960e9b336145388371e5cee8a8a4cb1fa38e Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@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>
* Remove workaround for ownership issue with newly created tabsSimon Hausmann2014-01-081-3/+1
| | | | | | | | | The workaround for specifying the loader as a parent for newly created tabs can be removed, now that QTBUG-35913 is fixed and the visual parent ensures that its visual children stay alive. Change-Id: Ide3fc79c7a7465bd585bfd2bc66de4389aa7bc1d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Fix links to Qt Quick Controls Styles itemsCaroline Chao2013-10-231-1/+1
| | | | | Change-Id: I406c159fbc573e8b0a999d85fd6fb546b71634ac 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>
* Merge branch 'stable' into devGabriel de Dietrich2013-09-181-12/+25
|\ | | | | | | | | | | | | Conflicts: src/controls/qquickaction.cpp Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
| * Fix Tab ownership issue that has been blocking stable->dev mergeJ-P Nurmi2013-09-181-1/+3
| | | | | | | | | | Change-Id: Ifcae96687bcc54486d7f16b1e1002e54394b914d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * TabView: fix dynamic tab handlingJ-P Nurmi2013-09-031-12/+23
| | | | | | | | | | | | | | Task-number: QTBUG-33162 Change-Id: I873b37bd157230f80237fd40f3e5149fbd0207ca Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-101-2/+2
|/ | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Improve default size for several controlsJens Bache-Wiig2013-06-031-1/+2
| | | | | | | | | | We should set this to some decent default value that doesn't look wrong. Note that the width and height definition in TextArea could cause conflicts when used in layouts. Change-Id: I815ff96c02f9a9a76c07d57181f3a24291c83c52 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove unnecessary bottom margin for TabView on macJens Bache-Wiig2013-06-031-1/+1
| | | | | | | | This extra padding at the bottom is not needed and only serves to make the borders uneven on mac. Change-Id: Ibb3f8a3ba1f37ce1e9c6674a53cfb13e257fb97f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Rename::tabAt(index) to getTab(index)J-P Nurmi2013-05-291-1/+1
| | | | | | | The fooAt() type methods are reserved for coordinate based queries. Change-Id: Iea91bdd29df4fa53cc1c7a07880f466ef2325725 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Enable padding as a grouped propertyJens Bache-Wiig2013-05-241-1/+1
| | | | | | | | | We want padding to be a grouped property as the existing Margins property looks rather odd and insconsistent. Change-Id: I9e614f9161aaf01af200b19a1fb46a51beec6fb4 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>
* Refactor and clean up public style APIJens Bache-Wiig2013-05-081-9/+10
| | | | | Change-Id: I10271c860abd9b45a262e3548628e6a3026e1a4f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix TabView not to insert duplicate tabsJ-P Nurmi2013-05-071-26/+22
| | | | | | | | | | | | | | There are three ways to add tabs: - declare 'static' Tab { } child elements - call addTab() / insertTab() - Component::createObject(tabView) => Do not rely on the calling order of Component.onCompleted() and make sure that the same tabs are not accidentally re-inserted. Task-number: QTBUG-30873 Change-Id: Ib30cfb676debbb302c5e9f7d757f66aab6fcc684 Reviewed-by: Caroline Chao <caroline.chao@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>
* TabView: use internally ListModel instead of JS array for tabsJ-P Nurmi2013-04-301-11/+11
| | | | | Change-Id: I096571283dc66acbe86f75310b55d2da3ef808af Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add TabView::moveTab(from, to)J-P Nurmi2013-04-301-0/+18
| | | | | | Change-Id: I4996f5156b111d5dc40a50ff0c845bf0dc62ea27 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Mouse click tab in TabView will focus next in chainLiang Qi2013-04-231-0/+1
| | | | | | | Autotest is included. Change-Id: Id9b210afcf0371c31ab921e13ca01612bec8730f Reviewed-by: Liang Qi <liang.qi@digia.com>
* Make tab accessibility work.Morten Johan Sørvig2013-04-171-2/+2
| | | | | | | | | | | | | | | | | The PageTab role is actually the button in the TabBar you click to change tabs - it's not the Tab item itself. PageTabs are treated as leaf items with no children by QML accessibility, which is obviously very wrong for Tab container items. There is currently no specific "TabContainer" role in Qt accessibility. Use LayeredPane as a replacement. Change-Id: I4728025aacd4b7c370c419533a25f58950f24b6c Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* TabView: support dynamic tabs with createObject() and destroy()J-P Nurmi2013-04-161-2/+26
| | | | | | Change-Id: I4c8e4219de6f510e4790343528fa7b6b502b7722 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove hard dependency on widgetsJens Bache-Wiig2013-04-151-2/+1
| | | | | Change-Id: I1fabb4efcc931f12f0a65ac5c66e6e085108269b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Cleanup the superfluous \internal tags that are no longer neededJ-P Nurmi2013-04-081-2/+0
| | | | | Change-Id: I2eaaf7e82351e70a742eeadc32b8e1f8655a02c1 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Doc: minor language editsNico Vertriest2013-04-051-4/+4
| | | | | | | | | | | | | 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>
* TabView: add implicitWidth and implicitHeightCaroline Chao2013-03-191-0/+2
| | | | | | | | | Change 7d40a10e49d1959c0523eab26de348a616596f79 removed the width and height of the TabView. The TabView needs a default size to be displayed properly. Change-Id: Ic8d819222efa17cee1f8aebee9ac62e371142174 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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>
* TabView: Don't give a default size to the TabViewCaroline Chao2013-03-181-2/+0
| | | | | | | Task-number: QTBUG-30031 Change-Id: I389f955c102e1954a1a7c1d5ac6b1a4f871f39d9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Make TabView::tabPosition use the Qt::Edge enumJ-P Nurmi2013-03-151-7/+7
| | | | | Change-Id: I8b6af1c4c59cfcad513108e42c0e206320ee2b66 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>
* Update TabView API and allow inser/remove of tabsJens Bache-Wiig2013-03-011-33/+92
| | | | | Change-Id: I6b10f539b036811243676f34c0fabe403c263923 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
View Lorry Controller Status