aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
Commit message (Collapse)AuthorAgeFilesLines
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc updateVenugopal Shivashankar2016-03-2924-66/+70
| | | | | | | | | | | | - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* QQuickUniversalFocusRectangle: optimize string usageAnton Kudryavtsev2016-03-291-2/+4
| | | | | | | | | | Replace QString::arg() chain with multi-arg overloaded function. It's faster because of args are replaced in one pass. While touching the code, also cache width and height of bound. Change-Id: Id8d19143f426ed1998713204dc9c8d4b51e58db5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickUniversalFocusRectangle: proper construction of vectorAnton Kudryavtsev2016-03-291-1/+1
| | | | | | | | | ... with known size and known value by according ctor. Don't use appending for this case. Change-Id: Ib2bf9703bb03bdfa628d1ae78c6d0353e991b3e4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Themes: cache result of QFont::family()Anton Kudryavtsev2016-03-282-8/+10
| | | | | Change-Id: I5318a61dbb699e2f251d218e614c1a2ff02d53a7 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Default style RadioButton: deduplicate bindingAnton Kudryavtsev2016-03-261-1/+1
| | | | | | | | Don't evaluate condition twice. Just use result of parent.border.color Change-Id: Ib0c31fd5eba9d12cb95143c77e40514637028f8a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add support for specifying theme, accent & primary via envJ-P Nurmi2016-03-245-54/+117
| | | | | | | | Environment values take presedence over the default values requested in qtquickcontrols.conf, the same way than style name. Change-Id: I4641317bdce320c33a89f3614f3c782883c9c843 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: add examples how to sync active states for ScrollBar & IndicatorJ-P Nurmi2016-03-232-0/+92
| | | | | Change-Id: I353f9c8b0dec4eef71d27300645a1dc3cbca82cd Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix borders for top & bottom drawersJ-P Nurmi2016-03-232-2/+2
| | | | | Change-Id: Ifeb927d7d3edde0b01b4ed666b6a19354171e605 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Inherit QQuickDrawer from QQuickPopupJ-P Nurmi2016-03-235-20/+146
| | | | | | Change-Id: Icf71270e63aedd93ba975ab9743de68c3a54e849 Task-number: QTBUG-51007 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style RadioButton to match new design specsMitch Curtis2016-03-231-4/+4
| | | | | | Change-Id: I35df7eef5ea47dc45d94a5c2c52e436c364a3fe4 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style Switch to match new design specsMitch Curtis2016-03-231-6/+6
| | | | | | Change-Id: I3f566f138b3e26e75ad3e7ab36078ee04e5d627c Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style CheckBox to match new design specsMitch Curtis2016-03-236-4/+9
| | | | | | Change-Id: Ic828f82d38da4a16dc3d308cb67d94a11582768c Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style Button to match new design specsMitch Curtis2016-03-231-4/+7
| | | | | | Change-Id: Id95e48ee694cb205bf2f16acbc90b1cb54e6d596 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc filenamesVenugopal Shivashankar2016-03-2220-0/+0
| | | | | | | | Except the .qdocconf all .qdoc files are renamed to use "qtquickcontrols2" instead of "qtlabscontrols". Change-Id: I317a4e81ea4e78b63a0d4d849d7352f496824cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Introduce ToolTipJ-P Nurmi2016-03-2223-0/+544
| | | | | | Change-Id: I917f7e83219788fc63389773eb07ee39757bed7f Task-number: QTBUG-51003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7J-P Nurmi2016-03-223-6/+12
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-223-6/+12
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp Change-Id: Idb43ff6aff692d01e9bc03450a474bf18a7e41fa
| | * Popup: fix marginsJ-P Nurmi2016-03-213-6/+12
| | | | | | | | | | | | | | | | | | Change-Id: I09f974a00a5a2a8f14645ff5d9bfbd6bad03d324 Task-number: QTBUG-51990 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Doc: moved Gallery files to examples/controls/galleryNico Vertriest2016-03-224-35/+0
|/ / | | | | | | | | Change-Id: I5e15631a51fe01e2ff7ecc6ea4b464b3522b7882 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: moved chat tutorial to examples folderNico Vertriest2016-03-2220-855/+0
| | | | | | | | | | | | Change-Id: I152f29bfe9a202e9c0723e7aa2ebc8fa3c18e2d6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove RangeSlider::track in favor of Control::backgroundJ-P Nurmi2016-03-217-68/+22
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I11e519f5226bf44d18b42fd31276c5528b18ec46 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove Slider::track in favor of Control::backgroundJ-P Nurmi2016-03-218-64/+20
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I664f4227ff55876be2594c8855dacc7c92eddc94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | ProgressBar: use contentItem instead of indicatorJ-P Nurmi2016-03-2110-42/+37
| | | | | | | | | | Change-Id: I8bd21b32b6f3d333c119d77b629b46fe411c06eb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: add increase(), decrease() and stepSizeJ-P Nurmi2016-03-211-0/+3
| | | | | | | | | | Change-Id: I052b650fee7ae94cc826446d285d653a41bd1e75 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: use contentItem instead of handleJ-P Nurmi2016-03-217-41/+22
| | | | | | | | | | | | | | | | Thanks to virtual resizeContent() we can finally use contentItem like everywhere else, and cleanup the special handle item. Change-Id: I9e52ec3ff327d19cda3d85d2e2d9b73d80442bbc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollIndicator: use contentItem instead of indicatorJ-P Nurmi2016-03-217-39/+22
| | | | | | | | | | | | | | | | Thanks to virtual resizeContent() we can finally use contentItem like everywhere else, and cleanup the special indicator item. Change-Id: Ia2bd62684d49a05c199e490750a31c13d2c22182 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Universal: eliminate the extra Rectangle from ProgressBar indicatorJ-P Nurmi2016-03-213-27/+66
| | | | | | | | | | | | | | | | | | Make ProgressStrip capable of presenting non-indeterminate state the same way the Default and Material styles do. This makes the next step, which is to transition to contentItem, easier. Change-Id: I1a7e48cfba963f11764675b6e9a38ff2898b1212 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Use fonts from theme for editable controlsNikita Krupenko2016-03-192-0/+6
| | | | | | | | | | | | | | Also set proper fonts for editable controls in Material theme. Change-Id: I78b8f8597a653af593787e569d6ba5ee7bf182a9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - style pluginsJ-P Nurmi2016-03-198-28/+28
| | | | | | | | | | | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: Ic43c53ee743c40e168722643dacffb966c066a10 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - config fileJ-P Nurmi2016-03-192-3/+3
| | | | | | | | | | Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Reorganize controls.pro vs. controls.pri listsJ-P Nurmi2016-03-192-7/+9
| | | | | | | | | | | | | | | | | | The same way other plugins do it. The main plugin file and the build system flags are specified in the .pro file, and the list of classes and types provided by the plugin are specified in the .pri file. Change-Id: I60c8aeca36c4a177f613ce88f34bfaf5d69b7543 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Cleanup QQuickProxyStyleJ-P Nurmi2016-03-186-36/+12
| | | | | | | | | | | | | | | | | | | | | | Install and remove the proxy theme automatically to eliminate the need for TestTheme do it in tst_applicationwindow. Furthermore, fix some Qt coding conventions, align header guards, remove unneeded empty destructor, and add missing explicit keywords for one-parameter constructors and cleanup somemeaningless ones in paremeterless ctors. Change-Id: Ib95dad003e35e468e941f3a0d2be5b21323fcccd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Document the order of priority for various methods of setting a styleMitch Curtis2016-03-181-0/+4
| | | | | | | | | | Change-Id: I44e22d049ea09eab38b9e85221a328fe904006d8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Correct generated resource namesMitch Curtis2016-03-181-1/+1
| | | | | | | | | | | | | | | | a0d44a16535cc6e751045185e40bbd6c6edaf87a changed them when it shouldn't have. Change-Id: Ifadf02254a32618aa1490cb64278109a1098ff96 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - doc asset filenamesMitch Curtis2016-03-18300-116/+116
| | | | | | | | | | | | | | | | | | This renames all documentation assets (snippets, images), but leaves .qdoc files and the .qdocconf file in an attempt to avoid conflicts with controls 1. Change-Id: I08692233e8d645de8d9746fe74edc14d31bb744e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-1814-32/+33
| | | | | | | | | | | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Chat Tutorial: fix install targetsMitch Curtis2016-03-181-3/+3
| | | | | | | | | | | | Change-Id: I6651ecffcc76953c06bc70e81b38c72aa1da9b02 Task-number: QTBUG-51918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-183-25/+31
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/controls/qquickstyleattached_p.h src/imports/controls/material/qquickmaterialstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickpopup.cpp Change-Id: I17c3c4d1040b89838f0903e0a17069b835895199
| * Material: use proper shades for dark theme colorsNikita Krupenko2016-03-171-16/+28
| | | | | | | | | | | | | | | | This fixes colors for checked switch dark theme and raised highlighted button in both themes. Change-Id: I3c485fb1b779104d6d7f682921b34cb535312f7c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Material: corrected default, ToolButton and checkable controls fontsNikita Krupenko2016-03-162-9/+3
| | | | | | | | | | | | | | | | | | According to Android sources, ToolButton has the same font, as other buttons and checkable controls use default (system) font. Also, set proper size for default font. Change-Id: I355ab57ef476918bab346538fefbd6c0209d2221 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add public API for setting and getting the style from C++J-P Nurmi2016-03-174-10/+34
| | | | | | | | | | | | | | | | TODO: setup QtLabsControls C++ module docs Task-number: QTBUG-50787 Change-Id: I382bad34df88d13fb9a74b3d2f9203280dfb4a66 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: complete documentation Control QML TypeNico Vertriest2016-03-171-0/+0
| | | | | | | | | | | | Change-Id: Ie6b8dec8bea2315232beccf2f20cc860610451e8 Task-number: QTBUG-51616 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QQuickStyleSelector::select() takes a file _name_J-P Nurmi2016-03-171-35/+35
| | | | | | | | | | | | | | | | Don't hard-code "/" in qtlabscontrolsplugin.cpp, because it won't work with the upcoming style path configuration via QQuickStyle . Change-Id: I32c178361f16c449f81abbb34d7b3ee7daf01fce Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | qtlabscontrolsplugin.cpp: cleanup stray characterJ-P Nurmi2016-03-171-1/+1
| | | | | | | | | | Change-Id: I9a25368f861138c8b7aec71a6f58efd70a8f4f2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: Corrected link issues in qt labs controlsNico Vertriest2016-03-163-23/+17
| | | | | | | | | | Change-Id: I799ed7d7ac8d60a2422be894f15ef7fce059a832 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename QQuickStyle to QQuickStyleAttachedJ-P Nurmi2016-03-164-21/+21
| | | | | | | | | | | | | | | | Make room for a public QQuickStyle class for configuring the style. Task-number: QTBUG-50787 Change-Id: I2a43436dd1815e3acd7e896a5847e41db42af5c4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-162-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickcontrol_p.h src/templates/qquickpopup.cpp tests/auto/controls/data/tst_combobox.qml tests/auto/controls/data/tst_control.qml Change-Id: Ib7853d5ee5c4444872cd5c2d789e20d229c955d1
| * Change style inheritance for popupsJ-P Nurmi2016-03-152-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to make popups inherit theme & accent from its parent item was driven by ComboBox. However, in many cases it has an undesired side effect, so we've changed Popup to inherit its style attributes from the parent window instead, just like we did for fonts. The only exception to this is ComboBox, where the popup is an integral part of the control. This special case is now handled in the respective style implementation. A concrete example is that we can now specify dark theme by default for Material style ToolBar to get a better matching light text against the colorful background. In Gallery, this won't effect the options menu, which is a child of a ToolButton. The menu retains light theme along the rest of the application. Change-Id: Ibdc8fcf5b5fa258d853410a9b40368472424a8c6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add SwipeDelegateMitch Curtis2016-03-1522-0/+705
| | | | | | | | | | | | | | | | | | | | SwipeDelegate presents a view item that can be swiped left or right to expose more options or information. It is used as a delegate in views such as ListView. Change-Id: I7533a2b223f652993b6cee730930ea6dc125c869 Task-number: QTBUG-51610 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: update doc Qt Labs ControlsNico Vertriest2016-03-1010-14/+142
| | | | | | | | | | | | Change-Id: I49a8632b0561483e6090577ae17fd7bdeb4da6ec Task-number: QTBUG-50933 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 06:19:05 +0000