+/* main.c */
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <time.h>
#include "dive.h"
-#include "display.h"
+#include "divelist.h"
-GtkWidget *main_window;
+struct units output_units;
+/* random helper functions, used here or elsewhere */
static int sortfn(const void *_a, const void *_b)
{
const struct dive *a = *(void **)_a;
return 0;
}
+const char *weekday(int wday)
+{
+ static const char wday_array[7][4] = {
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+ };
+ return wday_array[wday];
+}
+
+const char *monthname(int mon)
+{
+ static const char month_array[12][4] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+ };
+ return month_array[mon];
+}
+
+/*
+ * When adding dives to the dive table, we try to renumber
+ * the new dives based on any old dives in the dive table.
+ *
+ * But we only do it if:
+ *
+ * - the last dive in the old dive table was numbered
+ *
+ * - all the new dives are strictly at the end (so the
+ * "last dive" is at the same location in the dive table
+ * after re-sorting the dives.
+ *
+ * - none of the new dives have any numbers
+ *
+ * This catches the common case of importing new dives from
+ * a dive computer, and gives them proper numbers based on
+ * your old dive list. But it tries to be very conservative
+ * and not give numbers if there is *any* question about
+ * what the numbers should be - in which case you need to do
+ * a manual re-numbering.
+ */
+static void try_to_renumber(struct dive *last, int preexisting)
+{
+ int i, nr;
+
+ /*
+ * If the new dives aren't all strictly at the end,
+ * we're going to expect the user to do a manual
+ * renumbering.
+ */
+ if (get_dive(preexisting-1) != last)
+ return;
+
+ /*
+ * If any of the new dives already had a number,
+ * we'll have to do a manual renumbering.
+ */
+ for (i = preexisting; i < dive_table.nr; i++) {
+ struct dive *dive = get_dive(i);
+ if (dive->number)
+ return;
+ }
+
+ /*
+ * Ok, renumber..
+ */
+ nr = last->number;
+ for (i = preexisting; i < dive_table.nr; i++) {
+ struct dive *dive = get_dive(i);
+ dive->number = ++nr;
+ }
+}
+
+/*
+ * track whether we switched to importing dives
+ */
+static gboolean imported = FALSE;
+
/*
* This doesn't really report anything at all. We just sort the
* dives, the GUI does the reporting
*/
-static void report_dives(void)
+void report_dives(gboolean is_imported)
{
int i;
+ int preexisting = dive_table.preexisting;
+ struct dive *last;
+
+ /* This does the right thing for -1: NULL */
+ last = get_dive(preexisting-1);
qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
/* Redo the new 'i'th dive */
i--;
}
+
+ if (is_imported) {
+ /* Was the previous dive table state numbered? */
+ if (last && last->number)
+ try_to_renumber(last, preexisting);
+
+ /* did we have dives in the table and added more? */
+ if (last && preexisting != dive_table.nr)
+ mark_divelist_changed(TRUE);
+ }
+ dive_table.preexisting = dive_table.nr;
+ dive_list_update_dives();
}
static void parse_argument(const char *arg)
case 'v':
verbose++;
continue;
+ case '-':
+ /* long options with -- */
+ if (strcmp(arg,"--import") == 0) {
+ /* mark the dives so far as the base,
+ * everything after is imported */
+ report_dives(FALSE);
+ imported = TRUE;
+ return;
+ }
+ /* fallthrough */
+ case 'p':
+ /* ignore process serial number argument when run as native macosx app */
+ if (strncmp(arg, "-psn_", 5) == 0) {
+ return;
+ }
+ /* fallthrough */
default:
fprintf(stderr, "Bad argument '%s'\n", arg);
exit(1);
} while (*++p);
}
-static void on_destroy(GtkWidget* w, gpointer data)
-{
- gtk_main_quit();
-}
-
-static GtkWidget *dive_profile;
-
-void repaint_dive(void)
+void update_dive(struct dive *new_dive)
{
- update_dive_info(current_dive);
- gtk_widget_queue_draw(dive_profile);
-}
+ static struct dive *buffered_dive;
+ struct dive *old_dive = buffered_dive;
-static char *existing_filename;
-
-static void file_open(GtkWidget *w, gpointer data)
-{
- GtkWidget *dialog;
- dialog = gtk_file_chooser_dialog_new("Open File",
- GTK_WINDOW(main_window),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
- char *filename;
- filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
- printf("Open: '%s'\n", filename);
- g_free(filename);
+ if (old_dive) {
+ flush_divelist(old_dive);
}
- gtk_widget_destroy(dialog);
-}
-
-static void file_save(GtkWidget *w, gpointer data)
-{
- GtkWidget *dialog;
- dialog = gtk_file_chooser_dialog_new("Save File",
- GTK_WINDOW(main_window),
- GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- NULL);
- gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE);
- if (!existing_filename) {
- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), "Untitled document");
- } else
- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), existing_filename);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
- char *filename;
- filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
- save_dives(filename);
- g_free(filename);
+ if (new_dive) {
+ show_dive_info(new_dive);
+ show_dive_equipment(new_dive, W_IDX_PRIMARY);
+ show_dive_stats(new_dive);
}
- gtk_widget_destroy(dialog);
+ buffered_dive = new_dive;
}
-static void quit(GtkWidget *w, gpointer data)
+void renumber_dives(int nr)
{
- gtk_main_quit();
-}
-
-static GtkActionEntry menu_items[] = {
- { "FileMenuAction", GTK_STOCK_FILE, "File", 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) },
- { "Quit", GTK_STOCK_QUIT, NULL, "<control>Q", NULL, G_CALLBACK(quit) },
-};
-static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-
-static const gchar* ui_string = " \
- <ui> \
- <menubar name=\"MainMenu\"> \
- <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
- <menuitem name=\"Open\" action=\"OpenFile\" /> \
- <menuitem name=\"Save\" action=\"SaveFile\" /> \
- <menuitem name=\"Quit\" action=\"Quit\" /> \
- </menu> \
- </menubar> \
- </ui> \
-";
-
-static GtkWidget *get_menubar_menu(GtkWidget *window)
-{
- GtkActionGroup *action_group = gtk_action_group_new("Menu");
- gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0);
-
- GtkUIManager *ui_manager = gtk_ui_manager_new();
- gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
- GError* error = 0;
- gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error);
-
- gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager));
- GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
+ int i;
- return menu;
+ for (i = 0; i < dive_table.nr; i++) {
+ struct dive *dive = dive_table.dives[i];
+ dive->number = nr + i;
+ flush_divelist(dive);
+ }
+ mark_divelist_changed(TRUE);
}
int main(int argc, char **argv)
{
int i;
- GtkWidget *win;
- GtkWidget *divelist;
- GtkWidget *paned;
- GtkWidget *info_box;
- GtkWidget *notebook;
- GtkWidget *frame;
- GtkWidget *menubar;
- GtkWidget *vbox;
+
+ output_units = SI_units;
parse_xml_init();
- gtk_init(&argc, &argv);
+ init_ui(&argc, &argv);
for (i = 1; i < argc; i++) {
const char *a = argv[i];
parse_argument(a);
continue;
}
- parse_xml_file(a);
+ GError *error = NULL;
+ parse_file(a, &error);
+
+ if (error != NULL)
+ {
+ report_error(error);
+ g_error_free(error);
+ error = NULL;
+ }
}
- report_dives();
-
- win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
- main_window = win;
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(win), vbox);
-
- menubar = get_menubar_menu(win);
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
-
- /* HPane for left the dive list, and right the dive info */
- paned = gtk_hpaned_new();
- gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0);
-
- /* Create the atual divelist */
- divelist = create_dive_list();
- gtk_paned_add1(GTK_PANED(paned), divelist);
-
- /* VBox for dive info, and tabs */
- info_box = gtk_vbox_new(FALSE, 5);
- gtk_paned_add2(GTK_PANED(paned), info_box);
-
- /* Frame for minimal dive info */
- frame = dive_info_frame();
- gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 5);
-
- /* Notebook for dive info vs profile vs .. */
- notebook = gtk_notebook_new();
- gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 5);
-
- /* Frame for dive profile */
- frame = dive_profile_frame();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile"));
- dive_profile = frame;
-
- /* Frame for extended dive info */
- frame = extended_dive_info_frame();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info"));
-
- gtk_widget_set_app_paintable(win, TRUE);
- gtk_widget_show_all(win);
+ report_dives(imported);
- gtk_main();
+ run_ui();
+ exit_ui();
return 0;
}
projects / ext / subsurface.git / blobdiff