summaryrefslogtreecommitdiffstats
path: root/examples/gallery
Commit message (Collapse)AuthorAgeFilesLines
* Move examples into separate quick/controls directoryKai Koehne2013-04-3026-1206/+0
| | | | | | | | | | 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>
* 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>
* 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>
* 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>
* 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>
* Examples: Update open file tooltipCaroline Chao2013-03-242-2/+2
| | | | | | | And fix one import QtQuick 2.0 -> QtQuick 2.1 Change-Id: If22ef7c4c47923f4cd84c1c8c232c10c79b110e7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* gallery: Clean-up some codeGabriel de Dietrich2013-03-241-13/+6
| | | | | | | This should work the all same, but with one hack less. Change-Id: Ia2deccc31a89baf414fbd6eb11979c6d85fb0cb9 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* FileDialog and ColorDialog example usage in the gallery exampleShawn Rutledge2013-03-244-7/+85
| | | | | Change-Id: I37e9a3c4c165525b0c785a47584fd62c17841e8f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Gallery: fill the side panel to the whole heightJ-P Nurmi2013-03-221-1/+1
| | | | | Change-Id: I9938b979f670f20e096d5232f032e60613cd650f Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Get rid of private imports from galleryJens Bache-Wiig2013-03-212-4/+2
| | | | | Change-Id: Icf8e689fc35ee3a73ae91989eb65a3ae6172db53 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* ExclusiveGroup: Allow Actions as childrenGabriel de Dietrich2013-03-211-20/+18
| | | | | | | | | Support is minimal, but increases the API elegance significantly. Other controls, such as MenuItem, still need to have their exclusiveGroup property set. Change-Id: I31c4321c18dc788091e572fb15eb14c0cbb33520 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove keynavigation code from examples.Jens Bache-Wiig2013-03-201-14/+0
| | | | | | | We dont need this now that it is implicit. Change-Id: I5a4e92b1cfc8e1ffb37933ce6094036b828d8464 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Make TabView::tabPosition use the Qt::Edge enumJ-P Nurmi2013-03-152-4/+4
| | | | | Change-Id: I8b6af1c4c59cfcad513108e42c0e206320ee2b66 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Change imports from QtQuick 2.0 to QtQuick 2.1Caroline Chao2013-03-146-8/+8
| | | | | | Change-Id: If9df032c76e36f385aacd30cc31d6f02574c6f11 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* ApplicationWindow: import QtQuick.Window 2.1J-P Nurmi2013-03-131-2/+2
| | | | | | | | | | | To get the new properties (minimum/maximum width/height etc.) that were introduced in 2.1. Note: uncommented also minimum width/height in gallery now that the properties exist in AppWindow. Change-Id: I2976dea3aa55cc63b91ef79687ac3504a62c0b15 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* ComboBox: Rename 'selectedIndex' property to 'currentIndex'Gabriel de Dietrich2013-03-131-1/+1
| | | | | | | | | | Also, removed 'pressed' property. In Menu, we removed 'selectedProperty' as well. (And by 'removed', we mean 'made it private'.) Auto-tests have also been updated. Change-Id: I4b4f9c81aad1165df1d2925964a9cd383079aa9c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Menu: Remove 'model' property, ContextMenuGabriel de Dietrich2013-03-131-2/+2
| | | | | | | | | | | | | | | In the near future, we hope that QML types like Creator/Instantiator (currently under review) will help simplify model binding, and object creation and deletion. Also, given the differences between QML models and QAbstractItemModel APIs, it's hard to provide a unified and elegant solution for this right now. ComboBox gets the part of the logic that ContextMenu was responsible for, extended to support string list and number models. Auto-tests updated and XFAIL removed where applicable. Change-Id: I9f5d4059644c495bffff76fb7c353e6fe7fde62e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Menu: Rename 'text' property to 'title'Gabriel de Dietrich2013-03-111-9/+9
| | | | | Change-Id: Ib0b1445593ff48df56cd8d4d20122880c2dacca5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Examples - Gallery: remove references to adjustToContentSizeCaroline Chao2013-03-111-2/+0
| | | | | | | The property has been removed. Change-Id: I81847229b4157bc09a76b721813dee62e21fd8ed Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Change the layout engine of RowLayout and ColumnLayout.Jan Arve Saether2013-03-061-0/+1
| | | | | | | | | It now uses the gridlayoutengine from graphicsview, which also gives us a well tested grid layout engine almost for free. Change-Id: I939ae4d2b321c8079935ff3374e8e5d10d02384b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Example: Add copy/paste/cut actions to the galleryCaroline Chao2013-03-041-0/+13
| | | | | | | | | | | | | | | Save the last item with focus to reuse while using shortcuts at the application level. Call the function (if it exists) on the last item with focus when the related shortcut is triggered. This way a shortcut works both when it is called directly or when it is called from the menu. Change-Id: I5fb26a8793fa07c75da6c737cff4701291e0c1bc Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ScrollView & TextArea: fix vertical scrollbar visibilityJ-P Nurmi2013-03-011-0/+7
| | | | | | | Avoid binding loops by using recursion guards... Change-Id: I1fb9f4ac54d6fa3cf930a848e22ec6b23edfa200 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* BasicButton: Add Action supportGabriel de Dietrich2013-03-011-3/+2
| | | | | Change-Id: I1a48f0d1d69373ce141c029f69e53d62d650a943 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Update TabView API and allow inser/remove of tabsJens Bache-Wiig2013-03-013-6/+8
| | | | | Change-Id: I6b10f539b036811243676f34c0fabe403c263923 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menu: Support invisible MenuItemsGabriel de Dietrich2013-03-011-0/+9
| | | | | | | | Note that currently, invisible Menus in MenuBars are not supported because of the QPA backend. To be decided whether we want this... Change-Id: Ide01c0ddc12f07969a5466a77b5c5c67b265ec87 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* MenuBar, Menu, MenuItem, Action: New, reviewed APIGabriel de Dietrich2013-03-011-1/+1
| | | | | Change-Id: Ic018c0d9c61ddf6fdf05750bf172cf5e306d0508 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Examples: add missing project filesJ-P Nurmi2013-02-281-0/+9
| | | | | Change-Id: I00618e75058521fb941cb590fb331a883643e116 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Make containsMouse property private.Mitch Curtis2013-02-262-130/+0
| | | | | | | | | | | Also removes the RangeTab from the Gallery example, since its controls use containsMouse and are no longer different from the same set of sliders on the control tab. Adding MouseAreas to each control in RangeTab to achieve the same animation would clutter the example with boilerplate code. Change-Id: I80d6f3bbf1b73229f4d0ae99dd2a65bc083e7099 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix containsMouse warning in RangeTab.qml in the Gallery example.Mitch Curtis2013-02-261-4/+14
| | | | | | | | ProgressBar does not have a containsMouse property, so this patch gives each ProgressBar its own MouseArea instead. Change-Id: Ib60b3961285d97909f2502d2fb389d2d5ab0014c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Update window example to use visibilityJens Bache-Wiig2013-02-251-3/+3
| | | | | | Change-Id: Ic4837e04fd5be2d0f046ab84805b3faf30896c10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Menu: Enable "click-select-release" behaviorGabriel de Dietrich2013-02-251-1/+1
| | | | | | | | | | | | | | | | | | Some limitations in MouseArea force us to abandon the "one mouse area per menu item" implementation in favor of a menu-wide mouse area, where we track the position changes to highlight the menu item under the mouse cursor. This makes possible updating the highlighted menu item while keeping the mouse pressed. Also, we need to emit an extra mouse press event, from the menu popup window, so that the menu mouse area will receive any mouse release event the user may have triggered. This is because the initial mouse press event popping up the menu was made in another window, and MouseArea would only emit 'released' signals if the released button was already pressed. Change-Id: Id10dd61fcf9e38ef3d34a61b7172301802e9646c Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename TabFrame to TabViewJens Bache-Wiig2013-02-222-4/+4
| | | | | Change-Id: I367758fe97656fb5c4aab79c87e80ead2430c69b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename ScrollArea to ScrollViewJens Bache-Wiig2013-02-221-1/+1
| | | | | | | | We want to introduce View as a common name for items that are not simple controlss but views controlling other items Change-Id: I13ffc096742ec13023c58b4744ad53084e11cc67 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove incorrect margin on text area in galleryJens Bache-Wiig2013-02-221-4/+1
| | | | | Change-Id: Iff56fe997565bd308290bd9be0f47bfd742a0c96 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Replaced BSD with LGPL license to conform with Qt Project modulesShawn Rutledge2013-02-217-14/+42
| | | | | | | | We want to use the same license as the other Qt modules. QML files stay as BSD for now. Change-Id: I10b1484f5ab0dfe2138ff7e045d0ecfd85556aa1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Rename QtDesktop to QtQuick.ControlsJens Bache-Wiig2013-02-217-10/+10
| | | | | Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ComboBox: Get proper label when setting selectedIndexGabriel de Dietrich2013-02-211-0/+1
| | | | | Change-Id: I8fb92b95adc713c00ffd56bc892abcdd24269100 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Gallery: Allow resizing text areaGabriel de Dietrich2013-02-201-0/+12
| | | | | Change-Id: I0ecb9cdf6ff37536fc78a4438ae102c7c5c6be9c Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Style cleanupsJens Bache-Wiig2013-02-192-8/+24
| | | | | | | | Introducing new Control and Style items to share some code and making sure no styles are Items. Change-Id: Iced031dc03803c381a39d6b4d1987ba4890ec2ef Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix tab orientation in GalleryJens Bache-Wiig2013-02-171-1/+1
| | | | | Change-Id: If2e135f7d9da496097689c699a2decc81b74179b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Update API and documentation of TableViewJens Bache-Wiig2013-02-151-3/+3
| | | | | | | Note that I renamed Column to TableViewColumn Change-Id: I8968797cede9a117a6acac09997fba385ff76b30 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* StyleItem: Add menu iconsGabriel de Dietrich2013-02-131-0/+1
| | | | | Change-Id: I3f6df4a0a799c85fe16354e03b466e34575a0785 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* MenuItem: Create actions on demandGabriel de Dietrich2013-02-111-0/+1
| | | | | | | | | | Before, they were created at construction time, possibly to be removed right after assigning the 'action' property. Also, added back some feedback for the open action in gallery. Change-Id: Ifcf83d707ad1b36a0b246aec904fe6a429e7aa54 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix Slider tickmarksJens Bache-Wiig2013-02-101-1/+1
| | | | | Change-Id: I965321d08a5fec10930fef58427dfb7d23e6c8fb Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Introduce private pluginJens Bache-Wiig2013-02-081-0/+1
| | | | | Change-Id: I4beedc773df5b9b207554b55e86aa1439cb4d06e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Introducing QPA, QML-only MenuBar, Menu, MenuItemGabriel de Dietrich2013-02-071-17/+85
| | | | | | | | | | | | | | | | | | | | | This removes one dependency from QtWidgets. QPA is only implemented for Mac so far, and depends on qt/qtbase's I5f83f260602f55b9409ad69abf670afb59b2d33a change. This means, it will only work with Qt 5.1 and older. Other QPA implementations will follow, like Android. The QML-only implementation has been tested mostly on Linux. On Mac, we need I4716b4c0b6187d14adb34c46b848ca0a16370b5a to be integrated in qt/qtbase dev branch if we want to enforce non-QPA menus. Updated ComboBox, ContextMenu to new QPA menu behavior Includes preliminary documentation for Action, ExclusiveGroup, MenuBar, MenuItem, MenuSeparator, and Menu. Change-Id: I6f38849a03a51386465156f8be3034df0d29e40d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove the "Desktop" itemJens Bache-Wiig2013-02-051-20/+0
| | | | | | | | This is mostly replaced by Screen and we should rather improve on that instead. Change-Id: Id21a3a67aaeaad1aca25c75a2f8a52df82b84157 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove the "Window" declaration as it shadows QtQuick.WindowJens Bache-Wiig2013-02-051-0/+1
| | | | | Change-Id: I1e35a8cadf5c604f1f6a4b0ec2d80d8f634c4d74 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>