Add preference option to chose if SAC and/or OTU should be in divelist

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 1b97930e50c7c61c02ea077bebb5dacd2efda9a4..92eb9ee0992cccc37df60b0ee36b7095762ecacd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,39 +1,20 @@
+/* main.c */
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <cairo.h>
 
-#include "dive.h"
-
-static void show_dive(int nr, struct dive *dive)
-{
-       int i;
-       struct tm *tm;
-
-       tm = gmtime(&dive->when);
-
-       printf("At %02d:%02d:%02d %04d-%02d-%02d  (%d ft max, %d minutes)\n",
-               tm->tm_hour, tm->tm_min, tm->tm_sec,
-               tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-               to_feet(dive->maxdepth), dive->duration.seconds / 60);
+#include <gconf/gconf-client.h>
 
-       if (!verbose)
-               return;
+#include "dive.h"
+#include "divelist.h"
 
-       for (i = 0; i < dive->samples; i++) {
-               struct sample *s = dive->sample + i;
+GConfClient *gconf;
+struct units output_units;
 
-               printf("%4d:%02d: %3d ft, %2d C, %4d PSI\n",
-                       s->time.seconds / 60,
-                       s->time.seconds % 60,
-                       to_feet(s->depth),
-                       to_C(s->temperature),
-                       to_PSI(s->tankpressure));
-       }
-}
+#define GCONF_NAME(x) "/apps/subsurface/" #x
 
+/* random helper functions, used here or elsewhere */
 static int sortfn(const void *_a, const void *_b)
 {
        const struct dive *a = *(void **)_a;
@@ -46,13 +27,55 @@ static int sortfn(const void *_a, const void *_b)
        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];
+}
+
 /*
  * 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(void)
 {
+       int i;
+
        qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
+
+       for (i = 1; i < dive_table.nr; i++) {
+               struct dive **pp = &dive_table.dives[i-1];
+               struct dive *prev = pp[0];
+               struct dive *dive = pp[1];
+               struct dive *merged;
+
+               if (prev->when + prev->duration.seconds < dive->when)
+                       continue;
+
+               merged = try_to_merge(prev, dive);
+               if (!merged)
+                       continue;
+
+               free(prev);
+               free(dive);
+               *pp = merged;
+               dive_table.nr--;
+               memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
+
+               /* Redo the new 'i'th dive */
+               i--;
+       }
 }
 
 static void parse_argument(const char *arg)
@@ -71,67 +94,43 @@ static void parse_argument(const char *arg)
        } while (*++p);
 }
 
-static void on_destroy(GtkWidget* w, gpointer data)
+void update_dive(struct dive *new_dive)
 {
-       gtk_main_quit();
-}
+       static struct dive *buffered_dive;
+       struct dive *old_dive = buffered_dive;
 
-static gboolean on_expose(GtkWidget* w, GdkEventExpose* e, gpointer data)
-{
-       cairo_t* cr;
-       cr = gdk_cairo_create(w->window);
-       cairo_destroy(cr);
-       return FALSE;
+       if (old_dive) {
+               flush_dive_info_changes(old_dive);
+               flush_dive_equipment_changes(old_dive);
+               flush_divelist(old_dive);
+       }
+       if (new_dive) {
+               show_dive_info(new_dive);
+               show_dive_equipment(new_dive);
+       }
+       buffered_dive = new_dive;
 }
 
-static GtkTreeModel *fill_dive_list(void)
+void renumber_dives(int nr)
 {
        int i;
-       GtkListStore *store;
-       GtkTreeIter iter;
-
-       store = gtk_list_store_new(1, G_TYPE_STRING);
 
        for (i = 0; i < dive_table.nr; i++) {
                struct dive *dive = dive_table.dives[i];
-
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                       0, dive->name,
-                       -1);
+               dive->number = nr + i;
        }
-
-       return GTK_TREE_MODEL(store);
-}
-
-static GtkWidget *create_dive_list(void)
-{
-       GtkWidget *list;
-       GtkCellRenderer *renderer;
-       GtkTreeModel *model;
-
-       list = gtk_tree_view_new();
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(list),
-               -1, "Dive", renderer, "text", 0, NULL);
-
-       model = fill_dive_list();
-       gtk_tree_view_set_model(GTK_TREE_VIEW(list), model);
-       g_object_unref(model);
-       return list;
 }
 
 int main(int argc, char **argv)
 {
        int i;
-       GtkWidget *win;
-       GtkWidget *divelist;
 
-       parse_xml_init();
+       output_units = SI_units;
 
-       gtk_init(&argc, &argv);
+       parse_xml_init();
 
+       init_ui(argc, argv);
+       
        for (i = 1; i < argc; i++) {
                const char *a = argv[i];
 
@@ -139,21 +138,20 @@ int main(int argc, char **argv)
                        parse_argument(a);
                        continue;
                }
-               parse_xml_file(a);
+               GError *error = NULL;
+               parse_xml_file(a, &error);
+               
+               if (error != NULL)
+               {
+                       report_error(error);
+                       g_error_free(error);
+                       error = NULL;
+               }
        }
 
        report_dives();
+       dive_list_update_dives();
 
-       win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       g_signal_connect(G_OBJECT(win), "destroy",      G_CALLBACK(on_destroy), NULL);
-       g_signal_connect(G_OBJECT(win), "expose-event", G_CALLBACK(on_expose), NULL);
-
-       divelist = create_dive_list();
-       gtk_container_add(GTK_CONTAINER(win), divelist);
-
-       gtk_widget_set_app_paintable(win, TRUE);
-       gtk_widget_show_all(win);
-
-       gtk_main();
+       run_ui();
        return 0;
 }