summaryrefslogtreecommitdiffstats
path: root/examples/quick
Commit message (Collapse)AuthorAgeFilesLines
...
* Don't add any extra space to RadioButton and CheckBox by defaultJens Bache-Wiig2013-10-241-0/+6
| | | | | | | | | We instead do this in the layout code. It seems to make sense to support the use case where only the indicator is visible without adding extra padding to it. Change-Id: Ib55c3a97d7c23a52a14121b46be84299d1ad2132 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix custom styled transient scrollbarsJ-P Nurmi2013-10-234-0/+88
| | | | | Change-Id: I41d86f2f27e4250361c4fad21dd37995e5cbbc3d Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Remove widget dependency on touch platformsJens Bache-Wiig2013-10-178-21/+16
| | | | | | | | We don't want native styling on touch enabled devices and there is no reason to link against widgets there. Change-Id: I70116a0a94227cb58ae25980b97c4177da75a3c8 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix some issues in the modelview exampleJens Bache-Wiig2013-10-161-8/+1
| | | | | | | | | | The edit menu was never implemented and should not be exposed. Fading out the combo box is not really intuitive and doesnt actually disable the control. task-number: QTBUG-33818 Change-Id: I76190b675fd9400caac2754277ba9960b7f6dd06 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Improved font scalability for Base styleJens Bache-Wiig2013-10-152-38/+41
| | | | | | | | | | This should make it useable on hight dpi tablets and desktops where font sizes are larger. Change-Id: I8c8e7688927a0b54e3f95c276c743aaa31e8a4d9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add a basic Switch controlJens Bache-Wiig2013-09-221-2/+58
| | | | | | | | | This is a very simple switch. I left out text label as this is very mobile oriented. A clicked signal is also debatable as you dont really click on a switch. Change-Id: I84269297cba48f0e81af8f25af5b97acadecdd6a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* ComboBox: Make popup scrollableGabriel de Dietrich2013-09-191-0/+5
| | | | | | | | | | | | | | | | We factor out part the menu item container logic from Menu into ColumnMenuContent, which takes care of scrolling and mouse hovering, and selection. This makes possible to extend the menu items layout. The pop-over and pull-down look is specified by the menu style component by overriding the ScrollView style. The popup's maximum height is also specified by the menu style. The gallery example can finally use a font families combo box. Task-number: QTBUG-31568 Change-Id: I34a7278f476471c0eb51ef51dde3dd83e13002fe Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge branch 'stable' into devGabriel de Dietrich2013-09-181-9/+9
|\ | | | | | | | | | | | | Conflicts: src/controls/qquickaction.cpp Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
| * Menu: Enable mnemonic menu navigationGabriel de Dietrich2013-09-131-9/+9
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Make ComboBox editableJens Bache-Wiig2013-09-171-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition - Added text completion - Added validator - Added accepted signal - Added activated signal - Added textAt function - Added find function - Added keyboard indexing for non-editable as well Note that we do not support adding values to the model, but leave this up to the user to handle in onAccepted. Change-Id: I1d76fa83aea0e488959c418d22ce7b6027675d86 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Add TableViewColumn::movableJ-P Nurmi2013-09-171-1/+8
| | | | | | | | | | Change-Id: Ibf1b68d4c63ca02c603d5203128bb94984a809f2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Rename Control tab to Controls.Mitch Curtis2013-09-131-1/+1
| | | | | | | | | | Change-Id: I009877b3ab19302aa7eb951acb4668371aa60b38 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-1015-21/+21
| | | | | | | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | BusyIndicatorJens Bache-Wiig2013-09-092-2/+13
| | | | | | | | | | | | | | | | A basic BusyIndicator to indicate activity while blocking the UI. Change-Id: Iec88b6a4c7f23b630ebdf445c4cb288684c24cb7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Example: Rename Text example to TextEditorCaroline Chao2013-08-2730-2/+2
| | | | | | | | | | | | | | | | | | Text is too generic. Change-Id: I68d304345d2982a8acc8843c4c843e9f5e696954 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* | Support StandardKeys for Action/MenuItem::shortcutJ-P Nurmi2013-08-201-6/+6
| | | | | | | | | | | | Change-Id: I2054a59fcda26795721e5d7d04cc644220da372b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Remove broken links from gallery exampleJens Bache-Wiig2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | While it is nice to have a manual test for this, I don't belive the gallery is the best way to do so. Instead I moved the lorem ipsum text link to testbench. Change-Id: I4451aedc9ae6f42d5074b633052cc307f2880ac3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Add support for drawing tick marks with base styleJens Bache-Wiig2013-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-273-3/+3
|\| | | | | | | Change-Id: I05931c5fbcd0ce61e09803239f97713f910588cc
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-253-3/+3
| |\ | | | | | | | | | Change-Id: I1684510ce4f1b52e3569d8c04e272b1c8fd63c1a
| | * Adapt to Qt.platform.os rename ("mac" -> "osx")v5.1.0-rc2v5.1.0J-P Nurmi2013-06-243-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I089a01bee10b92f85dcdd338c695a3b796b0ecd1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| | * Revert "Add qml/js files in resource files"Caroline Chao2013-06-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | TextArea: switch to Qt.PointingHandCursor when hovering linksJ-P Nurmi2013-06-242-1/+2
|/ / | | | | | | | | Change-Id: I7c306093c1afc9f5dfe942cd29da427c6a57d869 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* / Text example: specify the base URL for the TextAreaCaroline Chao2013-06-201-0/+1
|/ | | | | | | | So the TextArea looks inside its own resource file while resolving relative urls used in the text. Change-Id: Id67f3f3cbbd635e8defa04d97602e1e7b293874e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Text example: Update example.htmlCaroline Chao2013-06-074-37/+37
| | | | | | | | | | Remove references to QTextEdit and adapt it to match TextArea instead. Update the Qt logo. Change-Id: I6939bf7418fbad883e1d967bea3688d9ccfd4885 Reviewed-by: Hanne Linaae <hanne.linaae@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Simplify example code by using QmlApplicationEngineJens Bache-Wiig2013-06-072-21/+4
| | | | | | | | | | | | Since QmlApplicationEngine does all the nasty bits including setting the incubation controller, we should use it in all of our examples. Task-number: QTBUG-31203 Change-Id: Ie4f2313b66ef1a460aa50559f5c0a6125d0c69f1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Examples: several fixes for textLiang Qi2013-06-063-50/+166
| | | | | | | | | | | | * Cut/Copy/Paste works * The initial status for b/i/u and alignment works * Font size and family works * Text color works Task-number: QTBUG-31482 Change-Id: I299931dede9defbb1d3eb927f867e77d20ded5ae Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Improve the Styles page and add missing SliderStyle propertyJens Bache-Wiig2013-06-069-34/+154
| | | | | | | | | | - 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>
* Gallery: remove reference to colorDialogCaroline Chao2013-06-041-1/+0
| | | | | Change-Id: I0433e350634b4a2bea6161f53e7c7363654e2cf6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Buttons: Allow overriding of visual properties when 'action' is setGabriel de Dietrich2013-06-031-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>
* Cleaning up some examples and removing clutterJens Bache-Wiig2013-05-319-290/+325
| | | | | | | | We want to use more layouts in our examples as it is the recommended way to create tool bars etc. Change-Id: Ib3b1e8e907cc5277d522557a19d2c294a7d251b1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove remaining references to PageStackJ-P Nurmi2013-05-302-7/+7
| | | | | | Change-Id: I59a9846c83340d0752659ef22cbb19a4be6a4129 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Improved size calculation of GroupBoxJens Bache-Wiig2013-05-291-1/+0
| | | | | | | | 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>
* Gallery example: Increase minimumWidthCaroline Chao2013-05-291-2/+3
| | | | | | Change-Id: I3f97de79c8afed44f7b01778d94cc40bed8cc603 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* ButtonStyle: expose styleData.hoveredJ-P Nurmi2013-05-271-14/+10
| | | | | Change-Id: I8f977a171ea18420e326b79181d634eeb43b1de8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* TabViewStyle: rename 'tab' grouped property to 'styleData'J-P Nurmi2013-05-272-4/+4
| | | | | Change-Id: If56b5ca4af119d7897425609dcaf04336f77e032 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename controlState to styleDataJ-P Nurmi2013-05-271-4/+4
| | | | | Change-Id: I06c9f4b0d9b6eef7d2ca608827eee982d8d97027 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Refactor TableView styling APIJens Bache-Wiig2013-05-271-51/+35
| | | | | | | | | We don't want to directly expose the item properties in the namespace of the loader. Instead we standardize on styleData as a property container. Change-Id: Ib451e06ab393ba4945c96076d71dd3f96489e0c7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Make GroupBox size respect anchor margins and update GalleryJens Bache-Wiig2013-05-276-145/+111
| | | | | | | | | | | We now implicitly add the margins to GroupBox so that you can easily add them to a layout. This also gets rid of the silly Sidebar example and adds a much more useful Layout tab for effective testing. Change-Id: I6026c32b2a198062d9b11a67245df0529aa61f8a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Style polishJens Bache-Wiig2013-05-271-1/+1
| | | | | | | | Adding the right margin of TableView and adding some extra margins makes the example look a bit more polished Change-Id: If969230fe2e1068a42f92708df311550f88fb060 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* TabViewStyle: add support for left and right corner itemsJ-P Nurmi2013-05-231-1/+1
| | | | | | | | Empty corner items may be used as padding, so TabViewStyle::left/rightCorner effectively replaces TabViewStyle::left/rightPadding. Change-Id: I01f3a1552c3395352e8953456d3956f4f8c29aed Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Update GroupBox to support contentItemJens Bache-Wiig2013-05-232-5/+1
| | | | | | | | | | | | | - Removed contentWidth and contentHeight since it is not needed - Exposed contentItem so that it can be designable. - Respect the implicit width or height of the contentItem if it is the only item of the GroupBox. Otherwise childrenRect is used. - Modified the style so that the style takes care of only the padding size and not the entire size of the group box. - Fixed flat and checkable appearance for custom style Change-Id: I2c7ec4cb7d5e6f96863847e8d8d6d6f52428364e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Introduce support for movable tabsJ-P Nurmi2013-05-211-0/+1
| | | | | | Change-Id: I87a6a582824363197f66f6b7f6f29aa603123458 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename rowIndex and columnIndex to just row and columnJens Bache-Wiig2013-05-161-2/+2
| | | | | | | | Just aligning our delegate api with the rest. Change-Id: Ia8dc3c6dbf87431ff850a3e91f28c129072e2ee3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Do not set the window max constraints in basiclayouts example.Jan Arve Saether2013-05-161-3/+0
| | | | | | | | They are strictly not needed... As a consequence of this, do not limit the size of the TextArea Change-Id: I3c152e7e8f749d7b5b2a0b9887664a11fb7d3b04 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Examples: Clean the pro filesCaroline Chao2013-05-146-30/+0
| | | | | | | | | Remove useless set of MOC_DIR, OBJECT_DIR, RCC_DIR and UI_DIR. Change-Id: Iba08d517e096a982f2bae9701083ebc40ee78ea2 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove ApplicationTemplate exampleCaroline Chao2013-05-136-176/+1
| | | | | Change-Id: Iba0ac98509bc634dbcc9a7a8da22a5dbec8e77ae Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Move stackview example to manual tests folderCaroline Chao2013-05-136-231/+0
| | | | | Change-Id: I5d9b39531a866d7fc5765332d364e6e2793b5b13 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Examples: Make example projects work with Qt CreatorJens Bache-Wiig2013-05-1323-6/+447
| | | | | | | | | | It seems pure qml projects don't really work in our examples architecture at the moment. This change adds a simple main file and resource bundle to each of the example folders. Change-Id: I4758242e71a2cb053252cbb09bf5c4439415691d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>