summaryrefslogtreecommitdiffstats
path: root/src/styles
Commit message (Collapse)AuthorAgeFilesLines
* Move Styles and Private under controlsCaroline Chao2013-08-1659-4519/+0
| | | | | | | | | | | Register the C++ private API from the controls plugin. The private plugin is not needed anymore. The Controls "submodules" Styles and Private are moved to the controls subfolder in the sources tree. Change-Id: I98358227c945b6cd1a8dbff9d07e6cad4f044277 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add support for drawing tick marks with base styleJens Bache-Wiig2013-08-141-0/+21
| | | | | | | | | | | Before this was simply not implemented. It is still a bit unclear how we should treat stepSize == 0 as the results are somewhat undefined. Task-number: QTBUG-31261 Change-Id: I7a8b877649a945cd6cb303cc034df677b0199a90 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menus: add RTL supportJ-P Nurmi2013-08-131-3/+6
| | | | | | Change-Id: I60f997e545076feb5b72fb9eb4a03b050db5f511 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-122-9/+9
|\ | | | | | | Change-Id: Id126639ad0392d421bd209a4f27df79f4e31dabd
| * 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>
| * 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>
* | Merge branch 'stable' into devSergio Ahumada2013-08-051-1/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4da0791d476fd3b79f55494794b1a31cd543eb4c
| * ButtonStyle - fixed redundant anchors binding in panel.Tomasz Olszak2013-07-311-1/+0
| | | | | | | | | | Change-Id: I5c280e9571243f7d4f2ca517ba7320ebcd8ab615 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-231-1/+1
|\| | | | | | | Change-Id: I2f557f40e078a91d81e1a4683bf5d3d4a5dc95e8
| * ToolBar: Improved aestetics for Fusion styleJens Bache-Wiig2013-07-121-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-6/+18
|\| | | | | | | Change-Id: I3152e47e365c420f15da08c93f243666de0092b5
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-1/+1
|\| | | | | | | Change-Id: I05931c5fbcd0ce61e09803239f97713f910588cc
| * Style fix: !==Frederik Gladhorn2013-06-251-1/+1
| | | | | | | | | | Change-Id: I2d2ae6c4acd1b7820f6b0aa67536fb3b6ae8d52c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-248-16/+5
|\| | | | | | | Change-Id: Ie546536fe3a506758b552d66ef88b7f59683df90
| * Remove useless imports using relative pathsCaroline Chao2013-06-241-1/+0
| | | | | | | | | | Change-Id: Ibab79ec3e38e9e0cae01aeb12dd2f643673b5680 Reviewed-by: J-P Nurmi <jpnurmi@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-242-10/+0
| | | | | | | | | | | | | | | | | | | | 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>
| * Make the JS files available via the private moduleCaroline Chao2013-06-242-2/+0
| | | | | | | | | | | | | | | | Instead of importing them using relative path. Change-Id: Ibe2e23f3bafc522e2848d9d00d244d026eacd168 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-203-3/+4
| |\ | | | | | | | | | Change-Id: I08068004ecb6269c032595e86a164705ce9e4f39
| | * Doc: Fix QCH filter attributes for Qt Quick Controls/StylesTopi Reinio2013-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in filter attibutes, preventing filtering from working in Assistant. Task-number: QTBUG-31796 Change-Id: I21c91b43881cd73ae7df4203922085e7c9f93e8f Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Revert "Add qml/js files in resource files"Caroline Chao2013-06-148-156/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to investigate more this solution. Deployment issue for Qt Quick Controls will be a known limitation in 5.1.0. This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf. Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Add qml/js files in resource filesCaroline Chao2013-06-138-26/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make deployment of Qt Quick Controls based applications easier. Task-number: QTBUG-31565 Change-Id: I0b8af2864ef0dc9121eed3189ced64712bdb3d20 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Move doc from the index to the overview pagev5.1.0-rc1Caroline Chao2013-06-122-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the links. And doc fix in TableViewStyle.qml Change-Id: Id61fcff49af79f35f68696900142bb200ae18042 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-207-1/+7
|\| | | | | | | | | | | Change-Id: Ic7ea23c491b1938f33a30be6e4e5febd8ae7c380
| * | Make import of QtQuick.Controls.Private consistentCaroline Chao2013-06-206-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Import QtQuick.Controls when QtQuick.Controls.Private is imported. Change-Id: I2c962b7310a74e0905e8cec08ee6563a5d98e9d7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * | Mac: respect scrollbar style changesJ-P Nurmi2013-06-181-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31537 Change-Id: I670730934a48655f65df4f2be44e6ce8fa6bbdf7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-122-2/+2
|\| | | | | | | | | | | Change-Id: I1efe2710f34ec83077abf69e0220f299605c71e0
| * | Fix Base SliderStyle handle to work with minimumValue != 0Josh Faust2013-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31622 Change-Id: I7a61f3ed806d66735bf86d1438b0fd61f904b9a6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | GroupBox: fix the activeFocusOnTab behaviorLiang Qi2013-06-101-1/+1
| |/ | | | | | | | | | | | | | | | | * change GroupBox to FocusScope * update the autotest Task-number: QTBUG-31306 Change-Id: I72d24b8eb71aa72798e01925691dbb3570518aed Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | CheckBoxStyle: Added background handlingTomasz Olszak2013-06-081-4/+16
| | | | | | | | | | Change-Id: I6d2f07690ad49ca6a0ebbfd25de2a4850be5cb4a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵J-P Nurmi2013-06-0734-151/+354
|\| | | | | | | refs/staging/dev
| * Improve the Styles page and add missing SliderStyle propertyJens Bache-Wiig2013-06-061-2/+5
| | | | | | | | | | | | | | | | | | | | - I noticed we incorrectly exposed sliderPosition. - This adds some more custom style examples for the gallery and makes the second column actually different from the first. Change-Id: I73f0d613f51f6e75aaf734fd4e4c9fdb890e3e42 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Expose hovered to our controls and document it consistentlyJens Bache-Wiig2013-06-0611-80/+16
| | | | | | | | | | | | | | | | | | The current solution is messy and we only expose it partially to some of our styles. I think we should simply expose this to all. Change-Id: Ia546d5657ea416df99c9d9d92cc714b7f1c928fe Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
| * Buttons: Allow overriding of visual properties when 'action' is setGabriel de Dietrich2013-06-032-2/+2
| | | | | | | | | | | | | | | | | | | | Those properties are, text, tooltip, iconName, and iconSource. Also, properly capitalized gallery's tooltips. Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Doc: Add doc structure for StylesCaroline Chao2013-06-0320-8/+187
| | | | | | | | | | | | | | | | | | | | And: - Add an index page for the Styles - Add missing documentation for some properties (Component) - Fix unexpected curly brackets in a couple of code snippets Change-Id: Ib7265d1cd011a81012eb4b7f69738b84fba5b531 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * ToolBar: Get proper pressed state on MacGabriel de Dietrich2013-05-311-2/+2
| | | | | | | | | | | | | | | | Depends on https://codereview.qt-project.org/57500 Change-Id: I131fa8e25322a10a10878e5f603084e951d101ad Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * TabViewStyle: expose styleData.availableWidthJ-P Nurmi2013-05-311-1/+1
| | | | | | | | | | Change-Id: Ib209ec7311c64f172718c8baa7d7f63f6f79a3a8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix missing margins and incorrect size for ToolBar and StatusBarJens Bache-Wiig2013-05-314-27/+50
| | | | | | | | | | | | | | | | | | | | | | Using the implicitHeight of an item makes ToolBar and StatusBar a lot more useable with layouts. In addition we enable the padding property from the style, allowing its content to be positioned in a more convenient way. This is similar to how we already do it for GroupBox. Change-Id: Ia2aa1bcb9ae109718fd752401400222adec242ac Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Styles docs: fix the styleData -tablesJ-P Nurmi2013-05-316-34/+47
| | | | | | | | | | Change-Id: I75fb45d3f6b7b93f5758bd1664f9ff674a492772 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Make styleHints a variant mapJens Bache-Wiig2013-05-306-20/+16
| | | | | | | | | | | | | | | | | | | | The styleHints are not really flexible enough as a stringlist as we want to be able to pass actual properties. Since we already have a properties member of the style we should move all of our internal properties to that. Change-Id: Id7a66ade243461f54c41b9ec89144668aaf19483 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Rename PaddedStyle to AbstractStyleJ-P Nurmi2013-05-3014-14/+14
| | | | | | | | | | | | | | | | | | | | | | Make Style inherit AbstractStyle, so it becomes the base class of all styles. AbstractStyle also now has a default "data" property so it's possible to conveniently declare helper content inside styles. Change-Id: Id84f3762cfae506e65021322619d7fb77b137994 Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Improved size calculation of GroupBoxJens Bache-Wiig2013-05-291-4/+4
| | | | | | | | | | | | | | | | This adds some pixel tweaks on mac, adds minimum size to fit the label and fixes dpi scaling on Windows Change-Id: I4c43ba4a7815be87356336a9dafc1a217437940b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Move backgroundColor from TableView to TableViewStyleJens Bache-Wiig2013-05-292-3/+22
| | | | | | | | | | | | | | | | This property was not respected by some of the native styles and makes more sense as a styling attribute. Change-Id: I9cc1d3a130b764a67552ed7f0cec49ccc87ea246 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Consistent use of "hovered" and style API conventionsJens Bache-Wiig2013-05-296-8/+42
| | | | | | | | | | | | | | | | | | | | | | We were still using "containsMouse" in a few places, and we should consistently add "hovered" to all button types for consistency. Also fixed the SplitView to follow the new style conventions. Change-Id: Iebc333c0cecc5bcde27e626b1a611c2f2edcf7dc Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Fixed incorrect size hints for TableViewJens Bache-Wiig2013-05-292-7/+7
| | | | | | | | | | | | | | | | | | | | This ensures that double click to adjust content size on headers doesn't end up eliding text. We also added significantly more space by default. Change-Id: I05a05649a41ef4b70ee839195a87c684786760b1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix typo in TableViewStyleJens Bache-Wiig2013-05-291-2/+2
| | | | | | | | | | | | Change-Id: I0b4a917500ec7a520ebd38a4158e707e4dd80c9c Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | TabView: Added tabBar background handling.Tomasz Olszak2013-06-061-0/+3
|/ | | | | | | | | Additionally added possibility of flicking tabBar. If content of TabBar is flickable then tab should be changed on click not press. Change-Id: I8b9d75004e0a7456831cd98e46987da2d432b7bd Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* ButtonStyle: expose styleData.hoveredJ-P Nurmi2013-05-271-2/+20
| | | | | Change-Id: I8f977a171ea18420e326b79181d634eeb43b1de8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>