Skip to content
Snippets Groups Projects
Commit cab5a222 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Sébastien Blin
Browse files

mainapplication: fix retranslate connection timing

Connect after initializing the settings manager pointer and
remove a slot by relaying the retranslate signal.

jami-project#1342
Change-Id: I446cfb15500929850a434280dada6785107f9e78
parent 07b05f01
No related branches found
No related tags found
No related merge requests found
......@@ -148,10 +148,6 @@ MainApplication::MainApplication(int& argc, char** argv)
: QApplication(argc, argv)
{
QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); });
QObject::connect(settingsManager_.get(),
&AppSettingsManager::retranslate,
this,
&MainApplication::retranslate);
}
MainApplication::~MainApplication()
......@@ -171,6 +167,11 @@ MainApplication::init()
systemTray_.reset(new SystemTray(settingsManager_.get(), this));
previewEngine_.reset(new PreviewEngine(this));
QObject::connect(settingsManager_.get(),
&AppSettingsManager::retranslate,
engine_.get(),
&QQmlApplicationEngine::retranslate);
setWindowIcon(QIcon(":/images/jami.ico"));
#ifdef Q_OS_LINUX
......@@ -265,12 +266,6 @@ MainApplication::restoreApp()
Q_EMIT lrcInstance_->restoreAppRequested();
}
void
MainApplication::retranslate()
{
engine_->retranslate();
}
void
MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon)
{
......
......@@ -79,9 +79,6 @@ private:
void initSystray();
void cleanup();
public Q_SLOTS:
void retranslate();
private:
QScopedPointer<QFile> debugFile_;
QScopedPointer<QQmlApplicationEngine> engine_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment