lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-23 16:23:55 +02:00
Code Activity

mainapplication: fix retranslate connection timing

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

https://git.jami.net/savoirfairelinux/jami-project/-/issues/1342
Change-Id: I446cfb15500929850a434280dada6785107f9e78
This commit is contained in:
Andreas Traczyk 2022-02-01 17:07:16 -05:00 • committed by Sébastien Blin
parent 07b05f0123
commit cab5a2223b
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mainapplication.cpp
View file

@ -148,10 +148,6 @@ MainApplication::MainApplication(int& argc, char** argv)
: QApplication(argc, argv) : QApplication(argc, argv)
{ {
QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); }); QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); });
QObject::connect(settingsManager_.get(),
&AppSettingsManager::retranslate,
this,
&MainApplication::retranslate);
} }
MainApplication::~MainApplication() MainApplication::~MainApplication()
@ -171,6 +167,11 @@ MainApplication::init()
systemTray_.reset(new SystemTray(settingsManager_.get(), this)); systemTray_.reset(new SystemTray(settingsManager_.get(), this));
previewEngine_.reset(new PreviewEngine(this)); previewEngine_.reset(new PreviewEngine(this));
QObject::connect(settingsManager_.get(),
&AppSettingsManager::retranslate,
engine_.get(),
&QQmlApplicationEngine::retranslate);
setWindowIcon(QIcon(":/images/jami.ico")); setWindowIcon(QIcon(":/images/jami.ico"));
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
@ -265,12 +266,6 @@ MainApplication::restoreApp()
Q_EMIT lrcInstance_->restoreAppRequested(); Q_EMIT lrcInstance_->restoreAppRequested();
} }
void
MainApplication::retranslate()
{
engine_->retranslate();
}
void void
MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon) MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon)
{ {

3
src/mainapplication.h
View file

@ -79,9 +79,6 @@ private:
void initSystray(); void initSystray();
void cleanup(); void cleanup();
public Q_SLOTS:
void retranslate();
private: private:
QScopedPointer<QFile> debugFile_; QScopedPointer<QFile> debugFile_;
QScopedPointer<QQmlApplicationEngine> engine_; QScopedPointer<QQmlApplicationEngine> engine_;