aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QQuickPopup: allow subclasses to prepare/finalize transitionsJ-P Nurmi2016-03-022-41/+71
| | | | | | | | | | This allows QQuickDrawer prepare the transitions so that "position" is is set as the default target property, and finalize the transtitions so that the drawer remains visible on the window edge, and will be able to handle overlay events. Change-Id: I0afedb3d10c37c68a19df926c0224dacf39dd8ce Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add virtual QQuickPopupPrivate::reposition() for QQuickDrawerJ-P Nurmi2016-03-012-63/+39
| | | | | | | | | | QQuickDrawer implements different kind of positioning than other popups. Unlike other popups, it specificly wants to go outside the window bounds. Change-Id: I33a885066ce750f73479be490274389d09eae442 Task-number: QTBUG-51007 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickPopup::childMouseEventFilter() for QQuickDrawerJ-P Nurmi2016-03-013-0/+30
| | | | | | | | | | QQuickDrawer needs to be able to filter child mouse events so that the drawer can be closed by dragging also over the drawer, not just outside. Change-Id: I5b9978ebdf33cd0095d6cf67a0d76eee2edae8b6 Task-number: QTBUG-51007 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickPopup::window() - C++ only APIJ-P Nurmi2016-02-292-13/+19
| | | | | | | | | Makes the transition for changing QQuickDrawer's base class from QQuickItem to QQuickPopup smoother. Change-Id: Ibedca7190f6bfdee678ec4c07e0db83f2c292b86 Task-number: QTBUG-51007 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Chat TutorialMitch Curtis2016-02-2920-0/+861
| | | | | | | | | | This is useful for beginners who may have not even used Qt Quick Controls before. It goes step-by-step (and in detail) to show how and why things are done the way they are. Change-Id: I527ff2ce429279e37b7cebb765588cb89b5c5e89 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Route overlay events to QQuickPopup::overlayEvent()J-P Nurmi2016-02-294-79/+47
| | | | | | | | | | | This cleans up QQuickOverlay a bit, and prepares QQuickPopup so that it's possible for QQuickDrawer to override overlayEvent() to handle the necessary events at the window edge, instead of overlaying the whole window with a transparent item. Change-Id: I6b7bf26fd99e81b61adac42ec04eb93423e36677 Task-number: QTBUG-51007 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-02-25114-67/+184
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-02-25114-67/+184
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickrangeslider_p.h Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
| | * QQuickPopup: fix uninitialized variableJ-P Nurmi2016-02-251-0/+1
| | | | | | | | | | | | | | | Change-Id: I339fdb284d65859b5df3a120fc806beaf950031b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * Exclude designer support on iOSJ-P Nurmi2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Causing build problems due to RCC'ing 'designer/images/*.png' Change-Id: I4d97d8514fa38e5d78b8a6b1b6647e3834c864d7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * Implement accessibility support for Popup and MenuJ-P Nurmi2016-02-256-4/+48
| | | | | | | | | | | | | | | | | | Change-Id: I55067bb1cb9888be8e0e991fb73c9365d93d04f4 Task-number: QTBUG-51316 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * Fix QQuickPopup to respect explicit sizeJ-P Nurmi2016-02-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't resize the popup (clamping to its implicit size) unless the popup really has to be resized in order to fit the screen. Change-Id: I81201b77a1001ac22291ede1fc685f7208ff2916 Task-number: QTBUG-51322 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * RangeSlider: forward focus to the handlesJ-P Nurmi2016-02-242-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The active focus ends up to RangeSlider when using forceActiveFocus() or QML KeyNavigation. We must forward the focus to one of the handles, because RangeSlider handles key events for the focused handle. If neither handle has active focus, RangeSlider doesn't do anything. Change-Id: I61a53d0c7203fad64306b54c1f96093bd9312416 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * QQuickMaterialProgressStrip: reset the transformation matrixJ-P Nurmi2016-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The trasformation matrix for the indeterminate animation has to be reset when switching back to non-indeterminate mode, or else the indicator is translated to a wrong position. Change-Id: I8489a504f0b9626dbd0172ba0fba842f4528d027 Task-number: QTBUG-51312 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Doc: fix typos in Qt.labs.calendarJ-P Nurmi2016-02-233-3/+3
| | | | | | | | | | | | | | | Change-Id: I13329270602d5b6e59d92dc412d72b2c4714c6c2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Fix CalendarModel month indicesJ-P Nurmi2016-02-231-6/+32
| | | | | | | | | | | | | | | | | | Change-Id: I25c683cce19436d103d3225ad098daedf6212b64 Task-number: QTBUG-51108 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Material: tweak the accent color and ripples for the dark themeJ-P Nurmi2016-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general, the appropriate shade is 200 in the dark theme. Furthermore, reduce the translucency of the ripple in the dark theme to make it better visible. Change-Id: I6060dfbdb2d291eded56ca648e1356d6228e3b25 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Material: add missing focus highlightsJ-P Nurmi2016-02-226-4/+28
| | | | | | | | | | | | | | | | | | | | | Change-Id: Id678a095a56f7494c9f32160326ba667a6c0dc28 Task-number: QTBUG-51257 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Add icons for the QML DesignerJ-P Nurmi2016-02-2292-44/+43
| | | | | | | | | | | | | | | | | | Change-Id: If5a2e766eff51fb21d81c44f8313d7fdc2a67678 Task-number: QTBUG-50801 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Do not limit ComboBox menu to predefined valueNikita Krupenko2016-02-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows ComboBox menu to occupy more screen space and use the window size as limit. Task-number: QTBUG-50758 Change-Id: If430338f7baa291406f3ad0657d0cb267e17a3a2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Add ApplicationWindow::backgroundJ-P Nurmi2016-02-254-0/+57
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convenient for setting a stylish background that covers the whole window, that is, goes below the header and footer. The same already works with Page, since it inherits Control. import QtQuick 2.6 import Qt.labs.controls 1.0 ApplicationWindow { visible: true width: 400; height: 400 header: ToolBar { opacity: 0.5 } footer: ToolBar { opacity: 0.5 } background: Rectangle { gradient: Gradient { GradientStop { position: 0.0; color: "lightsalmon" } GradientStop { position: 1.0; color: "salmon" } } } } Change-Id: I57219779913c178cacfe4cbc4bf3a524b213d2c0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Control: add hoverEnabled and hovered propertiesJ-P Nurmi2016-02-255-2/+79
| | | | | | | | | | | | Change-Id: I35946b9f13ef78ce7bdfbad9706de3e96bd48ea4 Task-number: QTBUG-50003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Slider: add wheel supportJ-P Nurmi2016-02-242-0/+16
| | | | | | | | | | | | Change-Id: I413d8c853bfe3cc748584dfebd28172ead89d638 Task-number: QTBUG-50221 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | SpinBox: add wheel supportJ-P Nurmi2016-02-242-0/+14
| | | | | | | | | | | | Change-Id: I37c732814783a382a078338aeea37c7b417a08d1 Task-number: QTBUG-50220 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add Control::wheelEnabledJ-P Nurmi2016-02-245-2/+31
| | | | | | | | | | | | | | | | Change-Id: I1ea2c93e908c98119ba25e3e40e02ab96eca8dd2 Task-number: QTBUG-50220 Task-number: QTBUG-50221 Task-number: QTBUG-50222 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Fix Control::focusPolicy docsJ-P Nurmi2016-02-231-1/+0
| | | | | | | | | | | | | | Accidentally marked as read-only, even though it's not. Change-Id: I4a24a6936a8f6cea3f6ef35fa5924e86415bf732 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Using File Selectors with Qt Labs ControlsJ-P Nurmi2016-02-235-14/+171
| | | | | | | | | | Change-Id: I55a8fa716540d7ee2bd03018c6fefae3f400ca0d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add SpinBox::editable propertyJ-P Nurmi2016-02-237-6/+41
| | | | | | | | | | | | | | | | | | | | The default value is false, which is more mobile/embedded/touch friendly choice, and will be also in line with ComboBox::editable when it gets introduced sometime in the future. Change-Id: Iaaad8f5533100c2d5c4b49d1ef8ee849cf31feff Task-number: QTBUG-51114 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update plugins.qmltypesJ-P Nurmi2016-02-223-2/+47
| | | | | | | | | | | | Change-Id: I54d19667a4f72c34174b8235f9ae24b533be2209 Task-number: QTBUG-51278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ComboBox: use Qt::StrongFocus focus policyJ-P Nurmi2016-02-221-3/+1
| | | | | | | | | | Change-Id: Ia0fa2d6497e4fbf9124ab8e063c4e0b5135189c0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add Control::focusPolicyJ-P Nurmi2016-02-223-1/+60
| | | | | | | | | | Change-Id: I136aa08d5c1b96f168c4456a2a30b163b2004779 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Material TabBar: highlight at the top when the bar is at the bottomJ-P Nurmi2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Even though the Material Design Guidelines recommend against placing tabs at the bottom, we cannot prevent our users from doing that. It is the standard convention on iOS, for instance. Coincidentally, the official Google Translate app for iOS uses Material design, has tabs at the bottom, and has tab highlight at the top of the bar. A screen- shot is attached to QTBUG-50043. Change-Id: Id7c9398b8b4bc9d270f0d908b1a68d68f49d32f0 Task-number: QTBUG-50043 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add the style name as a static file selectorJ-P Nurmi2016-02-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This allows implementing style specific variants that get automatically chosen by QQmlApplicationEngine's built-in file selector. :/MyAppToolBar.qml :/+material/MyAppToolBar.qml :/+universal/MyAppToolBar.qml Change-Id: I04a75a0fc4b0b21513733040bbf9d5d309786b47 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Universal: follow the Qt coding styleJ-P Nurmi2016-02-203-47/+56
| | | | | | | | | | | | | | | | Return early to keep the indentation low. This style was already used in many areas, so now the same style is consistently used everywhere. Change-Id: I6db941be07b153c7448dd418256c792186f71e58 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Material: follow the Qt coding styleJ-P Nurmi2016-02-202-60/+70
| | | | | | | | | | | | | | | | Return early to keep the indentation low. This style was already used in many areas, so now the same style is consistently used everywhere. Change-Id: Ie3f010b224ff20480f355cc91fa6560a93c239ea Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-02-2013-220/+201
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickapplicationwindow.cpp src/templates/qquickcontrol_p.h src/templates/qquickpage.cpp src/templates/qquickpopup.cpp src/templates/qquickpopup_p_p.h Change-Id: I265e0267afb22e3d3f80801191f1a810cd2be312
| * Popup: use available size and paddings from the popup itemJ-P Nurmi2016-02-194-187/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the internal popup item inherits Control, which already provides these features, we may use them directly instead of re-doing them in Popup. NOTE: QQuickMenu code has lots of direct references to the content item, which used to be stored in QQuickPopupPrivate, which is the base class of QQuickMenuPrivate. Now that the content item is stored by QQuickPopupItem instead, the direct references don't work. Thus, as a temporary solution to avoid this patch growing large, we'll store the content item in QQuickMenuPrivate. Change-Id: I80a16d34432131a4326c1b6ae54419470be53f96 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Recommend the use of ApplicationWindow with popupsMitch Curtis2016-02-192-1/+38
| | | | | | | | | | | | | | | | It's important to mention that ApplicationWindow provides some extra support for popups. Change-Id: Iecea78d9d4446bbc4694fcde0166d1b1c2fb62ee Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Controls: fix locale inheritance for popupsLiang Qi2016-02-193-10/+28
| | | | | | | | | | | | | | | | | | QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its locale from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: Ie5908f86a154502962d6406dd4067b46cc527de7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Material: make MenuItem highlight visible against any backgroundJ-P Nurmi2016-02-191-1/+1
| | | | | | | | | | | | | | | | | | Same what f56ec245 did to ItemDelegate. Use a translucent color for the highlight, so that the exact background color doesn't matter. Change-Id: I9e1673bbc3e7348b15854d623ee0c37aea51f231 Task-number: QTBUG-51118 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Controls: fix font inheritance for popupsLiang Qi2016-02-183-5/+23
| | | | | | | | | | | | | | | | | | QQuickPopup is a QObject, not a QQuickControl. Then need to make QQuickPopup::popupItem() inherit its font from QQuickPopup::parentItem(). Task-number: QTBUG-50984 Change-Id: I7f417474172b533b744eb668a0476cdcbabba868 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * QQuickControl: delayed the call of resolveFont()Liang Qi2016-02-182-8/+1
| | | | | | | | | | Change-Id: Iadfbc3a39de102825c9dde60a236883b88834b34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Material: return proper themeFont() for controlsNikita Krupenko2016-02-173-6/+31
| | | | | | | | | | | | | | This allow to get proper fonts for most controls. Change-Id: I4b43ce05b09c30f59dca7d23e8d890fa9dfb74ab Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * clear parentItem of old header and footer itemsJochen Seemann2016-02-172-4/+12
| | | | | | | | | | | | | | | | | | This patch completes the support in QQuickApplicationWindow and QQuickPage to dynamically change the header and footer item. Change-Id: Id230db135ca2957d94aa126e9d58ac486c88557c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-158-5/+44
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692
| * ItemDelegate: make the highlight visible against any backgroundJ-P Nurmi2016-02-153-1/+8
| | | | | | | | | | | | | | | | | | Use a translucent color for the highlight, so that the exact background color doesn't matter. Change-Id: I63348137dedd04aca8110b8f7610506ca003ec87 Task-number: QTBUG-51118 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * SpinBox: fix JS callback accessJ-P Nurmi2016-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | Avoid calling an uninitialized JS callback. This is a regression caused by lazy creation of the JS callbacks in 1f146d9. Change-Id: I1816b491ada0509c5664cffbcaa32ca987095b31 Task-number: QTBUG-51114 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * Link to examples from index pageMitch Curtis2016-02-151-0/+1
| | | | | | | | | | Change-Id: I75e9c0d60a555dfb3ed494544af348bdc333f6e1 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
| * Test and fix AbstractButton::pressAndHold()J-P Nurmi2016-02-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | Using the same auto test that already exists for TextField and TextArea nicely exposed some difference in the behavior: - the signal wasn't canceled on second press - the signal was canceled right away on any tiny move. now it allows the same little threshold than TextField and TextArea Change-Id: I6b9bd19c614b36dd0ec7b232f821af3aa929d02a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * SwipeView: warn the user for using anchorsJ-P Nurmi2016-02-121-1/+16
| | | | | | | | | | Change-Id: I49b951f8382277ee9ea86f487ee70fe954cf1ece Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>