diff options
Diffstat (limited to 'lumina-desktop')
-rw-r--r-- | lumina-desktop/LSession.cpp | 4 | ||||
-rw-r--r-- | lumina-desktop/LSession.h | 2 | ||||
-rw-r--r-- | lumina-desktop/main.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index c8b98b22..4c8d33bb 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -123,7 +123,7 @@ void LSession::setupSession(){ if(DEBUG){ qDebug() << " - Init Finished:" << timer->elapsed(); delete timer;} } -bool LSession::LoadLocale(QString langCode){ +/*bool LSession::LoadLocale(QString langCode){ QTranslator translator; if ( ! QFile::exists(LOS::LuminaShare()+"i18n/lumina-desktop_" + langCode + ".qm" ) ) langCode.truncate(langCode.indexOf("_")); bool ok = translator.load( QString("lumina-desktop_") + langCode, LOS::LuminaShare()+"i18n/" ); @@ -139,7 +139,7 @@ bool LSession::LoadLocale(QString langCode){ } emit LocaleChanged(); return ok; -} +}*/ void LSession::launchStartupApps(){ //First start any system-defined startups, then do user defined diff --git a/lumina-desktop/LSession.h b/lumina-desktop/LSession.h index 68916a77..20466b16 100644 --- a/lumina-desktop/LSession.h +++ b/lumina-desktop/LSession.h @@ -55,7 +55,7 @@ public: //virtual bool x11EventFilter(XEvent *event); - bool LoadLocale(QString); + //bool LoadLocale(QString); //Public System Tray Functions QList<WId> currentTrayApps(WId visualTray); diff --git a/lumina-desktop/main.cpp b/lumina-desktop/main.cpp index 091a1355..26eff2a8 100644 --- a/lumina-desktop/main.cpp +++ b/lumina-desktop/main.cpp @@ -22,6 +22,7 @@ #include <LuminaXDG.h> //from libLuminaUtils #include <LuminaThemes.h> #include <LuminaOS.h> +#include <LuminaUtils.h> #define DEBUG 1 @@ -81,7 +82,8 @@ int main(int argc, char ** argv) if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); } a.setupSession(); if(DEBUG){ qDebug() << "Load Locale:" << timer->elapsed(); } - a.LoadLocale(QLocale().name()); + LUtils::LoadTranslation(&a, "lumina-desktop"); + //a.LoadLocale(QLocale().name()); //Start launching external applications QTimer::singleShot(2000, &a, SLOT(launchStartupApps()) ); //wait a couple seconds first if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;} |