0.9.3-1 release

[ubi] / main.cpp

diff --git a/main.cpp b/main.cpp
index c51513a..b30bc56 100644 (file)
--- 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)