From b76d3fa25f616bd01c290a7340274fd14d6ad4d7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 6 Nov 2015 13:44:13 -0800 Subject: Better file names for Subsurface-mobile related sources They aren't Android specific - they are for the QML UI mobile app which should run on iOS as well. Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 4 +-- subsurface-android-helper.cpp | 77 ----------------------------------------- subsurface-android-main.cpp | 79 ------------------------------------------- subsurface-mobile-helper.cpp | 77 +++++++++++++++++++++++++++++++++++++++++ subsurface-mobile-main.cpp | 79 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 158 insertions(+), 158 deletions(-) delete mode 100644 subsurface-android-helper.cpp delete mode 100644 subsurface-android-main.cpp create mode 100644 subsurface-mobile-helper.cpp create mode 100644 subsurface-mobile-main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 2840a2c33..98456b13f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -349,8 +349,8 @@ if(SUBSURFACE_MOBILE) qt-mobile/qmlmanager.cpp qt-mobile/qmlprofile.cpp qt-models/divelistmodel.cpp - subsurface-android-main.cpp - subsurface-android-helper.cpp + subsurface-mobile-main.cpp + subsurface-mobile-helper.cpp ) add_definitions(-DSUBSURFACE_MOBILE) qt5_add_resources(MOBILE_RESOURCES qt-mobile/mobile-resources.qrc) diff --git a/subsurface-android-helper.cpp b/subsurface-android-helper.cpp deleted file mode 100644 index e982760f8..000000000 --- a/subsurface-android-helper.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* qt-gui.cpp */ -/* Qt UI implementation */ -#include "dive.h" -#include "display.h" -#include "helpers.h" - -#include -#include -#include -#include - -#include "qt-gui.h" - -#include -#include -#include -#include -#include "qt-mobile/qmlmanager.h" -#include "qt-models/divelistmodel.h" -#include "qt-mobile/qmlprofile.h" - -QObject *qqWindowObject = NULL; - -void init_ui() -{ - init_qt_late(); -} - -void run_ui() -{ - qmlRegisterType("org.subsurfacedivelog.mobile", 1, 0, "QMLManager"); - qmlRegisterType("org.subsurfacedivelog.mobile", 1, 0, "QMLProfile"); - QQmlApplicationEngine engine; - DiveListModel diveListModel; - QSortFilterProxyModel *sortModel = new QSortFilterProxyModel(0); - sortModel->setSourceModel(&diveListModel); - sortModel->setDynamicSortFilter(true); - sortModel->setSortRole(DiveListModel::DiveDateRole); - sortModel->sort(0, Qt::DescendingOrder); - QQmlContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("diveModel", sortModel); - engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml"))); - qqWindowObject = engine.rootObjects().value(0); - if (!qqWindowObject) { - fprintf(stderr, "can't create window object\n"); - exit(1); - } - QQuickWindow *qml_window = qobject_cast(qqWindowObject); - qml_window->setIcon(QIcon(":/subsurface-mobile-icon")); - qqWindowObject->setProperty("messageText", QVariant("Subsurface mobile startup")); -#if !defined(Q_OS_ANDROID) - qml_window->setHeight(1200); - qml_window->setWidth(800); -#endif - qml_window->show(); - qApp->exec(); -} - -void exit_ui() -{ - delete qApp; - free((void *)existing_filename); - free((void *)default_dive_computer_vendor); - free((void *)default_dive_computer_product); - free((void *)default_dive_computer_device); -} - -double get_screen_dpi() -{ - QDesktopWidget *mydesk = qApp->desktop(); - return mydesk->physicalDpiX(); -} - -bool haveFilesOnCommandLine() -{ - return false; -} diff --git a/subsurface-android-main.cpp b/subsurface-android-main.cpp deleted file mode 100644 index 77c574bb1..000000000 --- a/subsurface-android-main.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* main.c */ -#include -#include -#include -#include -#include - -#include "dive.h" -#include "qt-gui.h" -#include "subsurfacestartup.h" -#include "subsurface-core/color.h" -#include "qthelper.h" - -#include -#include -#include -#include - -QTranslator *qtTranslator, *ssrfTranslator; - -int main(int argc, char **argv) -{ - int i; - bool no_filenames = true; - QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); - QApplication *application = new QApplication(argc, argv); - QStringList files; - QStringList importedFiles; - QStringList arguments = QCoreApplication::arguments(); - - bool dedicated_console = arguments.length() > 1 && - (arguments.at(1) == QString("--win32console")); - subsurface_console_init(dedicated_console); - - for (i = 1; i < arguments.length(); i++) { - QString a = arguments.at(i); - if (a.at(0) == '-') { - parse_argument(a.toLocal8Bit().data()); - continue; - } - if (imported) { - importedFiles.push_back(a); - } else { - no_filenames = false; - files.push_back(a); - } - } -#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR < 22 - git_threads_init(); -#else - git_libgit2_init(); -#endif - setup_system_prefs(); - prefs = default_prefs; - fill_profile_color(); - parse_xml_init(); - taglist_init_global(); - init_ui(); - if (no_filenames) { - if (prefs.default_file_behavior == LOCAL_DEFAULT_FILE) { - QString defaultFile(prefs.default_filename); - if (!defaultFile.isEmpty()) - files.push_back(QString(prefs.default_filename)); - } else if (prefs.default_file_behavior == CLOUD_DEFAULT_FILE) { - QString cloudURL; - if (getCloudURL(cloudURL) == 0) - files.push_back(cloudURL); - } - } - - if (!quit) - run_ui(); - exit_ui(); - taglist_free(g_tag_list); - parse_xml_exit(); - subsurface_console_exit(); - free_prefs(); - return 0; -} diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp new file mode 100644 index 000000000..e982760f8 --- /dev/null +++ b/subsurface-mobile-helper.cpp @@ -0,0 +1,77 @@ +/* qt-gui.cpp */ +/* Qt UI implementation */ +#include "dive.h" +#include "display.h" +#include "helpers.h" + +#include +#include +#include +#include + +#include "qt-gui.h" + +#include +#include +#include +#include +#include "qt-mobile/qmlmanager.h" +#include "qt-models/divelistmodel.h" +#include "qt-mobile/qmlprofile.h" + +QObject *qqWindowObject = NULL; + +void init_ui() +{ + init_qt_late(); +} + +void run_ui() +{ + qmlRegisterType("org.subsurfacedivelog.mobile", 1, 0, "QMLManager"); + qmlRegisterType("org.subsurfacedivelog.mobile", 1, 0, "QMLProfile"); + QQmlApplicationEngine engine; + DiveListModel diveListModel; + QSortFilterProxyModel *sortModel = new QSortFilterProxyModel(0); + sortModel->setSourceModel(&diveListModel); + sortModel->setDynamicSortFilter(true); + sortModel->setSortRole(DiveListModel::DiveDateRole); + sortModel->sort(0, Qt::DescendingOrder); + QQmlContext *ctxt = engine.rootContext(); + ctxt->setContextProperty("diveModel", sortModel); + engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml"))); + qqWindowObject = engine.rootObjects().value(0); + if (!qqWindowObject) { + fprintf(stderr, "can't create window object\n"); + exit(1); + } + QQuickWindow *qml_window = qobject_cast(qqWindowObject); + qml_window->setIcon(QIcon(":/subsurface-mobile-icon")); + qqWindowObject->setProperty("messageText", QVariant("Subsurface mobile startup")); +#if !defined(Q_OS_ANDROID) + qml_window->setHeight(1200); + qml_window->setWidth(800); +#endif + qml_window->show(); + qApp->exec(); +} + +void exit_ui() +{ + delete qApp; + free((void *)existing_filename); + free((void *)default_dive_computer_vendor); + free((void *)default_dive_computer_product); + free((void *)default_dive_computer_device); +} + +double get_screen_dpi() +{ + QDesktopWidget *mydesk = qApp->desktop(); + return mydesk->physicalDpiX(); +} + +bool haveFilesOnCommandLine() +{ + return false; +} diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp new file mode 100644 index 000000000..77c574bb1 --- /dev/null +++ b/subsurface-mobile-main.cpp @@ -0,0 +1,79 @@ +/* main.c */ +#include +#include +#include +#include +#include + +#include "dive.h" +#include "qt-gui.h" +#include "subsurfacestartup.h" +#include "subsurface-core/color.h" +#include "qthelper.h" + +#include +#include +#include +#include + +QTranslator *qtTranslator, *ssrfTranslator; + +int main(int argc, char **argv) +{ + int i; + bool no_filenames = true; + QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QApplication *application = new QApplication(argc, argv); + QStringList files; + QStringList importedFiles; + QStringList arguments = QCoreApplication::arguments(); + + bool dedicated_console = arguments.length() > 1 && + (arguments.at(1) == QString("--win32console")); + subsurface_console_init(dedicated_console); + + for (i = 1; i < arguments.length(); i++) { + QString a = arguments.at(i); + if (a.at(0) == '-') { + parse_argument(a.toLocal8Bit().data()); + continue; + } + if (imported) { + importedFiles.push_back(a); + } else { + no_filenames = false; + files.push_back(a); + } + } +#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR < 22 + git_threads_init(); +#else + git_libgit2_init(); +#endif + setup_system_prefs(); + prefs = default_prefs; + fill_profile_color(); + parse_xml_init(); + taglist_init_global(); + init_ui(); + if (no_filenames) { + if (prefs.default_file_behavior == LOCAL_DEFAULT_FILE) { + QString defaultFile(prefs.default_filename); + if (!defaultFile.isEmpty()) + files.push_back(QString(prefs.default_filename)); + } else if (prefs.default_file_behavior == CLOUD_DEFAULT_FILE) { + QString cloudURL; + if (getCloudURL(cloudURL) == 0) + files.push_back(cloudURL); + } + } + + if (!quit) + run_ui(); + exit_ui(); + taglist_free(g_tag_list); + parse_xml_exit(); + subsurface_console_exit(); + free_prefs(); + return 0; +} -- cgit v1.2.3-70-g09d2