kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-23 03:58:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the QTranslator members of KiwixApp.

Browse Source 
If we pass their address to `installTranslator` we have to be sure they
exist after we quit the constructor.
This commit is contained in:
Matthieu Gautier 2018-09-05 15:35:21 +02:00
parent 0c6cdc4ac4
commit 2304987bcf
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kiwixapp.cpp
View File

@ -2,7 +2,6 @@
#include "zim/error.h" #include "zim/error.h"
#include <QLocale> #include <QLocale>
#include <QTranslator>
#include <QObject> #include <QObject>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QFontDatabase> #include <QFontDatabase>
@ -16,14 +15,12 @@
KiwixApp::KiwixApp(int& argc, char *argv[]) KiwixApp::KiwixApp(int& argc, char *argv[])
: QApplication(argc, argv) : QApplication(argc, argv)
{ {
QTranslator qtTranslator; m_qtTranslator.load("qt_" + QLocale::system().name(),
qtTranslator.load("qt_" + QLocale::system().name(),
QLibraryInfo::location(QLibraryInfo::TranslationsPath)); QLibraryInfo::location(QLibraryInfo::TranslationsPath));
installTranslator(&qtTranslator); installTranslator(&m_qtTranslator);
QTranslator myappTranslator; m_appTranslator.load(":/i18n/kiwix-desktop.qm");
myappTranslator.load(":/i18n/kiwix-desktop.qm"); installTranslator(&m_appTranslator);
installTranslator(&myappTranslator);
auto icon = QIcon(); auto icon = QIcon();
icon.addFile(":/icons/kiwix/app_icon.svg"); icon.addFile(":/icons/kiwix/app_icon.svg");

2
src/kiwixapp.h
View File

@ -10,6 +10,7 @@
#include <QApplication> #include <QApplication>
#include <QErrorMessage> #include <QErrorMessage>
#include <QTranslator>
class KiwixApp : public QApplication class KiwixApp : public QApplication
@ -72,6 +73,7 @@ protected:
void postInit(); void postInit();
private: private:
QTranslator m_qtTranslator, m_appTranslator;
Library m_library; Library m_library;
MainWindow* mp_mainWindow; MainWindow* mp_mainWindow;
TabWidget* mp_tabWidget; TabWidget* mp_tabWidget;