summaryrefslogtreecommitdiffstats
path: root/src/controls/qtmenu.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename QtMenuXxx to QQuickMenuXxxJ-P Nurmi2013-04-151-642/+0
| | | | | Change-Id: I89aa205686f0bdf2b267ad17a8ae0470c2f4751f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Menu: Add API for inserting items, separators, submenusGabriel de Dietrich2013-04-121-6/+47
| | | | | | | | | | | | | | In particular, Menu::insertItem() is now overloaded. It can take a string as second parameter, in which case it will create a new MenuItem and return it after inserting it, or it can take any QtMenuBase based class pointer and just insert it. The latter use case is useful when populating a menu with the Instantiator type. Currently, addSeparator and insertSeparator don't return any value since MenuSeparators are not configurable. Change-Id: I9659ea0ee9d76ed5163316be1a5c7a8f03eaa28f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Rename QtAction to QQuickActionJ-P Nurmi2013-04-121-1/+0
| | | | | Change-Id: I6e55938749cac6177d3c7f3628aba52ea661873f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Menu: Normalize click-popup-click behaviorGabriel de Dietrich2013-04-041-1/+6
| | | | | | | See comment in code. Change-Id: I5ab6c639079dd57aaf8b661e4307cf5587361495 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Menu: Add clear function to 'items' property listGabriel de Dietrich2013-03-211-1/+8
| | | | | | | For completion's sake. Change-Id: I7660999af56ba330085bc23b5b877bf9905b2316 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Several documentation improvementsGabriel de Dietrich2013-03-211-8/+53
| | | | | | | Includes Menu, MenuItem, Action, and ExclusiveGroup. Change-Id: I447c36fe361bbad2f5a31584f242601a150832fa Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Menu: Update API, auto-testsGabriel de Dietrich2013-03-201-0/+39
| | | | | | | | | | | | Add 'type' property to QtMenuBase (not exposed to QML explicitly, but is the base class for all things menu). Useful to inspect menu items after creation, for instance. Also, Menu gets addSeparator() and addMenu() functions. Since the Iterator type has been merged to QML, tst_menu now uses it. Change-Id: I4a2f43ecce6671885e523d720e4e1315eca8616e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QtMenuPopupWindow: Refactor code away from QtMenuGabriel de Dietrich2013-03-141-30/+7
| | | | | | | | Also prepares to expose the class in QML, since it is needed for the (in progress) drop-down list implementation. Change-Id: I978f26590594050f52bd2244fe2c264967b65b38 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menu: Ungrab mouse from mouse grabber when showing popupGabriel de Dietrich2013-03-131-0/+4
| | | | | Change-Id: I41fa2cb39ba8ec6ba2a5ccd68d9d53d6b2f2e543 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* ComboBox: Rename 'selectedIndex' property to 'currentIndex'Gabriel de Dietrich2013-03-131-7/+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-66/+183
| | | | | | | | | | | | | | | 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-2/+4
| | | | | Change-Id: Ib0b1445593ff48df56cd8d4d20122880c2dacca5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menu: Make popup menus close from child to parentGabriel de Dietrich2013-03-111-2/+7
| | | | | | | | Some window managers use fading effects to close popups, resulting on an unnatural animation if menus close from parent to child. Change-Id: I5860b65b2905752f74c8abdad05988980c167323 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menu: Fix warning when menu opensCaroline Chao2013-03-061-1/+4
| | | | | | | Task-number: QTBUG-29862 Change-Id: I0a10aa103b1c4f5e0fba2e80eee7e07b6bc748fb Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QtMenu*: Cleanup header include statementsDebao Zhang2013-03-061-4/+5
| | | | | Change-Id: If1b47e16b0add48a1bda1476408ea31f6872b0ef Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QtMenu*: Use QtAction as private implementationGabriel de Dietrich2013-03-011-2/+2
| | | | | | | | This avoids needing to duplicate some logic, in particular icon source and name changes triggering icon updates. Change-Id: Id8b34fa365db6d31eb6855f690c13073fd589a2c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QtMenu: fix member variable initialization orderJ-P Nurmi2013-03-011-2/+2
| | | | | Change-Id: I2681e220dc9a46316d802610c926e41526283f9a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Menus: Doc, manual test fixesGabriel de Dietrich2013-03-011-4/+7
| | | | | Change-Id: I98c4c6aa39f9a947f0610ac976ed74447252d06b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* MenuBar. Menu, MenuItem: Update documentation to new APIGabriel de Dietrich2013-03-011-27/+48
| | | | | | | | Also removed Menu.visibleParent since it had no apparent use. Likewise, trigger(), and the triggered() signal are now only in MenuItem. Change-Id: Ide194505664c60906019422a503b189250d6a86e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* MenuBar, Menu, MenuItem, Action: New, reviewed APIGabriel de Dietrich2013-03-011-65/+76
| | | | | Change-Id: Ic018c0d9c61ddf6fdf05750bf172cf5e306d0508 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix uninitialized member variablesJ-P Nurmi2013-02-281-0/+1
| | | | | Change-Id: Ica57d3dc788dae0ffb7280f816535044a3555a9a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Menu: Fix 'selectedIndex' update on item triggerGabriel de Dietrich2013-02-251-37/+18
| | | | | | | | | This demanded some code refactoring, and the introduction of the parent menu property. Updated auto-tests too. Change-Id: I3d9070b0a1a76d6c174ccf13965d30413f23aadd Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Replaced BSD with LGPL license to conform with Qt Project modulesShawn Rutledge2013-02-211-27/+28
| | | | | | | | 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-211-0/+385
Change-Id: Icc61dbfc74cc2a303b9847e7d2c7ace4a9002046 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>