Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1193 Updated menu stuff.

Browse source
This commit is contained in:
dnk-88 2011-05-31 22:06:58 +03:00
parent cd5b33a6dd
commit 42f302c0aa
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
View file

@ -328,7 +328,7 @@ void MainWindow::createActions()
m_fullscreenAction = new QAction(tr("Fullscreen"), this);
m_fullscreenAction->setCheckable(true);
m_fullscreenAction->setShortcut(QKeySequence(tr("Ctrl+Shift+F11")));
menuManager()->registerAction(m_fullscreenAction, Constants::SETTINGS);
menuManager()->registerAction(m_fullscreenAction, Constants::TOGGLE_FULLSCREEN);
connect(m_fullscreenAction, SIGNAL(triggered(bool)), this, SLOT(setFullScreen(bool)));
m_settingsAction = new QAction(tr("&Settings"), this);

1
code/nel/tools/3d/object_viewer_qt/src/plugins/example/plugin1.cpp
View file

@ -90,7 +90,6 @@ QStringList MyPlugin::dependencies() const
{
QStringList list;
list.append(Core::Constants::OVQT_CORE_PLUGIN);
list.append("ObjectViewer");
return list;
}

17
code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp
View file

@ -239,12 +239,6 @@ void CMainWindow::updateStatusBar()
void CMainWindow::createActions()
{
_openAction = new QAction(tr("&Open..."), this);
_openAction->setIcon(QIcon(Core::Constants::ICON_OPEN));
_openAction->setShortcut(QKeySequence::Open);
_openAction->setStatusTip(tr("Open an existing file"));
connect(_openAction, SIGNAL(triggered()), this, SLOT(open()));
_setBackColorAction = _GraphicsViewport->createSetBackgroundColor(this);
_setBackColorAction->setText(tr("Set &background color"));
_setBackColorAction->setIcon(QIcon(Constants::ICON_BGCOLOR));
@ -259,7 +253,7 @@ void CMainWindow::createActions()
connect(_reloadTexturesAction, SIGNAL(triggered()), this, SLOT(reloadTextures()));
_saveScreenshotAction = _GraphicsViewport->createSaveScreenshotAction(this);
_saveScreenshotAction->setText(tr("Save &Screenshot"));
_saveScreenshotAction->setText(tr("Save Screenshot"));
_saveScreenshotAction->setStatusTip(tr("Make a screenshot of the current viewport and save"));
}
@ -267,14 +261,7 @@ void CMainWindow::createMenus()
{
Core::IMenuManager *menuManager = Core::ICore::instance()->menuManager();
// register actions for file menu
menuManager->registerAction(_openAction, "ObjectViewer.File.Open");
// add actions in file menu
QMenu *fileMenu = menuManager->menu(Core::Constants::M_FILE);
QAction *exitAction = menuManager->action(Core::Constants::EXIT);
//fileMenu->insertAction(exitAction, _openAction);
//fileMenu->insertSeparator(exitAction);
_openAction = menuManager->action(Core::Constants::OPEN);
// register actions for view menu
menuManager->registerAction(_setBackColorAction, "ObjectViewer.View.SetBackgroundColor");