diff --git a/src/app/qt/element/QtMainWindow.cpp b/src/app/qt/element/QtMainWindow.cpp index 6022aa20..d1aabb71 100644 --- a/src/app/qt/element/QtMainWindow.cpp +++ b/src/app/qt/element/QtMainWindow.cpp @@ -33,8 +33,6 @@ QtMainWindow::QtMainWindow() setupProjectMenu(); setupEditMenu(); - setupViewMenu(); - setupFindMenu(); setupHelpMenu(); setupShortcuts(); @@ -220,36 +218,28 @@ void QtMainWindow::setupProjectMenu() QMenu *menu = new QMenu(tr("&Project"), this); menuBar()->addMenu(menu); - menu->addAction(tr("&New"), this, SLOT(newProject()), QKeySequence::New); - menu->addAction(tr("&Open..."), this, SLOT(openProject()), QKeySequence::Open); + menu->addAction(tr("Ope&n Source Folder..."), this, SLOT(newProject()), QKeySequence::New); + menu->addAction(tr("&Open Coati Project..."), this, SLOT(openProject()), QKeySequence::Open); menu->addAction(tr("&Save"), this, SLOT(saveProject()), QKeySequence::Save); - menu->addAction(tr("Save as"), this, SLOT(saveAsProject()), QKeySequence::SaveAs); + menu->addAction(tr("Save as..."), this, SLOT(saveAsProject()), QKeySequence::SaveAs); + menu->addAction(tr("&Close Window"), this, SLOT(closeWindow()), QKeySequence::Close); menu->addAction(tr("E&xit"), QCoreApplication::instance(), SLOT(quit()), QKeySequence::Quit); } -void QtMainWindow::setupViewMenu() +void QtMainWindow::showLicences() { - QMenu *menu = new QMenu(tr("&View"), this); - menuBar()->addMenu(menu); - - menu->addAction(tr("&Close Window"), this, SLOT(closeWindow()), QKeySequence::Close); - menu->addAction(tr("&Refresh"), this, SLOT(refresh()), QKeySequence::Refresh); + //TODO: Licences + //QMessageBox::information() } void QtMainWindow::setupEditMenu() { - QMenu *menu = new QMenu(tr("&Edit"), this); - menuBar()->addMenu(menu); - - menu->addAction(tr("Undo"), this, SLOT(undo()), QKeySequence::Undo ); - menu->addAction(tr("Redo"), this, SLOT(redo()), QKeySequence::Redo ); -} - -void QtMainWindow::setupFindMenu() -{ - QMenu *menu = new QMenu(tr("&Find"), this); + QMenu *menu = new QMenu(tr("&Edit"), this); menuBar()->addMenu(menu); + menu->addAction(tr("&Refresh"), this, SLOT(refresh()), QKeySequence::Refresh); + menu->addAction(tr("Undo"), this, SLOT(undo()), QKeySequence::Undo ); + menu->addAction(tr("Redo"), this, SLOT(redo()), QKeySequence::Redo ); menu->addAction(tr("&Find"), this, SLOT(find()), QKeySequence::Find); } @@ -260,6 +250,7 @@ void QtMainWindow::setupHelpMenu() menu->addAction(tr("&About"), this, SLOT(about())); menu->addAction(tr("About &Qt"), QCoreApplication::instance(), SLOT(aboutQt())); + //menu->addAction(tr("Licences"), QCoreApplication::instance(), SLOT(showLicences())); } void QtMainWindow::setupShortcuts() diff --git a/src/app/qt/element/QtMainWindow.h b/src/app/qt/element/QtMainWindow.h index 3fb0c54c..f2fc1667 100644 --- a/src/app/qt/element/QtMainWindow.h +++ b/src/app/qt/element/QtMainWindow.h @@ -39,6 +39,7 @@ public slots: void refresh(); void saveProject(); void saveAsProject(); + void showLicences(); void undo(); void redo(); @@ -47,8 +48,6 @@ public slots: private: void setupEditMenu(); void setupProjectMenu(); - void setupViewMenu(); - void setupFindMenu(); void setupHelpMenu(); void setupShortcuts();