mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

main.cpp -> {android-main, desktop-main}

Browse source 
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>
This commit is contained in:
Tomaz Canabrava 2015-09-03 14:49:59 -03:00 • committed by Dirk Hohndel
parent e49d6213ad
commit 45c9764073
5 changed files with 175 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

62
subsurface-desktop-helper.cpp Normal file
View file

@ -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();
}