diff options
author | Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-09-03 14:49:59 -0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-10-30 10:36:49 -0700 |
commit | 45c97640739198cf9a9cc5c42e81fb9811702b46 (patch) | |
tree | 4390fe4387d073ac7802bb6bff3bc0bbe69a836d /subsurface-desktop-helper.cpp | |
parent | e49d6213ad129284a45d53c3fcdc03249e84efe2 (diff) | |
download | subsurface-45c97640739198cf9a9cc5c42e81fb9811702b46.tar.gz |
main.cpp -> {android-main, desktop-main}
This is needed to compile both in a single call to make. Also it will
help removing some of the mistakes in the current android version:
it always created the mainwindow, even without using it for anything,
so tons of memory will be freed now for the android version, making it
snappier and smoother.
This is a necessary move so we don't need to #ifdef all over the place
for the two different versions, and imo the changes needed to keep both
versions will not be that huge if we keep things in subsurface-core
sane.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-desktop-helper.cpp')
-rw-r--r-- | subsurface-desktop-helper.cpp | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/subsurface-desktop-helper.cpp b/subsurface-desktop-helper.cpp new file mode 100644 index 000000000..af366fb84 --- /dev/null +++ b/subsurface-desktop-helper.cpp @@ -0,0 +1,62 @@ +/* qt-gui.cpp */ +/* Qt UI implementation */ +#include "dive.h" +#include "display.h" +#include "desktop-widgets/mainwindow.h" +#include "helpers.h" + +#include <QApplication> +#include <QDesktopWidget> +#include <QNetworkProxy> +#include <QLibraryInfo> + + +#include "qt-gui.h" + +#ifdef SUBSURFACE_MOBILE +#include <QQuickWindow> +#include <QQmlApplicationEngine> +#include <QQmlContext> +#include <QSortFilterProxyModel> +#include "qt-mobile/qmlmanager.h" +#include "qt-models/divelistmodel.h" +#include "qt-mobile/qmlprofile.h" +QObject *qqWindowObject = NULL; +#endif + +static MainWindow *window = NULL; + +void init_ui() +{ + init_qt_late(); + + window = new MainWindow(); + if (existing_filename && existing_filename[0] != '\0') + window->setTitle(MWTF_FILENAME); + else + window->setTitle(MWTF_DEFAULT); +} + +void run_ui() +{ + window->show(); + qApp->exec(); +} + +void exit_ui() +{ + delete window; + 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(); +} + + |