Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 7 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
index 7dbde8c..bc492df 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
@@ -147,6 +147,8 @@ void MainWindow::init()
     widgetCover->getContainerLayout()->addWidget(updatingSubBar, 2, 0);
     connect(UPDATES, SIGNAL(updatingProgress(QString,int,int)), this, SLOT(handleUpdatingProgress(QString,int,int)));
     connect(UPDATES, SIGNAL(updatingError(QString)), this, SLOT(handleUpdatingError()));
+
+    connect(CFG_CORE.General.Language, SIGNAL(changed(QVariant)), this, SLOT(notifyAboutLanguageChange()));
 }
 
 void MainWindow::cleanUp()
@@ -195,6 +197,11 @@ void MainWindow::updateWindowActions()
     actionMap[RESTORE_WINDOW]->setEnabled(hasClosedWindowToRestore());
 }
 
+void MainWindow::notifyAboutLanguageChange()
+{
+    notifyInfo(tr("You need to restart application to make the language change take effect."));
+}
+
 MdiArea *MainWindow::getMdiArea() const
 {
     return dynamic_cast<MdiArea*>(ui->mdiArea);