From e49d6213ad129284a45d53c3fcdc03249e84efe2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 3 Sep 2015 14:20:19 -0300 Subject: Move qt-ui to desktop-widgets Since we have now destkop and mobile versions, 'qt-ui' was a very poor name choice for a folder that contains only destkop-enabled widgets. Also, move the graphicsview-common.h/cpp to subsurface-core because it doesn't depend on qgraphicsview, it merely implements all the colors that we use throughout Subsurface, and we will use colors on both desktop and mobile versions Same thing applies for metrics.h/cpp Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/globe.h | 84 ----------------------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 qt-ui/globe.h (limited to 'qt-ui/globe.h') diff --git a/qt-ui/globe.h b/qt-ui/globe.h deleted file mode 100644 index 8cc1265e4..000000000 --- a/qt-ui/globe.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef GLOBE_H -#define GLOBE_H - -#include - -#ifndef NO_MARBLE -#include -#include - -#include - -namespace Marble{ - class GeoDataDocument; -} - -class KMessageWidget; -using namespace Marble; -struct dive; - -class GlobeGPS : public MarbleWidget { - Q_OBJECT -public: - using MarbleWidget::centerOn; - static GlobeGPS *instance(); - void reload(); - bool eventFilter(QObject *, QEvent *); - -protected: - /* reimp */ void resizeEvent(QResizeEvent *event); - /* reimp */ void mousePressEvent(QMouseEvent *event); - /* reimp */ void contextMenuEvent(QContextMenuEvent *); - -private: - GeoDataDocument *loadedDives; - KMessageWidget *messageWidget; - QTimer *fixZoomTimer; - int currentZoomLevel; - bool needResetZoom; - bool editingDiveLocation; - bool doubleClick; - GlobeGPS(QWidget *parent = 0); - -signals: - void coordinatesChanged(); - -public -slots: - void repopulateLabels(); - void changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::Unit); - void mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit); - void fixZoom(bool now = false); - void zoomOutForNoGPS(); - void prepareForGetDiveCoordinates(); - void endGetDiveCoordinates(); - void centerOnDiveSite(struct dive_site *ds); - void centerOnIndex(const QModelIndex& idx); -}; - -#else // NO_MARBLE -/* Dummy widget for when we don't have MarbleWidget */ -#include - -class GlobeGPS : public QLabel { - Q_OBJECT -public: - GlobeGPS(QWidget *parent = 0); - static GlobeGPS *instance(); - void reload(); - void repopulateLabels(); - void centerOnDiveSite(uint32_t uuid); - void centerOnIndex(const QModelIndex& idx); - void centerOnCurrentDive(); - bool eventFilter(QObject *, QEvent *); -public -slots: - void prepareForGetDiveCoordinates(); - void endGetDiveCoordinates(); -}; - -#endif // NO_MARBLE - -extern "C" double getDistance(int lat1, int lon1, int lat2, int lon2); - -#endif // GLOBE_H -- cgit v1.2.3-70-g09d2