From b283fb2a76b5dc23c46e655d10324cacb711a321 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Fri, 8 Jan 2016 13:55:37 +0200 Subject: [PATCH] Retranslate history --HG-- branch : feature --- .../dialogs/configpages/configurationpage.cpp | 1 - src/app/valentina/dialogs/dialoghistory.cpp | 20 +++++++++++++++++++ src/app/valentina/dialogs/dialoghistory.h | 2 ++ src/app/valentina/mainwindow.cpp | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/dialogs/configpages/configurationpage.cpp b/src/app/valentina/dialogs/configpages/configurationpage.cpp index 3ca0868c6..5d58394e6 100644 --- a/src/app/valentina/dialogs/configpages/configurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/configurationpage.cpp @@ -380,5 +380,4 @@ void ConfigurationPage::RetranslateUi() askPointDeletionCheck->setText(tr("Confirm item deletion")); toolBarGroup->setTitle(tr("Toolbar")); toolBarStyleCheck->setText(tr("The text appears under the icon. (recommended for beginners.)")); - } diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index 828a7bf57..4c06a28d2 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -502,3 +502,23 @@ void DialogHistory::closeEvent(QCloseEvent *event) emit ShowHistoryTool(id, false); DialogTool::closeEvent(event); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogHistory::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + // retranslate designer form (single inheritance approach) + ui->retranslateUi(this); + RetranslateUi(); + } + + // remember to call base class implementation + QDialog::changeEvent(event); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogHistory::RetranslateUi() +{ + UpdateHistory(); +} diff --git a/src/app/valentina/dialogs/dialoghistory.h b/src/app/valentina/dialogs/dialoghistory.h index 6d1d555d0..e306f8ebf 100644 --- a/src/app/valentina/dialogs/dialoghistory.h +++ b/src/app/valentina/dialogs/dialoghistory.h @@ -68,6 +68,7 @@ signals: void ShowHistoryTool(quint32 id, bool enable); protected: virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE; + virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogHistory) @@ -89,6 +90,7 @@ private: void ShowPoint(); QString PointName(quint32 pointId); quint32 AttrUInt(const QDomElement &domElement, const QString &name); + void RetranslateUi(); }; #endif // DIALOGHISTORY_H diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 9c54865a0..e2dcab1fb 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1129,6 +1129,7 @@ void MainWindow::changeEvent(QEvent *event) redoAction->setText(tr("&Redo")); helpLabel->setText(QObject::tr("Create new pattern piece to start working.")); patternPieceLabel->setText(tr("Pattern Piece: ")); + UpdateWindowTitle(); } // remember to call base class implementation QMainWindow::changeEvent(event);