From 4098922b553c8a412b457a3b6fabbbd936317a65 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 17 May 2013 08:14:10 -0300 Subject: Adds preliminary support for Marble Widget Adds preliminary support for marble widget, alongside with the dive list. my idea is to let the view stay there at the left of the dive list since we got a lot of unused space and a globe is something nice to have - so you can look around where did you dived, the dives near the one that's currectly selected, and so on. I'm not using OpenStreetMaps right now, but a good thing about marble is that it is skinnable - so for instance, a dive school could present a dive lesson using subsurface with a globe from the 1600, to make it feel like 'history'. This version will only compile to Qt4. Signed-off-by: Tomaz Canabrava --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index add90b308..0bd3e5c27 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ HEADERS = \ qt-ui/starwidget.h \ qt-ui/modeldelegates.h \ qt-ui/profilegraphics.h \ + qt-ui/globe.h SOURCES = \ @@ -70,6 +71,7 @@ SOURCES = \ qt-ui/starwidget.cpp \ qt-ui/modeldelegates.cpp \ qt-ui/profilegraphics.cpp \ + qt-ui/globe.cpp \ $(RESFILE) @@ -112,7 +114,7 @@ else endif LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \ - $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) + $(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) -lmarblewidget MSGLANGS=$(notdir $(wildcard po/*.po)) -- cgit v1.2.3-70-g09d2