From 1cfa97497c2adc5da39721e7ec6d293990829d2f Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Wed, 17 Aug 2016 21:38:39 +0200 Subject: [PATCH] Fixed translations after language change --HG-- branch : feature --- src/app/valentina/dialogs/dialogpatternproperties.ui | 2 +- src/app/valentina/mainwindow.cpp | 1 + src/libs/vtools/dialogs/tools/dialogdetail.ui | 9 +++++++-- src/libs/vtools/tools/vtooldetail.cpp | 8 ++++++++ src/libs/vtools/tools/vtooldetail.h | 1 + src/libs/vwidgets/vmaingraphicsscene.h | 1 + 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui index 147d5022f..5e04e4baf 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.ui +++ b/src/app/valentina/dialogs/dialogpatternproperties.ui @@ -1140,7 +1140,7 @@ - Use %width% and %height% to insert pattern width and height + Use %size% and %height% to insert pattern size and height 40 diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 227e49c6a..710a8e2e8 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1222,6 +1222,7 @@ void MainWindow::changeEvent(QEvent *event) helpLabel->setText(QObject::tr("Changes applied.")); patternPieceLabel->setText(tr("Pattern Piece:")); UpdateWindowTitle(); + emit sceneDetails->LanguageChanged(); } // remember to call base class implementation QMainWindow::changeEvent(event); diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.ui b/src/libs/vtools/dialogs/tools/dialogdetail.ui index be52c4dde..ea9d9a4b2 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.ui +++ b/src/libs/vtools/dialogs/tools/dialogdetail.ui @@ -305,7 +305,8 @@ - .. + + @@ -319,7 +320,8 @@ - .. + + @@ -419,6 +421,9 @@ + + You can choose one of the predefined materials or enter a new one + true diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index 92d3e8328..8377ea9f2 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -208,6 +208,7 @@ VToolDetail::VToolDetail(VAbstractPattern *doc, VContainer *data, const quint32 connect(sceneDetails, &VMainGraphicsScene::DimensionsChanged, this, &VToolDetail::UpdateLabel); connect(sceneDetails, &VMainGraphicsScene::DimensionsChanged, this, &VToolDetail::UpdatePatternInfo); + connect(sceneDetails, &VMainGraphicsScene::LanguageChanged, this, &VToolDetail::retranslateUi); UpdateLabel(); UpdatePatternInfo(); @@ -1132,3 +1133,10 @@ void VToolDetail::UpdateAll() sceneDetails->update(); update(); } + +//--------------------------------------------------------------------------------------------------------------------- +void VToolDetail::retranslateUi() +{ + UpdateLabel(); + UpdatePatternInfo(); +} diff --git a/src/libs/vtools/tools/vtooldetail.h b/src/libs/vtools/tools/vtooldetail.h index 9e69f77d1..250129deb 100644 --- a/src/libs/vtools/tools/vtooldetail.h +++ b/src/libs/vtools/tools/vtooldetail.h @@ -99,6 +99,7 @@ public slots: virtual void AllowSelecting(bool enabled) Q_DECL_OVERRIDE; virtual void ResetChildren(QGraphicsItem* pItem); virtual void UpdateAll(); + virtual void retranslateUi(); protected: virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; diff --git a/src/libs/vwidgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h index 320604be6..e9d7c1822 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.h +++ b/src/libs/vwidgets/vmaingraphicsscene.h @@ -147,6 +147,7 @@ signals: void EnableDetailItemHover(bool enabled); void EnableLineItemHover(bool enabled); void DimensionsChanged(); + void LanguageChanged(); private: /** @brief horScrollBar value horizontal scroll bar. */