diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-02-03 09:37:24 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-02-03 09:37:24 (GMT) |
| commit | 2a8d20453926082062246fc4cc788f88ea3c59ae (patch) | |
| tree | 199b6e57afbf3bfb6b97eb5ac043ef658daf8ed6 /src/gui/widgets/qmenubar.cpp | |
| parent | 8e87feefc0a92fbbeb1846f2471cdded9ef901ff (diff) | |
| download | Qt-2a8d20453926082062246fc4cc788f88ea3c59ae.zip Qt-2a8d20453926082062246fc4cc788f88ea3c59ae.tar.gz Qt-2a8d20453926082062246fc4cc788f88ea3c59ae.tar.bz2 | |
S60 softkey refactoring (support for merging, priorities and menus)
Implemented features:
Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.
Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.
Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.
Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.
Task-number: QTBUG-7315
Review-By: Sami Merila
Review-By: Jason Barron
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 0e14385..9caadb7 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -667,7 +667,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \i Application Menu | About <application name> \i The application name is fetched from the \c {Info.plist} file (see note below). If this entry is not found no About item - will appear in the Application Menu. + will appear in the Application Menu. \row \i config, options, setup, settings or preferences \i Application Menu | Preferences \i If this entry is not found the Settings item will be disabled |