diff options
| -rw-r--r-- | Configure.mk | 3 | ||||
| -rw-r--r-- | macos.c | 5 | ||||
| -rw-r--r-- | qt-ui/globe.cpp | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Configure.mk b/Configure.mk index e482de6d7..ff003fd75 100644 --- a/Configure.mk +++ b/Configure.mk @@ -124,8 +124,7 @@ ifneq (,$(filter $(UNAME),linux kfreebsd gnu)) LIBGCONF2 = $(shell $(PKGCONFIG) --libs gconf-2.0) GCONF2CFLAGS = $(shell $(PKGCONFIG) --cflags gconf-2.0) else ifeq ($(UNAME), darwin) - LIBGTK += $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation -framework CoreServices - GTKCFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration) + LDFLAGS += -framework CoreFoundation -framework CoreServices GTK_MAC_BUNDLER = ~/.local/bin/gtk-mac-bundler endif @@ -9,11 +9,8 @@ #include <CoreFoundation/CoreFoundation.h> #include <CoreServices/CoreServices.h> #include <mach-o/dyld.h> -#include "gtkosxapplication.h" #include <sys/syslimits.h> -static GtkosxApplication *osx_app; - /* macos defines CFSTR to create a CFString object from a constant, * but no similar macros if a C string variable is supposed to be * the argument. We add this here (hardcoding the default allocator @@ -98,6 +95,7 @@ void subsurface_close_conf(void) /* Nothing */ } +#if USE_GTK_UI int subsurface_fill_device_list(GtkListStore *store) { int i = 0; @@ -149,6 +147,7 @@ int subsurface_fill_device_list(GtkListStore *store) } return index; } +#endif const char *subsurface_icon_name() { diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 5d3418662..1343734c5 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -76,7 +76,7 @@ void GlobeGPS::reload() void GlobeGPS::centerOn(dive* dive) { // dive has changed, if we had the 'editingDive', hide it. - if(messageWidget->isVisible()){ + if(messageWidget->isVisible() && (!dive || dive_has_gps_location(dive))){ messageWidget->animatedHide(); } @@ -95,10 +95,12 @@ void GlobeGPS::centerOn(dive* dive) void GlobeGPS::prepareForGetDiveCoordinates(dive* dive) { - messageWidget->setMessageType(KMessageWidget::Warning); - messageWidget->setText(QObject::tr("This dive has no location! Please move the planet to the desired position, then double-click to set the new location for this dive.")); - messageWidget->animatedShow(); - + if (!messageWidget->isVisible()) { + messageWidget->setMessageType(KMessageWidget::Warning); + messageWidget->setText(QObject::tr("This dive has no location! Please move the planet to the desired position, then double-click to set the new location for this dive.")); + messageWidget->setWordWrap(true); + messageWidget->animatedShow(); + } editingDiveCoords = dive; } |