diff --git a/apps/OpenSpace/ext/launcher/include/ui_assets.h b/apps/OpenSpace/ext/launcher/include/ui_assets.h index 0e11fa64d5..d5f5bb4bbd 100644 --- a/apps/OpenSpace/ext/launcher/include/ui_assets.h +++ b/apps/OpenSpace/ext/launcher/include/ui_assets.h @@ -73,7 +73,7 @@ public: void retranslateUi(QDialog *assets) { - assets->setWindowTitle(QCoreApplication::translate("assets", "Dialog", nullptr)); + assets->setWindowTitle(QCoreApplication::translate("assets", "Select assets to include", nullptr)); #if QT_CONFIG(tooltip) treeView->setToolTip(QCoreApplication::translate("assets", "

Expand arrow entries to browse assets in this OpenSpace installation. Enable checkbox to include an asset. Those assets highlighted in red are present in the profile but do not exist in this OpenSpace installation.

", nullptr)); #endif // QT_CONFIG(tooltip) diff --git a/apps/OpenSpace/ext/launcher/include/ui_marknodes.h b/apps/OpenSpace/ext/launcher/include/ui_marknodes.h index 0250083547..a5156fe6db 100644 --- a/apps/OpenSpace/ext/launcher/include/ui_marknodes.h +++ b/apps/OpenSpace/ext/launcher/include/ui_marknodes.h @@ -88,7 +88,7 @@ public: #if QT_CONFIG(tooltip) line_node->setToolTip(QCoreApplication::translate("markNodes", "

Name of scenegraph node to add to list of "interesting" nodes

", nullptr)); #endif // QT_CONFIG(tooltip) - button_add->setText(QCoreApplication::translate("markNodes", "Add New", nullptr)); + button_add->setText(QCoreApplication::translate("markNodes", "Add", nullptr)); } // retranslateUi }; diff --git a/apps/OpenSpace/ext/launcher/include/ui_ostime.h b/apps/OpenSpace/ext/launcher/include/ui_ostime.h index 928e311ee4..7d54e69b15 100644 --- a/apps/OpenSpace/ext/launcher/include/ui_ostime.h +++ b/apps/OpenSpace/ext/launcher/include/ui_ostime.h @@ -83,7 +83,7 @@ public: time->setWindowTitle(QCoreApplication::translate("time", "Time", nullptr)); label_relative->setText(QCoreApplication::translate("time", "Relative Time:", nullptr)); #if QT_CONFIG(tooltip) - line_relative->setToolTip(QCoreApplication::translate("time", "

String for relative time to actual (e.g. "-1d" for back 1 day)

", nullptr)); + line_relative->setToolTip(QCoreApplication::translate("time", "

String for relative time from actual (e.g. "-1d" for back 1 day, "now" for current time, "+2w" for forward 2 weeks)

", nullptr)); #endif // QT_CONFIG(tooltip) #if QT_CONFIG(tooltip) combo_type->setToolTip(QCoreApplication::translate("time", "

Types: Absolute defined time or Relative to actual time

", nullptr)); diff --git a/apps/OpenSpace/ext/launcher/src/assets.cpp b/apps/OpenSpace/ext/launcher/src/assets.cpp index d96d57a223..c9d79c675d 100644 --- a/apps/OpenSpace/ext/launcher/src/assets.cpp +++ b/apps/OpenSpace/ext/launcher/src/assets.cpp @@ -12,7 +12,7 @@ assets::assets(openspace::Profile* imported, const std::string reportAssets, QWi : QDialog(parent) , ui(new Ui::assets) , _imported(imported) - , _assetTreeModel(tr("Asset"), tr("Enabled"), tr("Var Name")) + , _assetTreeModel(tr("Asset"), tr("Enabled"), tr("Variable Name")) { ui->setupUi(this); diff --git a/apps/OpenSpace/ext/launcher/src/deltatimes.cpp b/apps/OpenSpace/ext/launcher/src/deltatimes.cpp index d26783c240..f664c158f3 100644 --- a/apps/OpenSpace/ext/launcher/src/deltatimes.cpp +++ b/apps/OpenSpace/ext/launcher/src/deltatimes.cpp @@ -141,6 +141,7 @@ void deltaTimes::addDeltaTimeValue() { ui->listWidget->addItem(new QListWidgetItem(messageAddValue)); } ui->listWidget->setCurrentRow(ui->listWidget->count() - 1); + ui->line_seconds->setFocus(Qt::OtherFocusReason); _editModeNewItem = true; } @@ -215,6 +216,7 @@ void deltaTimes::transitionToEditMode(void) { ui->button_save->setDisabled(false); ui->buttonBox->setDisabled(true); + ui->line_seconds->setFocus(Qt::OtherFocusReason); editBoxDisabled(false); } @@ -226,6 +228,7 @@ void deltaTimes::transitionFromEditMode(void) { ui->button_save->setDisabled(true); ui->buttonBox->setDisabled(false); + ui->button_add->setFocus(Qt::OtherFocusReason); editBoxDisabled(true); ui->label_adjust->setText("Set Delta Time"); } @@ -263,7 +266,16 @@ deltaTimes::~deltaTimes() { void deltaTimes::keyPressEvent(QKeyEvent *evt) { - if(evt->key() == Qt::Key_Enter || evt->key() == Qt::Key_Return) - return; + if(evt->key() == Qt::Key_Enter || evt->key() == Qt::Key_Return) { + if (_editModeNewItem) { + saveDeltaTimeValue(); + return; + } + else { + addDeltaTimeValue(); + return; + } + } + QDialog::keyPressEvent(evt); }