From cd9c6c99ae5a6c9fe436481a2df1a406f64704b8 Mon Sep 17 00:00:00 2001
From: Valentina Zhuravska <none@none>
Date: Tue, 3 May 2016 23:16:57 +0300
Subject: [PATCH] Resolved issue #473. Tape 'Preferences' cause loss of focus

--HG--
branch : develop
---
 src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp | 1 +
 src/app/tape/tmainwindow.cpp                               | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp
index 89de17347..c218ba4d4 100644
--- a/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp
+++ b/src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp
@@ -103,6 +103,7 @@ void TapeConfigurationPage::Apply()
         systemChanged = false;
 
         qApp->LoadTranslation(locale);
+        qApp->processEvents();// force to call changeEvent
 
         // Part about measurments will not be updated automatically
         qApp->RetranslateTables();
diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index d739f4fd1..b66ff66b5 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -168,7 +168,6 @@ void TMainWindow::RetranslateTable()
     {
         const int row = ui->tableWidget->currentRow();
         RefreshTable();
-        ShowUnits();
         ui->tableWidget->selectRow(row);
     }
 }
@@ -2214,6 +2213,8 @@ void TMainWindow::RefreshTable()
     ui->tableWidget->blockSignals(true);
     ui->tableWidget->clearContents();
 
+    ShowUnits();
+
     const QMap<QString, QSharedPointer<VMeasurement> > table = data->DataMeasurements();
     QMap<int, QSharedPointer<VMeasurement> > orderedTable;
     QMap<QString, QSharedPointer<VMeasurement> >::const_iterator iterMap;
@@ -2585,7 +2586,6 @@ void TMainWindow::UpdatePatternUnit()
         return;
     }
 
-    ShowUnits();
     RefreshTable();
 
     search->RefreshList(ui->lineEditFind->text());