diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-13 05:50:53 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-13 05:50:53 (GMT) |
| commit | 6c3a6629de59898a3ea38181a1623896810c576e (patch) | |
| tree | 54fb52150a7143cc97bc43fb88d7cc77b3c489bf /tools/qmlviewer | |
| parent | 33646f637e5a34391095731f3dc4918a3537776e (diff) | |
| download | Qt-6c3a6629de59898a3ea38181a1623896810c576e.zip Qt-6c3a6629de59898a3ea38181a1623896810c576e.tar.gz Qt-6c3a6629de59898a3ea38181a1623896810c576e.tar.bz2 | |
Settings menu tidy-up.
Diffstat (limited to 'tools/qmlviewer')
| -rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 7da2afb..ae61fd0 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -301,7 +301,9 @@ void QmlViewer::createMenu(QMenuBar *menu, QMenu *flatmenu) QAction *recordOptions = new QAction(tr("Video &Options..."), parent); connect(recordOptions, SIGNAL(triggered()), this, SLOT(chooseRecordingOptions())); - recordMenu->addAction(recordOptions); + + if (flatmenu) + flatmenu->addAction(recordOptions); if (flatmenu) flatmenu->addSeparator(); @@ -355,6 +357,10 @@ void QmlViewer::createMenu(QMenuBar *menu, QMenu *flatmenu) QAction *proxyAction = new QAction(tr("Http &proxy..."), parent); connect(proxyAction, SIGNAL(triggered()), this, SLOT(showProxySettings())); settingsMenu->addAction(proxyAction); + if (!flatmenu) + settingsMenu->addAction(recordOptions); + + if (flatmenu) flatmenu->addSeparator(); QMenu *helpMenu = flatmenu ? flatmenu : menu->addMenu(tr("&Help")); QAction *aboutAction = new QAction(tr("&About Qt..."), parent); |