Merge pull request #449 from lornat75/motorgui-tooltips

improve tooltip text
robotology · Mar 19, 2015 · d1acfa0 · d1acfa0
2 parents fd97af9 + 023085e
commit d1acfa0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/yarpmotorgui-qt/mainwindow.cpp b/src/yarpmotorgui-qt/mainwindow.cpp
@@ -55,12 +55,12 @@ MainWindow::MainWindow(QWidget *parent) :
     globalToolBar->addSeparator();
     goAll = globalToolBar->addAction(QIcon(":/play-all.svg"),"Go All");
     globalToolBar->addSeparator();
-    runAllSeq      = globalToolBar->addAction(QIcon(":/images/runSequence.png"),"Run All Sequences");
-    runAllSeqTime  = globalToolBar->addAction(QIcon(":/images/runSequenceTime.png"),"Run All Sequences (time)");
+    runAllSeq      = globalToolBar->addAction(QIcon(":/images/runSequence.png"),"Run All Sequences (use joint speeds from Speed tab)");
+    runAllSeqTime  = globalToolBar->addAction(QIcon(":/images/runSequenceTime.png"),"Run All Sequences (ignore Speed tab, produce coordinated movement using Timing)");
     saveAllSeq     = globalToolBar->addAction(QIcon(":/file-save.svg"),"Save All Sequences");
     loadAllSeq     = globalToolBar->addAction(QIcon(":/file-open.svg"),"Load All Sequences");
-    cycleAllSeq    = globalToolBar->addAction(QIcon(":/images/cycleAllSequence.png"),"Cycle All Sequences");
-    cycleAllSeqTime= globalToolBar->addAction(QIcon(":/images/cycleAllSequenceTime.png"),"Cycle All Sequences (time)");
+    cycleAllSeq    = globalToolBar->addAction(QIcon(":/images/cycleAllSequence.png"),"Cycle All Sequences (use joint speeds from Speed tab)");
+    cycleAllSeqTime= globalToolBar->addAction(QIcon(":/images/cycleAllSequenceTime.png"),"Cycle All Sequences (ignore Speed tab, produce coordinated movement using Timing)");
     stopAllSeq     = globalToolBar->addAction(QIcon(":/stop.svg"),"Stop All Sequences");
     globalToolBar->addSeparator();
     runAllParts    = globalToolBar->addAction(QIcon(":/play.svg"),"Run All Parts");

diff --git a/src/yarpmotorgui-qt/sequencewindow.cpp b/src/yarpmotorgui-qt/sequencewindow.cpp
@@ -20,12 +20,13 @@ SequenceWindow::SequenceWindow(QString partName, int count,QWidget *parent) :
     ui->setupUi(this);
 
     setWindowTitle(QString("Sequence Window for part: %1").arg(partName));
-    goAction         = ui->toolBar->addAction(QIcon(":/play.svg"),"Run");
-    runTimeAction    = ui->toolBar->addAction(QIcon(":/images/runSequenceTime.png"),"Run (time)");
+    goAction        = ui->toolBar->addAction(QIcon(":/play.svg"),"Run (use joint speeds from Speed tab)");
+    runTimeAction    = ui->toolBar->addAction(QIcon(":/images/runSequenceTime.png"),"Run (ignore Speed tab, produce coordinated movement using Timing)");
+
     saveAction       = ui->toolBar->addAction(QIcon(":/file-save.svg"),"Save");
     openAction       = ui->toolBar->addAction(QIcon(":/file-open.svg"),"Open");
-    cycleAllAction   = ui->toolBar->addAction(QIcon(":/images/cycleAllSequence.png"),"Cycle");
-    cycleTimeAction  = ui->toolBar->addAction(QIcon(":/images/cycleAllSequenceTime.png"),"Cycle (time)");
+    cycleAllAction   = ui->toolBar->addAction(QIcon(":/images/cycleAllSequence.png"),"Cycle (use joint speeds from Speed tab)");
+    cycleTimeAction  = ui->toolBar->addAction(QIcon(":/images/cycleAllSequenceTime.png"),"Cycle (ignore Speed tab, produce coordinated movement using Timing)");
     stopAction       = ui->toolBar->addAction(QIcon(":/stop.svg"),"Stop");
 
     QMenu *menu = ui->menuBar->addMenu("Commands");