summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* Examples: remove CONFIG+=console in text exampleCaroline Chao2013-05-131-1/+0
| | | | | | | This is not needed. Change-Id: Ic65f2a1f7cf71d658bef194c05385aa34f3160b7 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Automatically set toolbar widthJens Bache-Wiig2013-05-101-6/+2
| | | | | Change-Id: I4038afc1cb22102f8873014d90dedec79cbaa376 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix basiclayouts example so that the window can be smaller..Jan Arve Saether2013-05-091-6/+8
| | | | | | | ..than the implicit size of the layout. Change-Id: I89ad1d91c7e492ba498acd50e2ddde9cc8e84581 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Refactor and clean up public style APIJens Bache-Wiig2013-05-088-65/+49
| | | | | Change-Id: I10271c860abd9b45a262e3548628e6a3026e1a4f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Examples: Update stackview exampleCaroline Chao2013-05-073-9/+42
| | | | | | Change-Id: Ia73015655ea75ee24cd1f2761df705c42894d12e Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Clean up and document SliderStyleJens Bache-Wiig2013-05-031-2/+2
| | | | | Change-Id: I6b97624338c3cfa4663e79bc243327ce9f494ccf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Button: Add 'menu' property to get pull-down buttonGabriel de Dietrich2013-04-301-2/+7
| | | | | Change-Id: I97ce3f35153beee2d7b1113880f25fd01904ce5f Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Move examples into separate quick/controls directoryKai Koehne2013-04-3094-11/+14
| | | | | | | | | | This makes sure all examples are in a separate directory for the Qt source packages. It also is in line with how the other repositories are structured. Task-number: QTBUG-30886 Change-Id: Idc2856e5dfaf467c8cb9764aee327a3b20c7b2d0 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Example: fix editable delegate in tableview exampleCaroline Chao2013-04-261-21/+41
| | | | | | | And other small fixes. Change-Id: I845bce4998a02c82bceea04f4fda3aff87db8c6a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add "@2x" high-resolution icons for retina macs.Morten Johan Sørvig2013-04-233-0/+0
| | | | | Change-Id: I34a8c0bd2492f9098114f1447146c107f67fe24b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove usages of width/height in layout items.Jan Arve Saether2013-04-221-2/+2
| | | | | | | | The usage of width/height is discouraged. Applications should instead use Layout.preferredWidth and Layout.preferredHeight Change-Id: I9fc3af0776319402f3a63244977c17e753bcfcc7 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Add focus drawing on Qt Quick StyleJens Bache-Wiig2013-04-191-0/+3
| | | | | Change-Id: I504a2a11041d7df76fadc6bf76f1a5ee4fc9cb8d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Improved styling for Qml styleJens Bache-Wiig2013-04-191-0/+1
| | | | | | | This is only the first step but already looking a bit nicer. Change-Id: I79f027b3411245ffe2fe654b4ca6eccbdf6a147b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Example: Add a ComboBox in the Styles tabCaroline Chao2013-04-151-0/+5
| | | | | Change-Id: I4ec4782c13dd7320a988c09fbc96bb4c298c1c04 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove hard dependency on widgetsJens Bache-Wiig2013-04-153-5/+10
| | | | | Change-Id: I1fabb4efcc931f12f0a65ac5c66e6e085108269b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove StyleItem dependencies from controlsJens Bache-Wiig2013-04-131-1/+0
| | | | | | | | This is another step towards making controls work without the widgets module. Change-Id: I7066d79f42d90199cfd1a5d6f6ce6cf6cae381d6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Arbitrary window doesn't appear transient on X11, but a dialog doesShawn Rutledge2013-04-051-0/+1
| | | | | | | | | | After verifying that WM_TRANSIENT_FOR was being set correctly, the child window was still showing up at an arbitrary place with OpenBox as the window manager. If it's marked as a dialog though, it will be centered properly over the main window. Change-Id: I0c1ae0755f51b564d986134520d036b72658fae4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add support for auto-positioning of items in a grid layoutJan Arve Saether2013-04-041-48/+19
| | | | | | | | Items will be laid sequentially in the grid, either in LeftToRight mode or TopToBottom mode (depending on the value of the flow property) Change-Id: Ib080517260ac4519171e77abd533cad3f306f70e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Button: Remove extra margins on MacGabriel de Dietrich2013-03-291-2/+2
| | | | | | | | | | | Ideally, we would fix that in QMacStyle, but it's too much of a change in the style right now. The values have been choosen to look good with ComboBox, which is the other button shaped control. Gallery example updated with 'right' sizes for buttons in first tab. Change-Id: I331eff4930b22cf4b42cdbd6b3191fff403ddae3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* StackView: rename initialPage to initialItemRichard Moe Gustavsen2013-03-292-2/+2
| | | | | Change-Id: Ic156bd94a6bdc2068a6cfcf92c79c16baac31d50 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
View Lorry Controller Status