X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=src%2Fmain.cpp;h=407095bc521e2da2c1ee541e6678578376d58754;hp=62d6ba6b37c578877c5987ff69f727b9c1773a23;hb=695e8f4f85218b41a7f27af281fcebe8238a33b7;hpb=8ea85c98fc42ead8d25295dd67b2b0aab03dba2a;ds=sidebyside

diff --git a/src/main.cpp b/src/main.cpp
index 62d6ba6..407095b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,35 +1,166 @@
+/*!
+ * This file is part of CameraPlus.
+ *
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#if defined(QT4)
 #include <QApplication>
 #include <QDeclarativeView>
 #include <QDeclarativeContext>
 #include <QDeclarativeEngine>
 #include <QtDeclarative>
 #include <QGLWidget>
-
-#include "imports/plugin.h"
+#elif defined(QT5)
+#include <QGuiApplication>
+#include <QQuickView>
+#include <QQmlError>
+#endif
 
 #include "settings.h"
 #include "filenaming.h"
+#ifdef HARMATTAN
 #include "quillitem.h"
+#endif
+#include "geocode.h"
+#include "deviceinfo.h"
+#include "soundvolumecontrol.h"
+#include "displaystate.h"
+#include "fsmonitor.h"
+#include "cameraresources.h"
+#include "compass.h"
+#include "orientation.h"
+#include "mountprotector.h"
+#include "trackerstore.h"
+#include "focusrectangle.h"
+#include "sharehelper.h"
+#include "deletehelper.h"
+#include "galleryhelper.h"
+#include "postcapturemodel.h"
+#include "batteryinfo.h"
+#include "gridlines.h"
+#include "devicekeys.h"
+#include "platformsettings.h"
+#include "dbusservice.h"
+#include <MDeclarativeCache>
+
+#ifdef QMLJSDEBUGGER
+#include "qt_private/qdeclarativedebughelper_p.h"
+#endif /* QMLJSDEBUGGER */
+
+#if defined(QT4)
+#include <QAbstractFileEngineHandler>
+#include "qmlfileengine.h"
+
+class QmlFileEngineHandler : public QAbstractFileEngineHandler {
+  QAbstractFileEngine *create(const QString& fileName) const {
+    QString fn = fileName.toLower();
+    if (fn.startsWith(':') && fn.endsWith(".qml")) {
+      return new QmlFileEngine(fileName);
+    }
+
+    return 0;
+  }
+};
+#endif
 
 Q_DECL_EXPORT int main(int argc, char *argv[]) {
+#if defined(QT4)
   QApplication::setAttribute(Qt::AA_X11InitThreads, true);
-  QApplication app(argc, argv);
+  QApplication *app = new QApplication(argc, argv);
+  app->setApplicationName("cameraplus");
+
+  QmlFileEngineHandler handler;
+  Q_UNUSED(handler);
+
+  QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
+#elif defined(QT5)
+  QGuiApplication *app = MDeclarativeCache::qApplication(argc, argv);
+  app->setApplicationName("cameraplus");
+
+  QQuickView *view = MDeclarativeCache::qQuickView();
+#endif
 
-  QDeclarativeView view;
-  view.setViewport(new QGLWidget);
-  view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
-  view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+#ifdef QMLJSDEBUGGER
+  QDeclarativeDebugHelper::enableDebugging();
+#endif /* QMLJSDEBUGGER */
+
+#if defined(QT4)
+  view->setAttribute(Qt::WA_NoSystemBackground);
+  view->setViewport(new QGLWidget);
+  view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+  view->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+  view->viewport()->setAttribute(Qt::WA_NoSystemBackground);
+#endif
+
+#if defined(QT5)
+  view->setResizeMode(QQuickView::SizeRootObjectToView);
+  // TODO:
+#endif
 
-  Plugin::registerTypes(view.engine());
   qmlRegisterType<Settings>("CameraPlus", 1, 0, "Settings");
   qmlRegisterType<FileNaming>("CameraPlus", 1, 0, "FileNaming");
+#ifdef HARMATTAN
   qmlRegisterType<QuillItem>("CameraPlus", 1, 0, "QuillItem");
+#endif
+  qmlRegisterType<Geocode>("CameraPlus", 1, 0, "ReverseGeocode");
+  qmlRegisterType<DeviceInfo>("CameraPlus", 1, 0, "DeviceInfo");
+  qmlRegisterType<SoundVolumeControl>("CameraPlus", 1, 0, "SoundVolumeControl");
+  qmlRegisterType<DisplayState>("CameraPlus", 1, 0, "DisplayState");
+  qmlRegisterType<FSMonitor>("CameraPlus", 1, 0, "FSMonitor");
+  qmlRegisterType<CameraResources>("CameraPlus", 1, 0, "CameraResources");
+  qmlRegisterType<Compass>("CameraPlus", 1, 0, "CameraCompass");
+  qmlRegisterType<Orientation>("CameraPlus", 1, 0, "CameraOrientation");
+  qmlRegisterType<MountProtector>("CameraPlus", 1, 0, "MountProtector");
+  qmlRegisterType<TrackerStore>("CameraPlus", 1, 0, "TrackerStore");
+  qmlRegisterType<FocusRectangle>("CameraPlus", 1, 0, "FocusRectangle");
+  qmlRegisterType<ShareHelper>("CameraPlus", 1, 0, "ShareHelper");
+  qmlRegisterType<DeleteHelper>("CameraPlus", 1, 0, "DeleteHelper");
+  qmlRegisterType<GalleryHelper>("CameraPlus", 1, 0, "GalleryHelper");
+  qmlRegisterType<PostCaptureModel>("CameraPlus", 1, 0, "PostCaptureModel");
+  qmlRegisterType<BatteryInfo>("CameraPlus", 1, 0, "BatteryInfo");
+  qmlRegisterType<GridLines>("CameraPlus", 1, 0, "GridLines");
+  qmlRegisterType<DeviceKeys>("CameraPlus", 1, 0, "DeviceKeys");
+  qmlRegisterType<PlatformSettings>("CameraPlus", 1, 0, "PlatformSettings");
+
+  view->setSource(QUrl("qrc:/qml/main.qml"));
+
+#if defined(QT5)
+  if (view->status() == QQuickView::Error) {
+    qCritical() << "Errors loading QML:";
+    QList<QQmlError> errors = view->errors();
+
+    foreach (const QQmlError& error, errors) {
+      qCritical() << error.toString();
+    }
 
-  QUrl sourceUrl = QUrl::fromLocalFile(QDir::currentPath() + "/main.qml");
-  view.setSource(sourceUrl);
+    delete view;
+    delete app;
 
-  view.showFullScreen();
+    return 1;
+  }
+#endif
+
+  view->showFullScreen();
+
+  int ret = app->exec();
+
+  delete view;
+  delete app;
 
-  int ret = app.exec();
   return ret;
-};
+}