Skip to content

Commit

Permalink
Reorder menu bar
Browse files Browse the repository at this point in the history 
Following the description in solvcon#324, rename "Euler" to "One", "Camera" to "View", and "App" to "Add-on", add an empty "Window" menu bar, and reorder them to "File", "View", "One", "Mesh", "Add-on", and "Window".

No change is made to the menus under the menu bar.
  • Loading branch information
@yungyuc
yungyuc committed Jun 8, 2024
1 parent 6113246 commit bad566e
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 69 deletions.
125 changes: 59 additions & 66 deletions cpp/modmesh/view/RManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,57 +117,46 @@ void RManager::setUpMenu()
// NOTE: All menus need to be populated or Windows may crash with
// "exited with code -1073740791". The reason is not yet clarified.

m_fileMenu = m_mainWindow->menuBar()->addMenu(QString("File"));
{
m_fileMenu = m_mainWindow->menuBar()->addMenu(QString("File"));

{
auto * action = new RAction(
m_fileMenu->addAction(
new RAction(
QString("New file"),
QString("Create new file"),
[]()
{
qDebug() << "This is only a demo: Create new file!";
});
m_fileMenu->addAction(action);
}
}));

m_eulerMenu = m_mainWindow->menuBar()->addMenu(QString("Euler"));
m_fileMenu->addAction(new RAction(
QString("Parameters"),
QString("Runtime parameters"),
[]()
{
static int64_t int64V = 5566;
static double doubleV = 77.88;
auto params = createParameters();
addParam(params, "global.a.b.int64_foo", &int64V);
addParam(params, "global.a.b.double_bar", &doubleV);
openParameterView(params);
}));

{
auto app_name = QString("euler1d");
auto * action = new RAppAction(
QString("Load ") + app_name,
QString("Load ") + app_name,
QString("modmesh.app.") + app_name);
m_eulerMenu->addAction(action);
}
#ifndef Q_OS_MACOS
{
// Qt for mac merges "quit" or "exit" with the default quit item in the
// system menu:
// https://doc.qt.io/qt-6/qmenubar.html#qmenubar-as-a-global-menu-bar
auto * action = new RAction(
QString("Exit"),
QString("Exit the application"),
[]()
{
RManager::instance().quit();
});
m_fileMenu->addAction(action);
}
// Qt for mac merges "quit" or "exit" with the default quit item in the
// system menu:
// https://doc.qt.io/qt-6/qmenubar.html#qmenubar-as-a-global-menu-bar
m_fileMenu->addAction(new RAction(
QString("Exit"),
QString("Exit the application"),
[]()
{
RManager::instance().quit();
}));
#endif
}

m_viewMenu = m_mainWindow->menuBar()->addMenu(QString("View"));
{
m_appMenu = m_mainWindow->menuBar()->addMenu(QString("Mesh"));

this->addApplication(QString("mh_3dmix"));
this->addApplication(QString("naca"));
}

{
m_cameraMenu = m_mainWindow->menuBar()->addMenu(QString("Camera"));

auto * use_orbit_camera = new RAction(
QString("Use Orbit Camera Controller"),
QString("Use Oribt Camera Controller"),
Expand Down Expand Up @@ -217,50 +206,54 @@ void RManager::setUpMenu()
use_fps_camera->setCheckable(true);
use_orbit_camera->setChecked(true);

m_cameraMenu->addAction(use_orbit_camera);
m_cameraMenu->addAction(use_fps_camera);
m_viewMenu->addAction(use_orbit_camera);
m_viewMenu->addAction(use_fps_camera);
}

{
m_appMenu = m_mainWindow->menuBar()->addMenu(QString("App"));

this->addApplication(QString("sample_mesh"));
this->addApplication(QString("linear_wave"));
this->addApplication(QString("bad_euler1d"));
}

{
QAction * params = new RAction(
QString("Parameters"),
QString("Runtime parameters"),
[]()
{
static int64_t int64V = 5566;
static double doubleV = 77.88;
auto params = createParameters();
addParam(params, "global.a.b.int64_foo", &int64V);
addParam(params, "global.a.b.double_bar", &doubleV);
openParameterView(params);
});
m_fileMenu->addAction(params);
}
m_oneMenu = m_mainWindow->menuBar()->addMenu(QString("One"));
m_oneMenu->addAction(new RAppAction(
QString("Load euler1d"),
QString("Load euler1d"),
QString("modmesh.app.euler1d")));

m_meshMenu = m_mainWindow->menuBar()->addMenu(QString("Mesh"));
m_meshMenu->addAction(new RAppAction(
QString("Load mh_3dmix"),
QString("Load mh_3dmix"),
QString("modmesh.app.mh_3dmix")));
m_meshMenu->addAction(new RAppAction(
QString("Load naca"),
QString("Load naca"),
QString("modmesh.app.naca")));

m_addonMenu = m_mainWindow->menuBar()->addMenu(QString("Addon"));
this->addApplication(QString("sample_mesh"));
this->addApplication(QString("linear_wave"));
this->addApplication(QString("bad_euler1d"));

m_windowMenu = m_mainWindow->menuBar()->addMenu(QString("Window"));
m_windowMenu->addAction(
new RAction(
QString("(empty)"),
QString("(empty)"),
[]() {}));
}

void RManager::clearApplications()
{
for (QAction * a : this->m_appMenu->actions())
for (QAction * a : this->m_addonMenu->actions())
{
auto * p = dynamic_cast<RAppAction *>(a);
if (nullptr != p)
{
this->m_appMenu->removeAction(a);
this->m_addonMenu->removeAction(a);
}
}
}

void RManager::addApplication(QString const & name)
{
m_appMenu->addAction(new RAppAction(
m_addonMenu->addAction(new RAppAction(
QString("Load ") + name,
QString("Load ") + name,
QString("modmesh.app.") + name));
Expand Down
8 changes: 5 additions & 3 deletions cpp/modmesh/view/RManager.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,11 @@ public slots:
QMainWindow * m_mainWindow = nullptr;

QMenu * m_fileMenu = nullptr;
QMenu * m_appMenu = nullptr;
QMenu * m_cameraMenu = nullptr;
QMenu * m_eulerMenu = nullptr;
QMenu * m_viewMenu = nullptr;
QMenu * m_oneMenu = nullptr;
QMenu * m_meshMenu = nullptr;
QMenu * m_addonMenu = nullptr;
QMenu * m_windowMenu = nullptr;

RPythonConsoleDockWidget * m_pycon = nullptr;
QMdiArea * m_mdiArea = nullptr;
Expand Down

0 comments on commit bad566e

Please sign in to comment.