| -rw-r--r-- | library/global.cpp | 55 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 40 | ||||
| -rwxr-xr-x | mkipks | 2 | ||||
| -rw-r--r-- | noncore/games/minesweep/Makefile.in | 18 |
4 files changed, 71 insertions, 44 deletions
diff --git a/library/global.cpp b/library/global.cpp index fd7579a..dd15eb7 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -19,2 +19,3 @@ **********************************************************************/ +#define QTOPIA_INTERNAL_LANGLIST #include <qpe/qpedebug.h> @@ -172,8 +173,14 @@ const QDawg& Global::fixedDawg() QString dawgfilename = dictDir() + "/dawg"; - QString lang = getenv( "LANG" ); - QString dawgfilename_lang = dawgfilename + "." + lang; - QString words_lang = dictDir() + "/words." + lang; - if ( QFile::exists(dawgfilename_lang) || - QFile::exists(words_lang) ) - dawgfilename = dawgfilename_lang; + QString words_lang; + QStringList langs = Global::languageList(); + for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { + QString lang = *it; + words_lang = dictDir() + "/words." + lang; + QString dawgfilename_lang = dawgfilename + "." + lang; + if ( QFile::exists(dawgfilename_lang) || + QFile::exists(words_lang) ) { + dawgfilename = dawgfilename_lang; + break; + } + } QFile dawgfile(dawgfilename); @@ -641,2 +648,38 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter) +QStringList Global::languageList() +{ + QString lang = getenv("LANG"); + QStringList langs; + langs.append(lang); + int i = lang.find("."); + if ( i > 0 ) + lang = lang.left( i ); + i = lang.find( "_" ); + if ( i > 0 ) + langs.append(lang.left(i)); + return langs; +} + +QStringList Global::helpPath() +{ + QStringList path; + QStringList langs = Global::languageList(); + for (QStringList::ConstIterator it = langs.fromLast(); it!=langs.end(); --it) { + QString lang = *it; + if ( !lang.isEmpty() ) + path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; + } + path += QPEApplication::qpeDir() + "/pics"; + path += QPEApplication::qpeDir() + "/help/en/html"; + path += QPEApplication::qpeDir() + "/docs"; + QString dir = QDir::current().canonicalPath(); + if ( dir == "/" ) + dir += "/docs"; + else { + path += dir + "/../pics"; + dir += "/../docs"; + path += dir; + } + return path; +} diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 70ffec1..4dbfbd8 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -21,2 +21,3 @@ **********************************************************************/ +#define QTOPIA_INTERNAL_LANGLIST #include <stdlib.h> @@ -139,18 +140,3 @@ public: { - QStringList path; - QString lang = getenv("LANG"); - if ( !lang.isEmpty() ) - path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; - path += QPEApplication::qpeDir() + "/pics"; - path += QPEApplication::qpeDir() + "/help/en/html"; - path += QPEApplication::qpeDir() + "/docs"; - QString dir = QDir::current().canonicalPath(); - if ( dir == "/" ) - dir += "/docs"; - else { - path += dir + "/../pics"; - dir += "/../docs"; - path += dir; - } - setFilePath( path ); + setFilePath( Global::helpPath() ); setExtensionType("html","text/html;charset=UTF-8"); @@ -539,15 +525,11 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) #ifndef QT_NO_TRANSLATION - char *l = getenv( "LANG" ); - QString lang; - if ( l ) { - lang = l; + QStringList langs = Global::languageList(); + for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { + QString lang = *it; - /* - Config config("qpe"); - config.setGroup( "Appearance" ); - lang = config.readEntry( "Language", lang ); - */ + QTranslator * trans; + QString tfn; - QTranslator * trans = new QTranslator(this); - QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; + trans = new QTranslator(this); + tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; if ( trans->load( tfn )) @@ -558,3 +540,3 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) trans = new QTranslator(this); - tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; + tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; if ( trans->load( tfn )) @@ -564,3 +546,3 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) - //###language/font hack; should look it up somewhere + //###language/font hack; should look it up somewhere if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { @@ -178,3 +178,3 @@ do /bin/ls $RPMFILES >>$SPEC - rpm -bb $SPEC --target $ARCH-unknown-linux + rpm -bb --target $ARCH-unknown-linux $SPEC # rm $SPEC diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in index 67ea94c..6df2608 100644 --- a/noncore/games/minesweep/Makefile.in +++ b/noncore/games/minesweep/Makefile.in @@ -71,4 +71,6 @@ moc: $(SRCMOC) -tmake: - tmake minesweep.pro +tmake: Makefile.in + +Makefile.in: minesweep.pro + tmake minesweep.pro -o Makefile.in @@ -107,3 +109,3 @@ main.o: main.cpp \ minesweep.h \ - $(OPIEDIR)/include/qpe/qpeapplication.h + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpeapplication.h @@ -111,3 +113,3 @@ minefield.o: minefield.cpp \ minefield.h \ - $(OPIEDIR)/include/qpe/config.h + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h @@ -116,6 +118,6 @@ minesweep.o: minesweep.cpp \ minefield.h \ - $(OPIEDIR)/include/qpe/resource.h \ - $(OPIEDIR)/include/qpe/config.h \ - $(OPIEDIR)/include/qpe/qpetoolbar.h \ - $(OPIEDIR)/include/qpe/qpemenubar.h + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/resource.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpetoolbar.h \ + /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h |