#include <mach-o/dyld.h>
#include "gtkosxapplication.h"
-static GtkOSXApplication *theApp;
+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
kCFAllocatorNull)
#define SUBSURFACE_PREFERENCES CFSTR("org.hohndel.subsurface")
-#define REL_ICON_PATH "Resources/Subsurface.icns"
+#define ICON_NAME "Subsurface.icns"
#define UI_FONT "Arial Unicode MS 12"
#define DIVELIST_MAC_DEFAULT_FONT "Arial Unicode MS 9"
return NULL;
}
-void subsurface_close_conf(void)
+void subsurface_flush_conf(void)
{
int ok = CFPreferencesAppSynchronize(SUBSURFACE_PREFERENCES);
if (!ok)
fprintf(stderr,"Could not save preferences\n");
}
+void subsurface_close_conf(void)
+{
+ /* Nothing */
+}
+
const char *subsurface_USB_name()
{
return "/dev/tty.SLAB_USBtoUART";
const char *subsurface_icon_name()
{
static char path[1024];
- char *ptr1, *ptr2;
- uint32_t size = sizeof(path); /* need extra space to copy icon path */
- if (_NSGetExecutablePath(path, &size) == 0) {
- ptr1 = strcasestr(path,"MacOS/subsurface");
- ptr2 = strcasestr(path,"Contents");
- if (ptr1 && ptr2) {
- /* we are running as installed app from a bundle */
- if (ptr1 - path < size - strlen(REL_ICON_PATH)) {
- strcpy(ptr1,REL_ICON_PATH);
- return path;
- }
- }
- }
- return "packaging/macosx/Subsurface.icns";
+
+ snprintf(path, 1024, "%s/%s", quartz_application_get_resource_path(), ICON_NAME);
+
+ return path;
}
void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
- GtkWidget *vbox)
+ GtkWidget *vbox, GtkUIManager *ui_manager)
{
+ GtkWidget *menu_item, *sep;
+
if (!divelist_font)
divelist_font = DIVELIST_MAC_DEFAULT_FONT;
g_object_set(G_OBJECT(settings), "gtk-font-name", UI_FONT, NULL);
- theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+ osx_app = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
gtk_widget_hide (menubar);
- gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
- gtk_osxapplication_set_use_quartz_accelerators(theApp, TRUE);
- gtk_osxapplication_ready(theApp);
+ gtk_osxapplication_set_menu_bar(osx_app, GTK_MENU_SHELL(menubar));
+
+ sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator2");
+ if (sep)
+ 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);
}