-rw-r--r-- | library/qpeapplication.cpp | 30 | ||||
-rw-r--r-- | library/qpeapplication.h | 3 |
2 files changed, 18 insertions, 15 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index e5da48c..f4db1ab 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -602,24 +602,12 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
602 | QStringList langs = Global::languageList(); | 602 | QStringList langs = Global::languageList(); |
603 | for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { | 603 | for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { |
604 | QString lang = *it; | 604 | QString lang = *it; |
605 | 605 | ||
606 | QTranslator * trans; | 606 | installTranslation( lang + "/libopie.qm"); |
607 | QString tfn; | 607 | installTranslation( lang + "/libqpe.qm" ); |
608 | installTranslation( lang + "/" + d->appName + ".qm" ); | ||
608 | 609 | ||
609 | trans = new QTranslator( this ); | ||
610 | tfn = qpeDir() + "/i18n/" + lang + "/libqpe.qm"; | ||
611 | if ( trans->load( tfn ) ) | ||
612 | installTranslator( trans ); | ||
613 | else | ||
614 | delete trans; | ||
615 | |||
616 | trans = new QTranslator( this ); | ||
617 | tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm"; | ||
618 | if ( trans->load( tfn ) ) | ||
619 | installTranslator( trans ); | ||
620 | else | ||
621 | delete trans; | ||
622 | 610 | ||
623 | //###language/font hack; should look it up somewhere | 611 | //###language/font hack; should look it up somewhere |
624 | #ifdef QWS | 612 | #ifdef QWS |
625 | 613 | ||
@@ -1726,8 +1714,20 @@ void QPEApplication::tryQuit() | |||
1726 | } | 1714 | } |
1727 | 1715 | ||
1728 | /*! | 1716 | /*! |
1729 | \internal | 1717 | \internal |
1718 | */ | ||
1719 | void QPEApplication::installTranslation( const QString& baseName ) { | ||
1720 | QTranslator* trans = new QTranslator(this); | ||
1721 | QString tfn = qpeDir() + "/i18n/"+baseName; | ||
1722 | if ( trans->load( tfn ) ) | ||
1723 | installTranslator( trans ); | ||
1724 | else | ||
1725 | delete trans; | ||
1726 | } | ||
1727 | |||
1728 | /*! | ||
1729 | \internal | ||
1730 | User initiated quit. Makes the window 'Go Away'. If preloaded this means | 1730 | User initiated quit. Makes the window 'Go Away'. If preloaded this means |
1731 | hiding the window. If not it means quitting the application. | 1731 | hiding the window. If not it means quitting the application. |
1732 | As this is user initiated we don't need to check state. | 1732 | As this is user initiated we don't need to check state. |
1733 | */ | 1733 | */ |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 0bad8b7..e35c008 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -121,8 +121,11 @@ protected: | |||
121 | 121 | ||
122 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 122 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
123 | 123 | ||
124 | private: | 124 | private: |
125 | #ifndef QT_NO_TRANSLATION | ||
126 | void installTranslation( const QString& baseName ); | ||
127 | #endif | ||
125 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 128 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
126 | 129 | ||
127 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 130 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
128 | QCopChannel *sysChannel; | 131 | QCopChannel *sysChannel; |