Merge branch 'move_buttons_to_content_area' into new_panels_with_context_buttons

[situare] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index db65c5a..3dec172 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,16 +19,20 @@
     USA.
  */
 
-#include <QtGui/QApplication>
-#include <QTranslator>
+#include "application.h"
 #include "engine/engine.h"
 
-
 int main(int argc, char *argv[])
 {
-    QTranslator translator;
-    QApplication a(argc, argv);
+    Application a(argc, argv);
+
     SituareEngine engine;
-    int appRet = a.exec();
-    return appRet;
+
+//    QTranslator translator;
+//    bool loaded = translator.load(":/res/languages/situare_" + QLocale::system().name());
+//    a.installTranslator(&translator);
+//    QString locale = QLocale::system().name();
+//    qDebug() << "Localization" << locale << "loaded:" << loaded;
+
+    return a.exec();
 }