songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mnemonics and actionRearrangeViewers

This commit is contained in:
Maxime Gimeno 2019-07-10 15:15:06 +02:00
parent ee76241805
commit 5b66c7337e
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -2981,7 +2981,7 @@ QObject* MainWindow::getDirectChild(QObject* widget)
return getDirectChild(widget->parent());
}
void MainWindow::on_action_Organize_Viewers_triggered()
void MainWindow::on_action_Rearrange_Viewers_triggered()
{
if(ui->mdiArea->subWindowList().size() == 1)
ui->mdiArea->subWindowList().first()->showMaximized();
@ -3032,7 +3032,7 @@ SubViewer::SubViewer(QWidget *parent, MainWindow* mw, Viewer* mainviewer)
actionCopyCamera->setObjectName("actionCopyCamera");
QAction* actionPasteCamera = new QAction("&Paste Camera",this);
actionPasteCamera->setObjectName("actionPasteCamera");
QMenu* cameraMenu = new QMenu("Camera", mw);
QMenu* cameraMenu = new QMenu("Ca&mera", mw);
cameraMenu->addAction(actionDumpCamera);
cameraMenu->addAction(actionCopyCamera);
cameraMenu->addAction(actionPasteCamera);
@ -3048,12 +3048,12 @@ SubViewer::SubViewer(QWidget *parent, MainWindow* mw, Viewer* mainviewer)
actionDrawTwoSide->setCheckable(true);
actionDrawTwoSide->setChecked(false);
viewMenu->addAction(actionDrawTwoSide);
QAction* actionQuick = new QAction("Quick Camera Mode",this);
QAction* actionQuick = new QAction("&Quick Camera Mode",this);
actionQuick->setObjectName("actionQuick");
actionQuick->setCheckable(true);
actionQuick->setChecked(true);
viewMenu->addAction(actionQuick);
QAction* actionOrtho = new QAction("Orthographic Projection",this);
QAction* actionOrtho = new QAction("&Orthographic Projection",this);
actionOrtho->setObjectName("actionOrtho");
actionOrtho->setCheckable(true);
actionOrtho->setChecked(false);
@ -3136,6 +3136,9 @@ void SubViewer::changeEvent(QEvent *event)
//| Qt::WindowSystemMenuHint
| Qt::WindowTitleHint
);
QAction* action = mw->findChild<QAction*>("action_Rearrange_Viewers");
action->setVisible(false);
viewer->update();
}
else
{
@ -3151,6 +3154,10 @@ void SubViewer::changeEvent(QEvent *event)
| Qt::WindowSystemMenuHint
| Qt::WindowTitleHint
);
QAction* action = mw->findChild<QAction*>("action_Rearrange_Viewers");
action->setVisible(true);
for(auto v : CGAL::QGLViewer::QGLViewerPool())
v->update();
}
}
}

2
Polyhedron/demo/Polyhedron/MainWindow.h
View File

@ -463,7 +463,7 @@ private:
private Q_SLOTS:
void on_actionAdd_Viewer_triggered();
void on_action_Organize_Viewers_triggered();
void on_action_Rearrange_Viewers_triggered();
void recenterViewer();
private:

6
Polyhedron/demo/Polyhedron/MainWindow.ui
View File

@ -93,7 +93,7 @@
<addaction name="dummyAction"/>
</widget>
<addaction name="actionAdd_Viewer"/>
<addaction name="action_Organize_Viewers"/>
<addaction name="action_Rearrange_Viewers"/>
<addaction name="menuDockWindows"/>
<addaction name="separator"/>
</widget>
@ -448,9 +448,9 @@
<string>Add &amp;Viewer</string>
</property>
</action>
<action name="action_Organize_Viewers">
<action name="action_Rearrange_Viewers">
<property name="text">
<string>&amp;Organize Viewers</string>
<string>&amp;Rearrange Viewers</string>
</property>
</action>
<action name="actionSa_ve_Scene_as_Script">