X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=main.cpp;h=b30bc560e9884f65217542e6bffacbce0938c915;hb=5a25a20f2cc3029bcb66f5897088cd391d3c450d;hp=c51513aa17238f91ce3d84bc755dea1ef938d230;hpb=dd71088cb495c09f4fa64ee1318f51315ee4e3fd;p=ubi diff --git a/main.cpp b/main.cpp index c51513a..b30bc56 100644 --- a/main.cpp +++ b/main.cpp @@ -17,22 +17,19 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) QString locale = settings.value("locale").toString(); - //qDebug() << "locale1=" << locale; if(locale!="pl_PL" && locale!="en_US") { locale = QLocale::system().name(); - //qDebug() << "locale2=" << locale; if(locale!="pl_PL") { locale="en_US"; } settings.setValue("locale",locale); } - //qDebug() << "locale3=" << locale; QTranslator translator; - QString dir = "translations"; - //QString dir = ":/translations"; + //QString dir = "translations"; + QString dir = ":/translations"; #if defined(Q_WS_MAEMO_5) - dir = "/opt/ubi/"+dir; + //dir = "/opt/ubi/"+dir; #endif if (translator.load(QString("ubi.")+locale,dir)) { app->installTranslator(&translator); @@ -48,8 +45,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) #if defined(Q_WS_MAEMO_5) //viewer.engine()->addImportPath(QString("/opt/qtm12/imports")); #endif - viewer.setMainQmlFile(QLatin1String("qml/ubi/main.qml")); - //viewer.setSource(QUrl("qrc:///qml/ubi/main.qml")); + //viewer.setMainQmlFile(QLatin1String("qml/ubi/main.qml")); + viewer.setSource(QUrl("qrc:///qml/ubi/main.qml")); viewer.setWindowTitle(QString("Ubi")); #if defined(Q_WS_MAEMO_5)