diff --git a/src/Gui/DlgCustomizeSpNavSettings.cpp b/src/Gui/DlgCustomizeSpNavSettings.cpp index 808bee740..9270a3c5a 100644 --- a/src/Gui/DlgCustomizeSpNavSettings.cpp +++ b/src/Gui/DlgCustomizeSpNavSettings.cpp @@ -30,7 +30,7 @@ using namespace Gui::Dialog; DlgCustomizeSpNavSettings::DlgCustomizeSpNavSettings(QWidget *parent) : - CustomizeActionPage(parent) + CustomizeActionPage(parent), init(false) { GUIApplicationNativeEventAware *app = qobject_cast(QApplication::instance()); @@ -42,6 +42,7 @@ DlgCustomizeSpNavSettings::DlgCustomizeSpNavSettings(QWidget *parent) : this->setMessage(tr("No Spaceball Present")); return; } + this->init = true; this->setupUi(this); initialize(); } @@ -65,7 +66,14 @@ void DlgCustomizeSpNavSettings::setMessage(const QString& message) void DlgCustomizeSpNavSettings::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) { - this->retranslateUi(this); + if (this->init) { + this->retranslateUi(this); + } + else { + this->setWindowTitle(tr("Spaceball Motion")); + QLabel *messageLabel = this->findChild(); + if (messageLabel) messageLabel->setText(tr("No Spaceball Present")); + } } QWidget::changeEvent(e); } @@ -82,7 +90,7 @@ void DlgCustomizeSpNavSettings::on_ButtonCalibrate_clicked() } void DlgCustomizeSpNavSettings::initialize() -{ +{ CBDominant->setChecked(spaceballMotionGroup()->GetBool("Dominant", false)); CBFlipYZ->setChecked(spaceballMotionGroup()->GetBool("FlipYZ", false)); CBRotations->setChecked(spaceballMotionGroup()->GetBool("Rotations", true)); @@ -163,7 +171,6 @@ void DlgCustomizeSpNavSettings::on_CBRotations_clicked() CBEnableSpin ->setEnabled(CBRotations->isChecked()); CBReverseSpin->setEnabled(CBRotations->isChecked() && CBEnableSpin->isChecked()); SliderSpin ->setEnabled(CBRotations->isChecked() && CBEnableSpin->isChecked()); - } void DlgCustomizeSpNavSettings::on_CBTranslations_clicked() @@ -186,7 +193,7 @@ void DlgCustomizeSpNavSettings::on_SliderGlobal_sliderReleased() spaceballMotionGroup()->SetInt("GlobalSensitivity", SliderGlobal->value()); } -void DlgCustomizeSpNavSettings::on_CBEnablePanLR_clicked() +void DlgCustomizeSpNavSettings::on_CBEnablePanLR_clicked() { spaceballMotionGroup()->SetBool("PanLREnable", CBEnablePanLR->isChecked()); @@ -194,17 +201,17 @@ void DlgCustomizeSpNavSettings::on_CBEnablePanLR_clicked() SliderPanLR ->setEnabled(CBEnablePanLR->isChecked()); } -void DlgCustomizeSpNavSettings::on_CBReversePanLR_clicked() +void DlgCustomizeSpNavSettings::on_CBReversePanLR_clicked() { spaceballMotionGroup()->SetBool("PanLRReverse", CBReversePanLR->isChecked()); } -void DlgCustomizeSpNavSettings::on_SliderPanLR_sliderReleased() +void DlgCustomizeSpNavSettings::on_SliderPanLR_sliderReleased() { spaceballMotionGroup()->SetInt("PanLRSensitivity", SliderPanLR->value()); } -void DlgCustomizeSpNavSettings::on_CBEnablePanUD_clicked() +void DlgCustomizeSpNavSettings::on_CBEnablePanUD_clicked() { spaceballMotionGroup()->SetBool("PanUDEnable", CBEnablePanUD->isChecked()); @@ -212,7 +219,7 @@ void DlgCustomizeSpNavSettings::on_CBEnablePanUD_clicked() SliderPanUD ->setEnabled(CBEnablePanUD->isChecked()); } -void DlgCustomizeSpNavSettings::on_CBReversePanUD_clicked() +void DlgCustomizeSpNavSettings::on_CBReversePanUD_clicked() { spaceballMotionGroup()->SetBool("PanUDReverse", CBReversePanUD->isChecked()); } @@ -222,7 +229,7 @@ void DlgCustomizeSpNavSettings::on_SliderPanUD_sliderReleased() spaceballMotionGroup()->SetInt("PanUDSensitivity", SliderPanUD->value()); } -void DlgCustomizeSpNavSettings::on_CBEnableZoom_clicked() +void DlgCustomizeSpNavSettings::on_CBEnableZoom_clicked() { spaceballMotionGroup()->SetBool("ZoomEnable", CBEnableZoom->isChecked()); @@ -230,7 +237,7 @@ void DlgCustomizeSpNavSettings::on_CBEnableZoom_clicked() SliderZoom ->setEnabled(CBEnableZoom->isChecked()); } -void DlgCustomizeSpNavSettings::on_CBReverseZoom_clicked() +void DlgCustomizeSpNavSettings::on_CBReverseZoom_clicked() { spaceballMotionGroup()->SetBool("ZoomReverse", CBReverseZoom->isChecked()); } @@ -240,7 +247,7 @@ void DlgCustomizeSpNavSettings::on_SliderZoom_sliderReleased() spaceballMotionGroup()->SetInt("ZoomSensitivity", SliderZoom->value()); } -void DlgCustomizeSpNavSettings::on_CBEnableTilt_clicked() +void DlgCustomizeSpNavSettings::on_CBEnableTilt_clicked() { spaceballMotionGroup()->SetBool("TiltEnable", CBEnableTilt->isChecked()); @@ -248,7 +255,7 @@ void DlgCustomizeSpNavSettings::on_CBEnableTilt_clicked() SliderTilt ->setEnabled(CBEnableTilt->isChecked()); } -void DlgCustomizeSpNavSettings::on_CBReverseTilt_clicked() +void DlgCustomizeSpNavSettings::on_CBReverseTilt_clicked() { spaceballMotionGroup()->SetBool("TiltReverse", CBReverseTilt->isChecked()); } @@ -266,7 +273,7 @@ void DlgCustomizeSpNavSettings::on_CBEnableRoll_clicked() SliderRoll ->setEnabled(CBEnableRoll->isChecked()); } -void DlgCustomizeSpNavSettings::on_CBReverseRoll_clicked() +void DlgCustomizeSpNavSettings::on_CBReverseRoll_clicked() { spaceballMotionGroup()->SetBool("RollReverse", CBReverseRoll->isChecked()); } diff --git a/src/Gui/DlgCustomizeSpNavSettings.h b/src/Gui/DlgCustomizeSpNavSettings.h index 6966094d5..3e2f385b9 100644 --- a/src/Gui/DlgCustomizeSpNavSettings.h +++ b/src/Gui/DlgCustomizeSpNavSettings.h @@ -40,8 +40,7 @@ namespace Gui explicit DlgCustomizeSpNavSettings(QWidget *parent = 0); ~DlgCustomizeSpNavSettings(); - - protected Q_SLOTS: + protected Q_SLOTS: void onAddMacroAction(const QByteArray&); void onRemoveMacroAction(const QByteArray&); void onModifyMacroAction(const QByteArray&); @@ -50,23 +49,23 @@ namespace Gui void on_CBRotations_clicked(); void on_CBTranslations_clicked(); void on_SliderGlobal_sliderReleased(); - void on_CBEnablePanLR_clicked(); - void on_CBReversePanLR_clicked(); - void on_SliderPanLR_sliderReleased(); - void on_CBEnablePanUD_clicked(); - void on_CBReversePanUD_clicked(); - void on_SliderPanUD_sliderReleased(); - void on_CBEnableZoom_clicked(); - void on_CBReverseZoom_clicked(); - void on_SliderZoom_sliderReleased(); - void on_CBEnableTilt_clicked(); - void on_CBReverseTilt_clicked(); - void on_SliderTilt_sliderReleased(); - void on_CBEnableRoll_clicked(); - void on_CBReverseRoll_clicked(); - void on_SliderRoll_sliderReleased(); - void on_CBEnableSpin_clicked(); - void on_CBReverseSpin_clicked(); + void on_CBEnablePanLR_clicked(); + void on_CBReversePanLR_clicked(); + void on_SliderPanLR_sliderReleased(); + void on_CBEnablePanUD_clicked(); + void on_CBReversePanUD_clicked(); + void on_SliderPanUD_sliderReleased(); + void on_CBEnableZoom_clicked(); + void on_CBReverseZoom_clicked(); + void on_SliderZoom_sliderReleased(); + void on_CBEnableTilt_clicked(); + void on_CBReverseTilt_clicked(); + void on_SliderTilt_sliderReleased(); + void on_CBEnableRoll_clicked(); + void on_CBReverseRoll_clicked(); + void on_SliderRoll_sliderReleased(); + void on_CBEnableSpin_clicked(); + void on_CBReverseSpin_clicked(); void on_SliderSpin_sliderReleased(); void on_ButtonDefaultSpNavMotions_clicked(); void on_ButtonCalibrate_clicked(); @@ -74,10 +73,13 @@ namespace Gui protected: void changeEvent(QEvent *e); - private: - ParameterGrp::handle spaceballMotionGroup() const; + private: + ParameterGrp::handle spaceballMotionGroup() const; void setMessage(const QString& message); - void initialize(); + void initialize(); + + private: + bool init; }; } }