Separate out the UI from the program logic

[ext/subsurface.git] / divelist.c

diff --git a/divelist.c b/divelist.c
index 0a601c511f27e2fab3243e83f6770dfc00ce1093..e000924368de40763520d22e1ab371957e287ce4 100644 (file)
--- a/divelist.c
+++ b/divelist.c
@@ -1,3 +1,13 @@
+/* divelist.c */
+/* this creates the UI for the dive list - 
+ * controlled through the following interfaces:
+ * 
+ * void flush_divelist(struct dive *dive)
+ * GtkWidget dive_list_create(void)
+ * void dive_list_update_dives(void)
+ * void update_dive_list_units(void)
+ * void set_divelist_font(const char *font)
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,6 +16,7 @@
 #include "divelist.h"
 #include "dive.h"
 #include "display.h"
+#include "display-gtk.h"
 
 struct DiveList {
        GtkWidget    *tree_view;
@@ -34,6 +45,8 @@ enum {
        DIVELIST_COLUMNS
 };
 
+/* the global dive list that we maintain */
+static struct DiveList dive_list;
 
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
@@ -48,23 +61,6 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
        repaint_dive();
 }
 
-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", "Oct", "Sep", "Nov", "Dec",
-       };
-       return month_array[mon];
-}
-
 static void date_data_func(GtkTreeViewColumn *col,
                           GtkCellRenderer *renderer,
                           GtkTreeModel *model,
@@ -344,6 +340,13 @@ void flush_divelist(struct dive *dive)
        gtk_tree_model_foreach(model, set_one_dive, dive);
 }
 
+void set_divelist_font(const char *font)
+{
+       PangoFontDescription *font_desc = pango_font_description_from_string(font);
+       gtk_widget_modify_font(dive_list.tree_view, font_desc);
+       pango_font_description_free(font_desc);
+}
+
 void update_dive_list_units(void)
 {
        const char *unit;
@@ -446,7 +449,6 @@ static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const
 GtkWidget *dive_list_create(void)
 {
        GtkTreeSelection  *selection;
-       PangoFontDescription *font_desc = pango_font_description_from_string("sans 8");
 
        dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
                                G_TYPE_INT,                     /* index */
@@ -460,8 +462,7 @@ GtkWidget *dive_list_create(void)
                                G_TYPE_INT                      /* SAC */
                                );
        dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
-       gtk_widget_modify_font(dive_list.tree_view, font_desc);
-       pango_font_description_free(font_desc);
+       set_divelist_font(divelist_font);
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));