summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ButtonStyle: fix checked stateJ-P Nurmi2014-04-071-3/+4
| | | | | | | | Restore checked state handling that was lost in fd8d7261. Task-number: QTBUG-38143 Change-Id: Iec6598d5ddba449da16cfefa55b0d575d2563c47 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Import QtQuick 2.2J-P Nurmi2014-04-07198-280/+280
| | | | | Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Improve scrollbars on touchJ-P Nurmi2014-04-042-2/+3
| | | | | | | | | | | | Hide the scrollbar background which makes it look like a desktop scrollbar. Scrollbars are now by default non-interactive on touch. [ChangeLog][QtQuickControls][ScrollView] Scrollbars are now non-interactive on mobile/touch devices. Task-number: QTBUG-37387 Change-Id: I63b6db9309a6e33140de0d26c8d4fd3e1bcfb832 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Update TextArea::wrapMode docsJ-P Nurmi2014-04-021-5/+2
| | | | | | | | | | | The documentation adapted from TextEdit mentioned a wrong default value and contained confusing and unnecessary low-level details how TextEdit calculates its content/implicitWidth. TextArea hides these details and the documentation has been simplified accordingly. Task-number: QTBUG-38022 Change-Id: Ifa29956b59b7f169fbdc94f455dbdad29469db3e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Fix some issuesSze Howe Koh2014-03-314-4/+5
| | | | | Change-Id: I2f209fc33fdeecf0a3a3067486f9f4abfe18a2ec Reviewed-by: Martin Smith <martin.smith@digia.com>
* Disable mipmapping on the style itemLaszlo Agocs2014-03-311-0/+2
| | | | | | | | | | | | | | The recent removal of QSGPlainTexture::setHasMipMaps() made the texture material enable mipmapping on the texture by default. Previously this was not the case, the material did not enable mipmapping on the texture regardless of the value of mipmapFiltering. The default value (Nearest) now properly enables mipmapping but this is not ideal for the style item. Therefore we disable mipmapping explicitly. Task-number: QTBUG-37690 Change-Id: I15607fd0c3a06f0cefc416b74f6cee25ef7966bd Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Add a note on recycling of delegates for TableViewJens Bache-Wiig2014-03-281-1/+16
| | | | | | | | Since this is a new feature in 5.3, we should clearly document the implication this will have on delegates. Change-Id: I2255e9306bbac503c38d79586b4cac4eb5c8ba1e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Fix broken links (explicit intra-module qualifiers)Sze Howe Koh2014-03-275-6/+6
| | | | | | | | | | All these links are intra-module, so these qualifiers should not have been required. Might be an indication of a QDoc bug. Task-number: QTBUG-37719 Change-Id: I791ad767f1eb33c52b96de451ee0601a0b7c12dd Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* QtQuick.Dialogs FileDialog: don't go astray into resources on AndroidShawn Rutledge2014-03-271-1/+1
| | | | | | | | Needed part of the same fix from QTBUG-36006. Task-number: QTBUG-37741 Change-Id: I3bfe518dfdd6027bdb932c612d01b0c8d1753dad Reviewed-by: Liang Qi <liang.qi@digia.com>
* Doc: Fix some warnings in Qt Quick ControlsSergio Ahumada2014-03-273-10/+10
| | | | | | | | | | Set 'exampledirs' to '../../../examples/quick/controls' instead, so the files under 'examples/quick/dialogs' are not processed twice. Also fix a small typo in BusyIndicatorStyle.qml Change-Id: Id5b3ff144056ab37e4a9e9f52cd1811797c54fb1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Warn that use of private types requires both public and private importsMitch Curtis2014-03-251-1/+2
| | | | | | Task-number: QTBUG-37751 Change-Id: I5a91ec1dc4b38e47846e5e72e41902be876cb306 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* StyleItem: Resolve item palette per item typev5.3.0-beta1Gabriel de Dietrich2014-03-202-4/+67
| | | | | | | | | This queries the platform theme for each type, and sets the right palette. This should allow us to remove some workarounds we might have for those cases in desktop style. Change-Id: Ia5f650b46de5418586bc946d63fd394875e90184 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Set numerical input hint on SpinBoxJens Bache-Wiig2014-03-201-0/+1
| | | | | | | | | | | | Since we don't allow you to override the text validator, we guarantee that the only thing you are allowed to type in a SpinBox are numbers. [ChangeLog][QtQuickControls][SpinBox] SpinBox now only shows the numerical keys in onscreen keyboards where possible. Task-number: QTBUG-37619 Change-Id: If6412d1dc49bf0e602330e90963e8cd990f5d43c Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Try to maintain bindings to checked property in CheckBoxJens Bache-Wiig2014-03-202-2/+51
| | | | | | | | | | | | | | | | It is currently impossible to keep a binding to the checked property because any external manipulation of checked will cause it to be internally overwritten based on the implicitly triggered checkedStateChanged signal. This adds a protection mechanism similar to what we already have on the checkedStateChanged signal. [ChangeLog][QtQuickControls][CheckBox]Fixed a problem incorrectly causing bindings to the checked state to break. Task-number: QTBUG-31627 Change-Id: I506fa34561529a414c7b088001f96e8f283edd89 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Let ApplicationWindows default max size be unbounded.Jan Arve Saether2014-03-192-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | Previously, the ApplicationWindow determined its maximum size from its content items maximum size. This was inconsistent with how QWidgets normally behaved. The default max size of an ApplicationWindow is now therefore unbounded. If the application want the ApplicationWindow to have a maximum width or height, the application must set up the binding manually. This can be done with a fixed maximum size or it can be bound to a layout: contentItem.maximumHeight: grid.Layout.maximumHeight contentItem.maximumWidth: grid.Layout.maximumWidth If the grid layout has anchors.margins, those need to be taken into consideration too, resulting in the following binding: contentItem.maximumHeight: grid.Layout.maximumHeight + grid.anchors.topMargin + grid.anchors.bottomMargin Change-Id: Ibac80ba71f12e3eb9e5db8f875ecfa64b1e28b0d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Do not reduce items size when snapping to pixel grid.Jan Arve Saether2014-03-193-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the required snapping to pixel grid, there was a high risk of reducing the size of an item to become smaller than its minimum size. With the original way of snapping (simply doing qRound) it didn't happen very often, but with the last change the problem became more evident: If an item that covered the full extent of a cell was snapped it would *always* shrink. Sometimes it could then shrink to become smaller than its minimum size. This was easy to see if the item snapped was a Text element with eliding enabled, since that meant that the text was elided as soon as the Text element got resized to smaller than its minimum. The current solution now is to always snap the x,y coordinates (with qCeil), but keep the width and height that was calculated by the layout. This means that snapped items will be shifted slightly to the right. Due to this they might extend almost a pixel outside their calculated cell (on the right or bottom sides). Due to this we also have to adjust the size hint result calculation so that it will also ceil up to the nearest integer. The only downside now is that row/column spacings might be less than specified, but they should not reduce by more than 1 pixel. Task-number: QTBUG-36235 Change-Id: Idca909f2102a1f7c5cb50d2490c7af39d722ff4f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add example for indeterminate progress bar animationJens Bache-Wiig2014-03-181-0/+36
| | | | | | | | | | | While this is not really a bug fix it was not documented how you could create your own animated progress bar. Task-number: QTBUG-37434 Change-Id: I5419c2f886c98189207f4e2682e8dda8206677ee Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* ComboBox: fix a warning in MenuContentItemJ-P Nurmi2014-03-181-0/+1
| | | | | Change-Id: I8428d7e2f768cd7341ecb3efcc52fc2dba1d0ca0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* MenuItem: Don't delete owned bound actionsGabriel de Dietrich2014-03-181-6/+1
| | | | | | | | | | | They may be referenced from somewhere else, and there's no reason not to keep them alive while the MenuItem is alive. Task-number: QTBUG-37554 Change-Id: Idaab616c856348c0b7eeb1a2e9fdc5bfc3f8a5fd Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Append handler names to \qmlsignal documentationSze Howe Koh2014-03-1821-0/+102
| | | | | Change-Id: I5e06bdf03ba1ba8e5fe7669f690420dc9a039129 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* ScrollView: flick threshold comes from platform styleShawn Rutledge2014-03-181-1/+1
| | | | | | | | | | QStyleHints::startDragDistance is used as the standard drag or flick threshold in QtQuick generally. We should follow suit because it may depend on platform characteristics such as screen resolution and sensitivity of the input devices. Change-Id: Ibbc7b4549351f795c10de792cb8fa3ff9f5ae58d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Slider: don't prevent stealing until drag threshold is exceededShawn Rutledge2014-03-183-1/+18
| | | | | | | | | | | | | | | If a Slider is placed in a Flickable (or ListView, etc.), preventStealing means that you cannot flick the flickable by dragging over the Slider. It's better to postpone setting that until we detect whether the user is really attempting to drag the slider, because we don't want to rule out use cases such as vertical sliders in a horizontal ListView or vice-versa, so that you drag in one direction to move the slider and in another direction to flick. Platform drag threshold is exposed in Settings (from QStyleHints). (reverts/refines c9665f3e2d1eb12f1cc5a569c20f5d569fafde7f) Change-Id: I82feda6028f6effa5b26ad575a1933e48e971453 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-183-12/+12
| | | | | | | Task-number: QTBUG-35846 Change-Id: I358c3427429b669425f0065686da7e202568c84d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Clean-up styling improvements for CalendarKonstantin Ritt2014-03-172-5/+3
| | | | | | | | | | This is a fix-up for 4569ed127c290bea8d165e15dc2eca525825c627 : "verticalAlignment: Text.AlignVCenter" not needed for alread-centered text; make previousMonth button center-in parent, similarly to nextMonth button; drop dead code from HoverButton. Change-Id: Iceb096944d084ecded70611e3da754150a0e098e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Button's text should use SystemPalette.buttonTextKonstantin Ritt2014-03-171-1/+1
| | | | | | | | In themes with inversed colors text and buttonText colors may differ, and Button as QButton's analog should use the correct one. Change-Id: I101e0c463faf5f99df0282486aef0d3411b41156 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2014-03-152-0/+9
|\ | | | | | | Change-Id: Ib619455982ebb154ba5344765b11da5c04091409
| * Close popup windows when application state changesold/5.2Gabriel de Dietrich2014-02-262-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nobody is telling the popup to close. If it was, that was probably as a side effect of the Qt::Popup flag on some platforms. Certainly not on Windows. We check for the application state as the application may use a popup to signal the user about some event happening, and we don't want to close the popup as soon as the user makes the application active again. Task-number: QTBUG-36474 Change-Id: If41f7bec696105e3c7d8897e9af5fc075c7b8933 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | QtQuick.Dialogs Dialog: implicit geometry fixesShawn Rutledge2014-03-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | On platforms with in-scene dialogs (such as Android), implicitHeight was updating too often, not at the optimal time, and not after being set invisible. The result was that if you added more buttons while the dialog was invisible, it did not grow in height if needed. Task-number: QTBUG-37285 Change-Id: I0b0ad230751361aed89b71b190f12e53d6c73a22 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Menu: Improved sloppy menus logicGabriel de Dietrich2014-03-131-7/+20
| | | | | | | | | | | | | | | | | | | | | | Instead of relying on fixed angles, we now test that the current mouse position is in the triangle defined by the previous mouse position and the submenu's top-left and bottom-left corners. The sloppy timer duration has also been increased to 1s. Change-Id: I575346ac20b5da68ab8ebd6e3cf9a6ddba2b7a72 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Menu: Estimate item height from first visible itemGabriel de Dietrich2014-03-131-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | The first item could be hidden, or not a normal item, thus returning an unproper height. The consequence in the reported issue being that the popup's maximum height would be that of a scroll indicator. Task-number: QTBUG-37445 Change-Id: Ib06d25643cd11224d5eab0452dadd0f6d4119fb9 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Label should use SystemPalette.windowTextRuslan Nigmatullin2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | In themes with inversed colors text and windowText colors may differ, and Label as QLabel's analog should use the correct one Task-number: QTBUG-37468 Change-Id: Ie4f574e782b1c9274d86f45433c36ecab2989b97 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Styling improvements for CalendarJens Bache-Wiig2014-03-1212-69/+207
| | | | | | | | | | | | | | | | | | Also - added the property Calendar::frameVisible. - moved the gridVisible property to CalendarStyle Change-Id: I57da65af130098ac5d0b858c9f964e52e3ba6922 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Fixed offset for overlay in moveable TableViewColumnsJens Bache-Wiig2014-03-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Loader needs to be reparented in order to draw the overlay on top of everything. In addition we need to take both the item offset and the contentX into account. Note I also tweaked the actual drop offset by headerRowDelegate.width/2 as that feels a bit more balanced. [ChangeLog][QtQuickControls][TableView] Fixed an issue with the header overlay offset while re-arranging TableViewColumns Task-number: QTBUG-37180 Change-Id: Ia80049616bb30e1391948fdeaf3f8d68afd7ce3e Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Replace module includes in dialogsAndrew Knight2014-03-1110-5/+8
| | | | | | | | | | | | | | | | Replace a number of QtQml module inclusions with their more specific counterparts, possibly leading to decreased compilation time. Change-Id: I9b48b06e884d46c6440725a704951dc87e2e93db Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Popupmenu: update item under mouse upon pressRichard Moe Gustavsen2014-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | We need to update item under mouse when doing a mouse press since you don't have a guarantee that there will be a mouse move before you eventually get a mouse release. This will be the case on iOS (and probably other touch platforms). Change-Id: Ia7220e9a822248ee7dc73b5530b04e858a0be47b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Simplify Slider's MouseAreaFrederik Gladhorn2014-03-101-6/+1
| | | | | | | | | | Change-Id: Ib7bc6a370a4cb2bac34d08f4191cca28b69a7185 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | MenuItem: Update platform menu item when checkable changesAndrew Knight2014-03-102-2/+14
| | | | | | | | | | | | | | | | This is required to inform the platform backend to change the menu item's appearance. Change-Id: I326ac2d79b4f9e7646c2c01b7f41662310736b18 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Native MessageDialog: connect the new version of the clicked signalShawn Rutledge2014-03-101-2/+2
| | | | | | | | | | | | | | | | | | After f212322a6ecb237d5fb53e56c6dafffb87e45f09 there was a warning on connect, and it was not possible to dismiss a native MessageDialog (for example on Android). Change-Id: I12f62d5bdb61176ea2ff08c6be3731010cb47d45 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Menu: Adding sloppy submenu navigationGabriel de Dietrich2014-03-071-3/+43
| | | | | | | | | | | | | | | | Because that's how human beings operate. [ChangeLog][QtQuickControls]Added sloppy submenu navigation Change-Id: Ife520229f1b57a76d049bb7e72826e5f1a0cd5ad Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Popup Window: Privately expose popup geometryGabriel de Dietrich2014-03-075-0/+17
| | | | | | | | | | Change-Id: I28a8edd657f02cecbd0c31965bd4085429cf4537 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Menu: Harden popup closing logicGabriel de Dietrich2014-03-071-1/+6
| | | | | | | | | | | | | | | | This should avoid menu popups flickering on the screen when moving quickly over submenu items. Change-Id: If1d4be4e643d20be01b9ad31ef5b025c5437e761 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | QtQuick.Controls FontDialog: add margins to required widthShawn Rutledge2014-03-071-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-37285 Change-Id: I334e576ba016354652dc9d2edc88c1ed78c0f570 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | MenuStyle: Adding missing 'submenuPopupDelay' propertyGabriel de Dietrich2014-03-054-2/+9
| | | | | | | | | | | | | | | | This amends e88bdffe644e53912dfbce95117555cb6a87bfd2 API-wise. Change-Id: I9243aa05c3c4803e1c3ee08a761e782ee8e0841a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Bump version number of controls in qdocJens Bache-Wiig2014-03-041-2/+2
| | | | | | | | | | | | | | This fixes the imports to say QtQuick.Controls 1.2 Change-Id: I09de1740f7ae5f433c2f8c6d7f4bdbd9c6042bd4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | MenuStyle: Fix popup margins for DesktopGabriel de Dietrich2014-03-041-14/+9
| | | | | | | | | | Change-Id: Iacf17af64cc9df0518a7b29a4a7817d7c69d7539 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | MenuBarStyle: Fix metrics, selected appearanceGabriel de Dietrich2014-03-031-7/+15
| | | | | | | | | | | | | | | | On Windows, this depends on qtbase's Ia35a73274cc10b3b5a3f55573c92919f99555db0. Change-Id: If513cefadc052cb1450554f2e6e8af2abac02734 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Fix some typosSergio Ahumada2014-03-033-3/+3
| | | | | | | | | | Change-Id: Ic2e2060b57b0d74e96d6aad0ceff4679d986a26c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Fix gray SpinBox background on macJens Bache-Wiig2014-03-031-0/+9
| | | | | | | | | | | | | | | | This is a regression caused by removing the fillrect for SpinBoxStyle itself. Change-Id: Ibab509634a12aec591d2d031a0e735d602b388c6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Avoid warning when maximum size < minimum sizeJan Arve Saether2014-03-032-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happens in intermediate states, where both *minimumHeight* and *maximumHeight* is supposed to be updated. However, since the order of the bindings is not know, we might have intermediate states where minimumHeight > maximumHeight. In our case minimumHeight was set first to a smaller size than maximumHeight, this would trigger the height binding, causing it to try to set its geometry while its minimumHeight and maximumHeight properties were not in sync. This also happened when maximumWidth < minimumWidth. The output was something like this: qwindowswindow.cpp(1306):QWindowsWindow::setGeometry: Attempt to set a size (116x190) violating the constraints(0x200 - 16777215x190) on window ApplicationWindow_QMLTYPE_12_QML_51/'' Change-Id: Ia4f6e340b608bb4cff5a35bc887adc4eea7efbad Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Dialogs: fix compiler warningShawn Rutledge2014-02-281-1/+1
| | | | | | | | | | | | | | StandardButton is a 32-bit type again. Change-Id: I8aba4150cee169ef837891e9d72a64d48db32346 Reviewed-by: Liang Qi <liang.qi@digia.com>
View Lorry Controller Status