summaryrefslogtreecommitdiffstats
path: root/gtk-gui.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2012-01-01 13:41:47 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-01-01 14:01:38 -0800
commit605e063203f8a2a35a5c3be1e7129e80099dd68a (patch)
tree6685618f4c773ad901d33708ed4468f6210447bd /gtk-gui.c
parent565736a471e9ba66cbc68ce76c90d5e0c2fa57cf (diff)
downloadsubsurface-605e063203f8a2a35a5c3be1e7129e80099dd68a.tar.gz
Turn subsurface into a real Mac application
To do this a few things needed to move into the os specific files, but the overall change is fairly small and the difference on the Mac is amazing. Subsurface now becomes a Mac app with Mac toolbar and useful default fonts. Changed the CFBundleIdentifier to be the reverse DNS of the subsurface site (sadly, 'torvalds' is not yet a TLD). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'gtk-gui.c')
-rw-r--r--gtk-gui.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk-gui.c b/gtk-gui.c
index acaa9c4f6..f17120319 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -22,7 +22,6 @@ GtkWidget *error_label;
GtkWidget *vpane, *hpane;
int error_count;
-#define DIVELIST_DEFAULT_FONT "Sans 8"
const char *divelist_font;
struct units output_units;
@@ -681,9 +680,6 @@ void init_ui(int *argcp, char ***argvp)
divelist_font = subsurface_get_conf("divelist_font", PREF_STRING);
- if (!divelist_font)
- divelist_font = DIVELIST_DEFAULT_FONT;
-
error_info_bar = NULL;
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
g_set_application_name ("subsurface");
@@ -709,7 +705,8 @@ void init_ui(int *argcp, char ***argvp)
main_vbox = vbox;
menubar = get_menubar_menu(win);
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
+
+ subsurface_ui_setup(settings, menubar, vbox);
vpane = gtk_vpaned_new();
gtk_box_pack_start(GTK_BOX(vbox), vpane, TRUE, TRUE, 3);