diff options
| author |  Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2012-01-03 20:18:04 +0100 |
|---|---|---|
| committer | Henrik Brautaset Aronsen <subsurface@henrik.synth.no> | 2012-01-03 20:19:57 +0100 |
| commit | 854391419f7ed669eab43ed36c6a13a313eb3436 (patch) | |
| tree | 97ab529becc88e3c7193fa12b352141f00b97634 | |
| parent | 513df18f50afc13fcef9f2421b5a33b772eed380 (diff) | |
| download | subsurface-854391419f7ed669eab43ed36c6a13a313eb3436.tar.gz | |
More Mac improvements
The startup shell script workaround isn't needed anymore. The preferences
hotkey didn't work. Remove left-over menu separators.
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | display-gtk.h | 2 | ||||
| -rw-r--r-- | macos.c | 10 | ||||
| -rw-r--r-- | packaging/macosx/Info.plist | 2 | ||||
| -rwxr-xr-x | packaging/macosx/subsurface.sh | 5 |
5 files changed, 18 insertions, 14 deletions
@@ -36,13 +36,13 @@ UNAME := $(shell $(CC) -dumpmachine 2>&1 | grep -E -o "linux|darwin|win") # ifeq ($(CC), i686-w64-mingw32-gcc) # ok, we are cross building for Windows - LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer` - LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer` + LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) + LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) RESFILE = packaging/windows/subsurface.res LDFLAGS += -Wl,-subsystem,windows else ifeq ($(UNAME), darwin) - LIBDIVECOMPUTERINCLUDES = `$(PKGCONFIG) --cflags libdivecomputer` - LIBDIVECOMPUTERARCHIVE = `$(PKGCONFIG) --libs libdivecomputer` + LIBDIVECOMPUTERINCLUDES = $(shell $(PKGCONFIG) --cflags libdivecomputer) + LIBDIVECOMPUTERARCHIVE = $(shell $(PKGCONFIG) --libs libdivecomputer) else libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a) libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a) @@ -97,8 +97,8 @@ else ifeq ($(UNAME), darwin) OSSUPPORT_CFLAGS = $(GTK2CFLAGS) MACOSXINSTALL = /Applications/Subsurface.app MACOSXFILES = packaging/macosx - EXTRALIBS = `$(PKGCONFIG) --libs gtk-mac-integration` -framework CoreFoundation - CFLAGS += `$(PKGCONFIG) --cflags gtk-mac-integration` + EXTRALIBS = $(shell $(PKGCONFIG) --libs gtk-mac-integration) -framework CoreFoundation + CFLAGS += $(shell $(PKGCONFIG) --cflags gtk-mac-integration) else OSSUPPORT = windows OSSUPPORT_CFLAGS = $(GTK2CFLAGS) @@ -142,7 +142,6 @@ install-macosx: $(NAME) $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS $(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/ - $(INSTALL) $(MACOSXFILES)/subsurface.sh $(MACOSXINSTALL)/Contents/MacOS/ $(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/ $(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/ $(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/ diff --git a/display-gtk.h b/display-gtk.h index f624bf6cc..b55dc9616 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -29,7 +29,7 @@ typedef enum { #if defined __APPLE__ #define CTRLCHAR "<Meta>" -#define PREFERENCE_ACCEL "<Meta>," +#define PREFERENCE_ACCEL "<Meta>comma" #else #define CTRLCHAR "<Control>" #define PREFERENCE_ACCEL NULL @@ -92,18 +92,28 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar, osx_app = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL); gtk_widget_hide (menubar); gtk_osxapplication_set_menu_bar(osx_app, GTK_MENU_SHELL(menubar)); + + sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator3"); + gtk_widget_destroy(sep); + sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator2"); + gtk_widget_destroy(sep); + menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Quit"); gtk_widget_hide (menu_item); menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/Help/About"); gtk_osxapplication_insert_app_menu_item(osx_app, menu_item, 0); + sep = gtk_separator_menu_item_new(); g_object_ref(sep); gtk_osxapplication_insert_app_menu_item (osx_app, sep, 1); + menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Preferences"); gtk_osxapplication_insert_app_menu_item(osx_app, menu_item, 2); + sep = gtk_separator_menu_item_new(); g_object_ref(sep); gtk_osxapplication_insert_app_menu_item (osx_app, sep, 3); + gtk_osxapplication_set_use_quartz_accelerators(osx_app, TRUE); gtk_osxapplication_ready(osx_app); } diff --git a/packaging/macosx/Info.plist b/packaging/macosx/Info.plist index e69d5b02d..f3ac10cdd 100644 --- a/packaging/macosx/Info.plist +++ b/packaging/macosx/Info.plist @@ -13,7 +13,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> - <string>subsurface.sh</string> + <string>subsurface</string> <key>CFBundleIdentifier</key> <string>org.hohndel.subsurface</string> </dict> diff --git a/packaging/macosx/subsurface.sh b/packaging/macosx/subsurface.sh deleted file mode 100755 index ee9427c37..000000000 --- a/packaging/macosx/subsurface.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cd `dirname $0`/../Resources -../MacOS/subsurface & -exit 0 |