summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* MessageDialog: press escape or titlebar close button to dismissShawn Rutledge2014-02-282-1/+27
| | | | | | | | | | | QMessageBox is a bit special compared to other dialogs, but we don't need it to be so special in QtQuick.Dialogs. Also on OSX, cmd-period will dismiss the dialog, regardless whether it is a QMessageBox or the QML implementation. Task-number: QTBUG-36227 Change-Id: I5dd43080600e9c3774990190bb401291efb8e742 Reviewed-by: Liang Qi <liang.qi@digia.com>
* changes to MessageDialog click(StandardButton, ButtonRole) signal/slotShawn Rutledge2014-02-273-5/+5
| | | | | | | | | | | | After f212322a6ecb237d5fb53e56c6dafffb87e45f09 there was a warning about failing to connect QMessageBoxHelper::clicked to this slot. Also accept() and reject() are not signals so they should not be called with emit. Task-number: QTBUG-36988 Change-Id: I1752ec08cbe82cc2bd9ffc9d920c1487bc17fa76 Reviewed-by: Berthold Krevert <berthold.krevert@basyskom.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add Calendar to testbench.Mitch Curtis2014-02-262-3/+20
| | | | | | Change-Id: Id8c636c768afd9eecba5517c66371dde179fd998 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Revise tst_applicationwindowJ-P Nurmi2014-02-261-3/+4
| | | | | | | | | | Use more reliable/applicable waitForRendering(item) instead of wait(0) and make the window visible before testing content item geometry. Task-number: QTBUG-36938 Change-Id: I414749019d1fca01c09ab3361c0355d231b2bcb3 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Set baselineOffset on Styles/Base correctlyJan Arve Saether2014-02-264-0/+10
| | | | | | | | Fixes the baselineOffset for TextField and SpinBox Task-number: QTBUG-36529 Change-Id: I697d4c8bc2ee61929eabb54a6ec6520311a4e3e2 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* TableView: Make "model" property consistent with ListViewJens Bache-Wiig2014-02-261-1/+1
| | | | | | | | | | [ChangeLog][QtQuickControls][TableView] "model" property exposed to delegates is now consistent with ListView behavior. task-number: QTBUG-33107 Change-Id: I8315c32a9d8beda9901ed65b552f0b8a587316ee Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Support text alignment for TableViewHeaderv5.3.0-alpha1Jens Bache-Wiig2014-02-253-2/+3
| | | | | | | | | task-number: QTBUG-33072 [ChangeLog][QtQuickControls][TableView] TableView headers now respect TableViewColumn::textAlignment Change-Id: I482e74e10b8879b367bce8165fa9310b28a06ad2 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix initial incorrect value for SwitchJens Bache-Wiig2014-02-252-12/+9
| | | | | | | | | | | | | | Task-number: QTBUG-36910 We would sometimes get the incorrect value for switch. This patch doesn't radically change the logic but it makes the initial value assignment a binding rather than depend on oncompleted. I also slightly cleaned up and simplified the logic. Change-Id: I001494a5f9f3a421a5c755a7fed1f9be09d918bd Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* TableView: fix activeFocusOnTab behaviorLiang Qi2014-02-253-1/+136
| | | | | | | | | | Autotest is included. Task-number: QTBUG-36950 Change-Id: I94c5b5225437ce87365740ea7423b09737dd275a Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Add styleData.totalWidth for TabViewStyle::tabJ-P Nurmi2014-02-252-0/+2
| | | | | | | | | [ChangeLog][QtQuickControls][Styles] Added styleData.totalWidth property for TabViewStyle::tab component. Task-number: QTBUG-37021 Change-Id: I76c29d132602926d9dacf690b09f556292359bf6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* CustomDialogs example: add an example using CalendarShawn Rutledge2014-02-251-1/+27
| | | | | | | | Also the spinbox exmample will accept when the user presses enter. Change-Id: I47765899acfbc435e2409f7a30e54e8f041b6e73 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Add the new dialog & calendar examples to .gitignoreJ-P Nurmi2014-02-211-0/+2
| | | | | Change-Id: Ieca9745c2d663e8acfa49f97a0a1d05f09678345 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Respect Tab::enabledJ-P Nurmi2014-02-214-0/+23
| | | | | | | | | [ChangeLog][QtQuickControls][TabView] Added support for enabling and disabling tabs. Task-number: QTBUG-36356 Change-Id: I97abc8008d479ce6b7a661e5a986c721a4482773 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Calendar example: sql module requiredCaroline Chao2014-02-211-1/+4
| | | | | | Change-Id: I75eb50a053f429135d1d49d1769b85a247c30311 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Calendar example: add needed QTPLUGIN for static buildsCaroline Chao2014-02-211-0/+2
| | | | | | Change-Id: Ieea1b38f5213f54c8e7de5fc572dcf2de6dfed18 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Minor cleanup and optimizations for TableViewJens Bache-Wiig2014-02-212-9/+7
| | | | | | | | Removes a couple of unused properties, use proper equality and don't re-assign the alternate binding. Change-Id: Id97294825580ce743fc1d70fba9485b85335ef31 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* MenuContentItem: Remove scroller indicator style warningGabriel de Dietrich2014-02-201-1/+1
| | | | | Change-Id: I3d50ba06c790d44a2db4195e3ad1f8d5aebc2a12 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Speed up binding comparisons for TableViewJens Bache-Wiig2014-02-201-9/+9
| | | | | Change-Id: I0bf4db5ff91fea4927e32127ba22094d57caeaf5 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Improve TableView performance by caching row-delegatesJens Bache-Wiig2014-02-202-70/+115
| | | | | | | | | | | | | This gives a much better scrolling performance in TableView since we do not have to instantiate the rows or re-establish bindings to header columns for each created table row. [ChangeLog][QtQuickControls] Significantly optimized TableView scrolling by recycling rowDelegate instances. Change-Id: I301e5e476c78f241be1282332905b714fbc5b37d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Dialogs: add new CustomDialogs example to the qrc resourcesShawn Rutledge2014-02-201-0/+1
| | | | | | | Forgot to do this in change ccb088a6beaff01419ec9325dbd19040f279b6ea Change-Id: I00a2dc81a3f99937dbbab1d9dda1a393588124f2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QPlatformDialogHelper::buttonLayout returns int*Shawn Rutledge2014-02-171-1/+1
| | | | | Change-Id: Ia453bbe65fb64a7d9523e270e1b6f644d8e3a7a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* DefaultDialogWrapper: do not accept key events which do not dismissShawn Rutledge2014-02-171-0/+2
| | | | | | | | Otherwise you cannot type in any TextInput which the dialog might contain. Change-Id: I7b0264199072372e989f2f8404b6029d7306c3b0 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-1711-27/+58
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-1211-27/+58
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/layouts/qquicklinearlayout.cpp Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
| | * Set accessible name for RadioButtonFrederik Gladhorn2014-02-061-0/+1
| | | | | | | | | | | | | | | Change-Id: Iad011baa39f955681613656028c6ccf852a8f869 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Doc: Fix broken linksSze Howe Koh2014-02-067-13/+10
| | | | | | | | | | | | | | | Change-Id: Ibf4431b20b61c5e16c6936775647ba3eb0049abe Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Ignore selectByMouse on android until QTBUG-36515 is resolvedJens Bache-Wiig2014-02-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment mouse selection on android can make text input unusable when certain virtual keyboard features are enabled. This patch will temprorarily disable this feature on TextField and TextArea until we have a workable solution for these cases. Change-Id: Ia04db31d1e83ddfc47bec7519e5a78746e6626a9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Touch example: Fix back navigationCaroline Chao2014-02-031-10/+6
| | | | | | | | | | | | | | | | | | | | | The Key event needs to be in a item that has focus. Change-Id: I6f7293ac74b477e37c200dbb7ee8629d4f769d05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Allow size hint changes during a rearrange.Jan Arve Saether2014-01-282-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we marked the layout as not dirty straight after a rearrange was done. However, in the case of when a size hint changed during a rearrange that would block the pending rearrange (since it only perform the actual rearrange if its dirty). Instead, mark the layout as not dirty *before* the rearrange. This will allow bindings such as implicitWidth: height to execute the pending rearrange. (Although such bindings are not encouraged) Task-number: QTBUG-36169 Change-Id: I75bd821a0ca4302026bd5dac01287ca3359d471b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
View Lorry Controller Status