SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.shs.tools/SHS/libs

Browse Source
This commit is contained in:
Бычков Андрей
2020-05-28 10:17:15 +03:00
parent c269dd6b9e 54ad05ffef
commit 87f49853b2
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qad/CMakeLists.txt
View File

@@ -3,8 +3,8 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake
project(qad) project(qad)
set(_QAD_MAJOR 1) set(_QAD_MAJOR 1)
set(_QAD_MINOR 3) set(_QAD_MINOR 3)
set(_QAD_REVISION 0) set(_QAD_REVISION 1)
set(_QAD_SUFFIX alpha) set(_QAD_SUFFIX beta)
set(_QAD_COMPANY SHS) set(_QAD_COMPANY SHS)
set(_QAD_DOMAIN org.SHS) set(_QAD_DOMAIN org.SHS)

14
qad/utils/qad_locations.cpp
View File

@@ -16,11 +16,11 @@
class __QADTranslators__ { class __QADTranslators__ {
public: public:
static QMap<QString, QTranslator *> translators; static QList<QTranslator * > translators;
private: private:
}; };
QMap<QString, QTranslator *> __QADTranslators__::translators = QMap<QString, QTranslator *>(); QList<QTranslator * > __QADTranslators__::translators = QList<QTranslator * >();
QString QAD::userPath(QAD::LocationType loc, QString name) { QString QAD::userPath(QAD::LocationType loc, QString name) {
@@ -67,11 +67,9 @@ QStringList QAD::resourcePaths(QString type) {
void QAD::loadTranslations(QString lang) { void QAD::loadTranslations(QString lang) {
QMapIterator<QString, QTranslator *> i(__QADTranslators__::translators); foreach (QTranslator * t, __QADTranslators__::translators) {
while (i.hasNext()) { qApp->removeTranslator(t);
i.next(); delete t;
qApp->removeTranslator(i.value());
delete i.value();
} }
__QADTranslators__::translators.clear(); __QADTranslators__::translators.clear();
if (lang.isEmpty()) if (lang.isEmpty())
@@ -88,7 +86,7 @@ void QAD::loadTranslations(QString lang) {
QTranslator * tr = new QTranslator(); QTranslator * tr = new QTranslator();
if (tr->load(dit.filePath())) { if (tr->load(dit.filePath())) {
qApp->installTranslator(tr); qApp->installTranslator(tr);
__QADTranslators__::translators[dit.filePath()] = tr; __QADTranslators__::translators << tr;
qDebug() << "Add tr" << dit.fileName(); qDebug() << "Add tr" << dit.fileName();
} else { } else {
qDebug() << "Can`t load translation" << dit.fileName(); qDebug() << "Can`t load translation" << dit.fileName();