summaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-12 09:19:21 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-12 09:27:01 -0700
commit9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f (patch)
treec883b03633596fec1a904c7266c492ea833e6807 /main.c
parent04dc4cdf9d0feab5cd3e8c3aa0ea08addfb3323d (diff)
downloadsubsurface-9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f.tar.gz
Start some very initial libdivecomputer integration
Ok, so this is quite broken right now: it doesn't actually really *do* anything, and it now requires that you have libdivecomputer all set up and installed. That is fairly easy: mkdir ../src cd ../src git clone git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer cd libdivecomputer autoreconf --install ./configure make sudo make install but you may feel that this is not exactly useful considering that nothing actually *works* yet. Some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/main.c b/main.c
index 367d3ada4..ab2948e46 100644
--- a/main.c
+++ b/main.c
@@ -367,6 +367,7 @@ static GtkActionEntry menu_items[] = {
{ "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
{ "OpenFile", GTK_STOCK_OPEN, NULL, "<control>O", NULL, G_CALLBACK(file_open) },
{ "SaveFile", GTK_STOCK_SAVE, NULL, "<control>S", NULL, G_CALLBACK(file_save) },
+ { "Import", NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) },
{ "Units", NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) },
{ "Renumber", NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) },
{ "Quit", GTK_STOCK_QUIT, NULL, "<control>Q", NULL, G_CALLBACK(quit) },
@@ -380,9 +381,11 @@ static const gchar* ui_string = " \
<menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Save\" action=\"SaveFile\" /> \
<separator name=\"Separator1\"/> \
+ <menuitem name=\"Import\" action=\"Import\" /> \
+ <separator name=\"Separator2\"/> \
<menuitem name=\"Units\" action=\"Units\" /> \
<menuitem name=\"Renumber\" action=\"Renumber\" /> \
- <separator name=\"Separator2\"/> \
+ <separator name=\"Separator3\"/> \
<menuitem name=\"Quit\" action=\"Quit\" /> \
</menu> \
</menubar> \