summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* SplitView: fix hidden item after fillWidth item bugold/5.1Richard Moe Gustavsen2013-09-191-11/+12
| | | | | | | | | | | | | | | | Some of the calculations in SplitView assumed that if item with index i was hidden, then so was handle at index i as well. This is not correct. The reason is that a the handle at i belongs to either item i or item i+1, depending on where the fillWidth item is. And this caused a bug when hiding the item to the right of the fillWidth item. Conflicts: tests/auto/controls/data/tst_splitview.qml Change-Id: I59967813f264a856181c57e32c4820d09d7eb363 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* 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>
* Menu: Enable mnemonic menu navigationGabriel de Dietrich2013-09-1311-20/+167
| | | | | | | | | | | We also added a new mnemonic specific shortcut context matcher. This prevents two menu items with the same mnemonic but within different menus to be reported as ambiguous. Task-number: QTBUG-33030 ChangeLog: Added mnemonic navigation for menus Change-Id: I192c9aacba4d15851fe65bf9201251962fe976d5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menu: Fix keyboard navigation on WindowsGabriel de Dietrich2013-09-122-2/+29
| | | | | | | | | | | | | | | The Windows QPA plugin doesn't trigger activated window events for popups, resulting on the popup window not being the application focus window, and therefore, the popup window's content item not getting focus. This results in key pressed events not being sent to the menu item. We workaround this by emitting the window activated event ourselves right after the popup window is exposed. Task-number: QTBUG-33175 Change-Id: I77d1eb33b71af2232a6be6d0f7c6b480bffc10d4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix incorrect spinbox validation at startupJens Bache-Wiig2013-09-101-2/+3
| | | | | | | | | | | The problem was that the validator was applied during the object creation which means the incorrect decimal values were applied and the initial value was incorrectly changed. Task-number: QTBUG-33309 Change-Id: Ic1ace174b9059b9c6ce24fd88b81c5edd7318e80 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Set the menu role for the QPlatformMenuItem to the defaultAndy Shaw2013-09-061-0/+2
| | | | | | | | | | | | QAction has a default menu role which is passed on to the QPlatformMenuItem. But as QtQuickControls does not use QAction, we need to set the default menu role explicitly to TextHeuristicRole. This fixes the merging of menu items on Mac. Task-number: QTBUG-31883 Change-Id: I24f0e265f8ceca376db9970d62e8f79a646fef3b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Menu: Fix popup closing when moving mouse to submenuGabriel de Dietrich2013-09-041-1/+9
| | | | | | Task-number: QTBUG-32673 Change-Id: I1a083f6d7b231b1e3d60012306faf5ad4c573f5e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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>
* Fix scroll bar behavior when clickToPosition is enabledJens Bache-Wiig2013-08-271-7/+10
| | | | | | | | | | | | | | | There were two issues with the scrollbar when using this behavior: Issue 1 - The scroll bar did not account for the grooveRect position, so the handle was not centered correctly around the mouse cursor. Issue 2 - When click-and-holding outside the handle area, you could not continue to move the handle afterwards. Task-number: QTBUG-33133 Change-Id: I251f684f767ce5a372eb0d2b5e6c421f88ac7fbe Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Base style: respect control.backgroundVisible for TableView & TextAreaJ-P Nurmi2013-08-202-2/+2
| | | | | | Task-number: QTBUG-33085 Change-Id: Id9da78ca903f7205d5d493becbd62fd7672082c5 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-161-3/+3
|\ | | | | | | Change-Id: I32b905b74cf7f7c5dc9b9d93900950d0f742ce70
| * Fix a few things in ExclusiveGroup documentation.v5.1.1Mitch Curtis2013-08-161-3/+3
| | | | | | | | | | Change-Id: I4feda741c7052e06f066c2ea69ba242a11b62b04 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix 'make qmltypes' by setting correct IMPORT_VERSIONJ-P Nurmi2013-08-162-1/+2
| | | | | | | | | | | | Change-Id: I9b86a47cf37e04fc3ad6219f27ea1c0b26762c10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Base Style: fix the size of indicatorless CheckBox & RadioButtonJ-P Nurmi2013-08-162-4/+2
| | | | | | | | | | | | Task-number: QTBUG-33023 Change-Id: I9baf05d1136ca1f2ff76e294b15afe5e9eda7666 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | MenuBar: Make sure invisible menus appear soGabriel de Dietrich2013-08-135-2/+19
| | | | | | | | | | | | | | Task-number: QTBUG-32899 Change-Id: Id07baba90ff45ba420d563ce47ee58964d4e4d02 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-091-1/+6
|\ \ | |/ | | | | Change-Id: I073b2bd7ca1973139a901d431408d0462ba0bd45
| * QQuickTooltip should not crash if widget implementation isn't possibleShawn Rutledge2013-08-021-1/+6
| | | | | | | | | | | | | | | | | | | | It's not enough to check for QT_NO_WIDGETS because it can fail at runtime if the app was launched with a QGuiApplication or you are on a platform without multiple-window support. Task-number: QTBUG-32779 Change-Id: I13abf9a5063f7d91277bc52b8be79bee19e746af Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Base/ToolButtonStyle: fix panel's implicit size for textual buttonsJ-P Nurmi2013-08-071-3/+6
| | | | | | | | | | Change-Id: Id94be2cf585750c6004d78c0e1b808f30a281bb2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Base/ToolButtonStyle: fix the background of checked buttonsJ-P Nurmi2013-08-071-5/+2
| | | | | | | | | | | | Task-number: QTBUG-32542 Change-Id: Idcad5f016830f63dae46167ab8a8cd979234a3b2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Add missing styleData properties to TableViewColumn::delegate docsJ-P Nurmi2013-08-061-1/+13
| | | | | | | | | | | | Task-number: QTBUG-32503 Change-Id: Ic93fd95af650db0be000b0efb762e7483277147c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Base/ButtonStyle: fix the background of checked buttonsJ-P Nurmi2013-08-061-1/+1
| | | | | | | | | | | | Task-number: QTBUG-32542 Change-Id: I15b9a62b1daad14a591d9e46f15a754ec230e700 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | ScrollBar: support wheel scrollingJ-P Nurmi2013-08-061-16/+28
| | | | | | | | | | | | Task-number: QTBUG-32763 Change-Id: Ia37fa5f8021346a4cbeedd2f404e88476d9e7bd3 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | ComboBox: Fix confusing example and documentation about 'currentText'Gabriel de Dietrich2013-08-021-2/+6
| | | | | | | | | | | | Change-Id: I2fece9db05429eda91b600c26b679b4fcd950f74 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | ButtonStyle - fixed redundant anchors binding in panel.Tomasz Olszak2013-07-311-1/+0
| | | | | | | | | | Change-Id: I5c280e9571243f7d4f2ca517ba7320ebcd8ab615 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | TableView: Fix page up / down keyboard navigationNils Jeisecke2013-07-301-2/+2
|/ | | | | | | | Fixed scrollbar property access. Task-number: QTBUG-32665 Change-Id: I8ea31de83a6338b28a367221550c957e101a76aa Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* ToolBar: Improved aestetics for Fusion styleJens Bache-Wiig2013-07-122-2/+5
| | | | | | | | We were drawing an ugly double gray line and had uneven spacing between tool buttons and margins. Change-Id: Ifd2a30cb2ae8f3fb31b5df8410e17cfbd1175978 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Allow mouse events when transient scroll bars are hiddenJens Bache-Wiig2013-07-122-6/+9
| | | | | | | | | | | | | | On mac, while transient scroll bars are not visible it was not possible to interact with the viewport as the mouse events were consumed by the scroll view. This makes the ScrollBar mouse area disabled before a scroll is triggered. Note that I also added a minor workaround to ensure that we update the mouse cursor. Task-number: QTBUG-32400 Change-Id: If091edf054fcab65feb9b8c8e5c45e25431f4be4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* SplitView: bugfix animating split itemsRichard Moe Gustavsen2013-07-111-1/+3
| | | | | | | | | Only assign a new width/height to a splitter item when needed (that is, the value was clamped). Otherwise we just end up breaking bindings and animations without a good reason. Change-Id: Ic33007713f6450d52c9f5bd958fca74095413638 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: Always layout as if fillWidthItem is visibleRichard Moe Gustavsen2013-07-111-6/+6
| | | | | | | | | | | | | | | Hiding the fillWidth item in the splitter is allowed, but causes strange drawing/layout artifacts that can be difficult to understand since the layout engine would ignore all hidden items. This patch changes the implementation by adding an exception to the rule. The layout engine now treats the fillWidth item as if it is always visible. Then, hiding it would just reveal a white field where the fillItem would otherwise be, but the layout would otherwise look correct. Change-Id: I95ec51b595109e8f1efdc231c9a6697ee60aa483 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: bugfix hiding splitter for last itemRichard Moe Gustavsen2013-07-111-3/+3
| | | | | Change-Id: I8953d7fa4f1a1a940029270d4cb8f3d69da07bf7 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: support changing orientationRichard Moe Gustavsen2013-07-111-1/+35
| | | | | Change-Id: I8a5f7ec5bd6315a8a74ac6f8b5c9bc0d0f9c19fa Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add icon to button with Base styleJens Bache-Wiig2013-07-091-6/+18
| | | | | | | | | This was simply not implemented before. Unlike desktop styles I made the button resize to fit the icon rather than scale it down. Change-Id: Ib58d4d54d0dce3d5e5b53a1528dc4108b377975a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix missing tool tip on ButtonJens Bache-Wiig2013-07-091-8/+0
| | | | | | | | | | | | | This binding was trying to hide the tooltip when the tooltip text is the same as the button text. Unforunatately the logic was somewhat broken and could not even theoretically work for the case when there was a tooltip text set on the button itself. Since the user can locally fix this by simply not setting a tool tip or setting it to an empty string, I think it is better to simply get rid of the binding. Change-Id: I80ad2941649915a4f0eb54d9ba1c590b0292662c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* TextArea: fix document margin handlingJ-P Nurmi2013-07-031-20/+23
| | | | | | | | | | The text margin must be within the document, not in the containing item. Otherwise it breaks user interaction such as text selection over the margin area. Change-Id: I048c07f9c4e44336de6fa3f7b74b0cc56f4d0d5e Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Prevent stealing of mouse events from the slider handleFabian Bumberger2013-07-031-0/+2
| | | | | | | Otherwise it is impossible to add a slider to a horizontally oriented list view Change-Id: I241fb11f3eb1d9e55c4488330af2e1e839504f3d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Fix typoJonathan Liu2013-07-021-1/+1
| | | | | Change-Id: I30caefc6be728677e14557c7bbb3d4a924007f94 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Make ComboBox work with variant listJens Bache-Wiig2013-06-271-2/+3
| | | | | | | | Task-number: QTBUG-31992 Change-Id: If63c762cf3789ca1353dd40e7059f2d334e2dbe3 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Include qquickstyleitem_p.h only if QT_NO_WIDGETS not definedCaroline Chao2013-06-271-1/+0
| | | | | Change-Id: I7c2045acbd2331ec4ab7b14cf7694332f0b6a49b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-252-3/+1
|\ | | | | | | Change-Id: I1684510ce4f1b52e3569d8c04e272b1c8fd63c1a
| * Adapt to Qt.platform.os rename ("mac" -> "osx")v5.1.0-rc2v5.1.0J-P Nurmi2013-06-241-1/+1
| | | | | | | | | | | | Change-Id: I089a01bee10b92f85dcdd338c695a3b796b0ecd1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * Doc: Small fix for SplitViewCaroline Chao2013-06-241-2/+0
| | | | | | | | | | | | | | | | | | SplitView items must set width/height and not Layout.preferredWidth/Layout.preferredHeight. Change-Id: Ice888d51c63cbdaf6e0e235c0c7569c4a8794b7d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Doc: Add note to import QtQuick.Layouts when using SplitViewCaroline Chao2013-06-251-0/+3
| | | | | | | | | | | | | | | | | | | | In order to use the Layout attached properties. Task-number: QTBUG-31968 Change-Id: I00880b6a4ac91532db5da513d13757949fae64c2 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Style fix: !==Frederik Gladhorn2013-06-251-1/+1
| | | | | | | | | | Change-Id: I2d2ae6c4acd1b7820f6b0aa67536fb3b6ae8d52c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Move plugin.cpp out of plugin.priCaroline Chao2013-06-242-1/+2
| | | | | | | | | | | | | | So plugin.pri only contains the module specific files. Change-Id: I2f5d73da5d328ca1a5bee445e09d4dec7fa8682e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Fix ScrollViewHelper warnings when using the Base styleJ-P Nurmi2013-06-241-2/+2
| | | | | | | | | | | | | | | | ScrollViewHelper.qml:124/164: Unable to assign [undefined] to bool Change-Id: Ib41244397d830884c08dbc7b12e0000b62350f61 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Remove useless imports using relative pathsCaroline Chao2013-06-242-2/+0
| | | | | | | | | | Change-Id: Ibab79ec3e38e9e0cae01aeb12dd2f643673b5680 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Add private.priCaroline Chao2013-06-242-25/+26
| | | | | | | | | | | | | | | | To gather all the source and header files specific to the QtQuick.Controls.Private module. Change-Id: I5bc0f4d4efc570fa375ecd178b3ca289c54398e9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Move the static register functions into QQuickControlsPrivateCaroline Chao2013-06-243-17/+76
| | | | | | | | | | | | | | | | And create a separate header file, qquickcontrolsprivate_p.h Change-Id: Ibb4ec834709b6240fb19379a67e3948426d0f4ec Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Add import QtQuick.Controls forgotten in Id0511e8Caroline Chao2013-06-241-0/+1
| | | | | | | | | | Change-Id: Id0511e8b9c5cc11e59ed12b6706c79e469ad781d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Remove the QtQuick.Controls.Styles.Private moduleCaroline Chao2013-06-244-11/+6
| | | | | | | | | | | | | | | | | | | | This module doesn't bring much value by itself. Move the private styles to the QtQuick.Controls.Private module instead. Change-Id: I2f633b4334b5a6120a3c402e9e30b294811f048d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
View Lorry Controller Status