Skip to content

Commit

Permalink
Small changes to the onscreen help
Browse files Browse the repository at this point in the history
  • Loading branch information
cignoni committed Oct 3, 2024
1 parent 332ef49 commit ce9eebd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/meshlab/glarea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,7 @@ void GLArea::displayHelp()
else assert(0);
#ifdef Q_OS_MAC
tableText.replace("Ctrl","Command");
tableText.replace("Command-H","Command-Shift-H");
#endif
}
md()->Log.realTimeLog("Quick Help","",tableText);
Expand Down
14 changes: 10 additions & 4 deletions src/meshlab/images/onscreenHelp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
</H2>
<table>
<tr><td width="200" align='right'>Drag: </td><td width="200">Rotate</td></tr>
<tr><td width="200" align='right'>Double Click: </td><td width="200">Center Trackball on the indicate point</td></tr>
<tr><td width="200" align='right'>Ctrl-Drag: </td><td width="200">Pan</td></tr>
<tr><td width="200" align='right'>Shift-Drag: </td><td width="200">Zoom</td></tr>
<tr><td width="200" align='right'>Wheel: </td><td width="200">Zoom </td></tr>
<tr><td width="200" align='right'>Wheel: </td><td width="200">Zoom</td></tr>
<tr><td width="200" align='right'>Alt-Drag: </td><td width="200">Z-Panning</td></tr>
<tr><td width="200" align='right'>Ctrl-Shift-Drag: </td><td width="200">Change light direction</td></tr>
<tr><td width="200" align='right'>Shift-Wheel: </td><td width="200" align='justify'>Change perspective (up to a orthographic camera)</td></tr>
<tr><td width="200" align='right'>Ctrl-Wheel: </td><td width="200">Move near clipping plane <br>(in image space: 0 is viewer position, 1 is trackball center)</td></tr>
<tr><td width="200" align='right'>Double Click: </td><td width="200">Center on mouse</td></tr>
<tr><td width="200" align='right'>Alt+enter: </td><td width="200">Enter/Exit fullscreen mode</td></tr>
<tr><td width="200" align='right'>Ctrl-H: </td><td width="200">Reset Trackball (WINDOWS)</td></tr>
<tr><td width="200" align='right'>Command-Shift-H: </td><td width="200">Reset Trackball (MacOS)</td></tr>
<tr><td width="200" align='right'>Ctrl-H: </td><td width="200">Reset Trackball</td></tr>
</table>
<br>
<H2 >
Expand All @@ -25,5 +24,12 @@
<tr><td width="200" align='right'>Ctrl-Click on eye icon: </td><td width="100">Make Invisible all other layers</td></tr>
<tr><td width="200" align='right'>Alt-Click on eye icon: </td><td width="100">Make Visible all other layers</td></tr>
<tr><td width="200" align='right'>Shift-Click on eye icon: </td><td width="100">Invert visibility status of all the layers</td></tr>
<tr></tr>
<tr><td width="200" align='right'>Ctrl-Click on the left 1-2-3-4: </td><td width="100">Store current camera in the <i>i-th</i> position</td></tr>
<tr><td width="200" align='right'>Click on the left 1-2-3-4: </td><td width="100">Recall <i>i-th</i> camera position</td></tr>
<tr></tr>
<tr><td width="200" align='right'>Ctrl-Click on the right 1-2-3-4: </td><td width="100">Store current visibility of layers in the <i>i-th</i> position</td></tr>
<tr><td width="200" align='right'>Click on the right 1-2-3-4: </td><td width="100">Recall <i>i-th</i> visibility of layers </td></tr>
<tr></tr>
</table>
</font>
2 changes: 1 addition & 1 deletion src/meshlab/layerDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ void LayerDialog::pauseAnim()
{
animTimer->stop();
ui->animPlay->setChecked(false);
ui->animPlay->setText(tr(">"));
ui->animPlay->setText(tr("▶️"));
ui->animPlay->setToolTip(tr("Resume animation"));
}

Expand Down

0 comments on commit ce9eebd

Please sign in to comment.