diff --git a/GlobalString.cpp b/GlobalString.cpp index e060dc0..c17a2d6 100755 --- a/GlobalString.cpp +++ b/GlobalString.cpp @@ -28,6 +28,19 @@ GlobalString::GlobalString() } +QMap GlobalString::getGlobalMap() +{ + QMap globalMap; + QSettings globalFile(getLanguageFile(), QSettings::IniFormat); + globalFile.beginGroup("Global"); + QStringList globalStrList = globalFile.childKeys(); + foreach(const QString &globalStr, globalStrList) + { + globalMap[globalStr] = globalFile.value(globalStr, globalStr).toString(); + } + globalFile.endGroup(); + return globalMap; +} QString GlobalString::getString(QString valueStr, bool *ok) { diff --git a/GlobalString.h b/GlobalString.h index fb8fc50..65abad2 100755 --- a/GlobalString.h +++ b/GlobalString.h @@ -20,6 +20,7 @@ #define GLOBALSTRING_H #include +#include class GlobalString { @@ -28,6 +29,7 @@ public: static QString getString(QString valueStr, bool *ok = 0); static QString getLanguageFile(); static QString getLanguage(); + static QMap getGlobalMap(); }; #endif // GLOBALSTRING_H diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 6db1fea..38e3d7f 100755 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -68,6 +68,9 @@ PictureDialog::PictureDialog(ProfileDatabase *profileDB, QWidget *parent) : exportMenu->addAction(tr("Export as >A Snapmatic..."), this, SLOT(copySnapmaticPicture())); ui->cmdExport->setMenu(exportMenu); + // Global map + globalMap = GlobalString::getGlobalMap(); + installEventFilter(this); installEventFilter(ui->labPicture); ui->labPicture->setFocusPolicy(Qt::StrongFocus); @@ -158,7 +161,10 @@ void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, QString pictu plyrsList = picture->getPlayers(); picTitl = picture->getPictureTitl(); picArea = picture->getArea(); - picAreaStr = GlobalString::getString(picArea); + if (globalMap.contains(picArea)) + { + picAreaStr = globalMap[picArea]; + } QString plyrsStr; if (plyrsList.length() >= 1) diff --git a/PictureDialog.h b/PictureDialog.h index 20a4d99..313f655 100755 --- a/PictureDialog.h +++ b/PictureDialog.h @@ -68,6 +68,7 @@ protected: private: ProfileDatabase *profileDB; Ui::PictureDialog *ui; + QMap globalMap; SnapmaticPicture *smpic; QImage snapmaticPicture; QString jsonDrawString;