summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--divelist.c81
-rw-r--r--divelist.h17
-rw-r--r--equipment.c34
-rw-r--r--libdivecomputer.c2
-rw-r--r--main.c20
5 files changed, 102 insertions, 52 deletions
diff --git a/divelist.c b/divelist.c
index 3b840794b..0a601c511 100644
--- a/divelist.c
+++ b/divelist.c
@@ -7,6 +7,16 @@
#include "dive.h"
#include "display.h"
+struct DiveList {
+ GtkWidget *tree_view;
+ GtkWidget *container_widget;
+ GtkListStore *model;
+ GtkTreeViewColumn *date, *depth, *duration, *location;
+ GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+};
+
+static struct DiveList dive_list;
+
/*
* The dive list has the dive data in both string format (for showing)
* and in "raw" format (for sorting purposes)
@@ -204,7 +214,7 @@ static void sac_data_func(GtkTreeViewColumn *col,
sac = value / 1000.0;
switch (output_units.volume) {
case LITER:
- fmt = "%4.0f";
+ fmt = "%4.1f";
break;
case CUFT:
fmt = "%4.2f";
@@ -267,8 +277,8 @@ static void get_string(char **str, const char *s)
if (!s)
s = "";
len = strlen(s);
- if (len > 16)
- len = 16;
+ if (len > 40)
+ len = 40;
n = malloc(len+1);
memcpy(n, s, len);
n[len] = 0;
@@ -327,38 +337,51 @@ static gboolean set_one_dive(GtkTreeModel *model,
return dive == data;
}
-void flush_divelist(struct DiveList *dive_list, struct dive *dive)
+void flush_divelist(struct dive *dive)
{
- GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model);
+ GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
gtk_tree_model_foreach(model, set_one_dive, dive);
}
-void update_dive_list_units(struct DiveList *dive_list)
+void update_dive_list_units(void)
{
const char *unit;
- GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model);
+ GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
switch (output_units.length) {
case METERS:
- unit = "m";
+ unit = "max/m";
break;
case FEET:
- unit = "ft";
+ unit = "max/ft";
+ break;
+ }
+ gtk_tree_view_column_set_title(dive_list.depth, unit);
+
+ switch (output_units.temperature) {
+ case CELSIUS:
+ unit = "degC";
+ break;
+ case FAHRENHEIT:
+ unit = "degF";
+ break;
+ case KELVIN:
+ unit = "Kelvin";
break;
}
- gtk_tree_view_column_set_title(dive_list->depth, unit);
+ gtk_tree_view_column_set_title(dive_list.temperature, unit);
gtk_tree_model_foreach(model, set_one_dive, NULL);
}
-static void fill_dive_list(struct DiveList *dive_list)
+static void fill_dive_list(void)
{
int i;
GtkTreeIter iter;
GtkListStore *store;
- store = GTK_LIST_STORE(dive_list->model);
+ store = GTK_LIST_STORE(dive_list.model);
for (i = 0; i < dive_table.nr; i++) {
struct dive *dive = dive_table.dives[i];
@@ -376,13 +399,13 @@ static void fill_dive_list(struct DiveList *dive_list)
-1);
}
- update_dive_list_units(dive_list);
+ update_dive_list_units();
}
-void dive_list_update_dives(struct DiveList dive_list)
+void dive_list_update_dives(void)
{
gtk_list_store_clear(GTK_LIST_STORE(dive_list.model));
- fill_dive_list(&dive_list);
+ fill_dive_list();
repaint_dive();
}
@@ -393,7 +416,7 @@ typedef void (*data_func_t)(GtkTreeViewColumn *col,
gpointer data);
static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title,
- data_func_t data_func, int align_right)
+ data_func_t data_func, int align_right, int expand)
{
GtkCellRenderer *renderer;
GtkTreeViewColumn *col;
@@ -413,13 +436,15 @@ static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const
gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
}
+ gtk_tree_view_column_set_expand(col,expand);
+ if (expand)
+ gtk_tree_view_column_set_min_width(col,50);
gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col);
return col;
}
-struct DiveList dive_list_create(void)
+GtkWidget *dive_list_create(void)
{
- struct DiveList dive_list;
GtkTreeSelection *selection;
PangoFontDescription *font_desc = pango_font_description_from_string("sans 8");
@@ -443,16 +468,16 @@ struct DiveList dive_list_create(void)
gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
- dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0);
- dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, 1);
- dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1);
- dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0);
- dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "deg", temperature_data_func, 1);
- dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0);
- dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1);
- dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1);
+ dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0);
+ dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "max/ft", depth_data_func, 1, 0);
+ dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0);
+ dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1);
+ dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "degF", temperature_data_func, 1, 0);
+ dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0);
+ dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1, 0);
+ dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0);
- fill_dive_list(&dive_list);
+ fill_dive_list();
g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
"search-column", 0,
@@ -466,5 +491,5 @@ struct DiveList dive_list_create(void)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
- return dive_list;
+ return dive_list.container_widget;
}
diff --git a/divelist.h b/divelist.h
index 2d1fd5092..25de6837a 100644
--- a/divelist.h
+++ b/divelist.h
@@ -3,20 +3,11 @@
#include <gtk/gtk.h>
-struct DiveList {
- GtkWidget *tree_view;
- GtkWidget *container_widget;
- GtkListStore *model;
- GtkTreeViewColumn *date, *depth, *duration, *location;
- GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
-};
-
struct dive;
-extern struct DiveList dive_list;
-extern struct DiveList dive_list_create(void);
-extern void dive_list_update_dives(struct DiveList);
-extern void update_dive_list_units(struct DiveList *);
-extern void flush_divelist(struct DiveList *, struct dive *);
+extern GtkWidget *dive_list_create(void);
+extern void dive_list_update_dives(void);
+extern void update_dive_list_units(void);
+extern void flush_divelist(struct dive *);
#endif
diff --git a/equipment.c b/equipment.c
index 7e52f980a..b9b9259b5 100644
--- a/equipment.c
+++ b/equipment.c
@@ -225,10 +225,30 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl
void flush_dive_equipment_changes(struct dive *dive)
{
+ /* We do nothing: we require the "Ok" button press */
+}
+
+static void apply_cb(GtkButton *button, gpointer data)
+{
int i;
+ struct dive *dive = current_dive;
+
+ if (!dive)
+ return;
for (i = 0; i < MAX_CYLINDERS; i++)
record_cylinder_changes(dive->cylinder+i, gtk_cylinder+i);
+ flush_divelist(dive);
+}
+
+static void cancel_cb(GtkButton *button, gpointer data)
+{
+ struct dive *dive = current_dive;
+
+ if (!dive)
+ return;
+
+ show_dive_equipment(current_dive);
}
/*
@@ -370,7 +390,8 @@ static GtkListStore *create_tank_size_model(void)
GtkWidget *equipment_widget(void)
{
int i;
- GtkWidget *vbox;
+ GtkWidget *vbox, *hbox;
+ GtkWidget *apply, *cancel;
GtkListStore *model;
vbox = gtk_vbox_new(FALSE, 3);
@@ -387,5 +408,16 @@ GtkWidget *equipment_widget(void)
gtk_box_pack_start(GTK_BOX(vbox), cylinder->hbox, FALSE, TRUE, 0);
}
+ hbox = gtk_hbox_new(TRUE, 3);
+ gtk_box_pack_end(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
+
+ apply = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+ cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ gtk_box_pack_start(GTK_BOX(hbox), apply, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), cancel, FALSE, FALSE, 0);
+
+ g_signal_connect(apply, "clicked", G_CALLBACK(apply_cb), NULL);
+ g_signal_connect(cancel, "clicked", G_CALLBACK(cancel_cb), NULL);
+
return vbox;
}
diff --git a/libdivecomputer.c b/libdivecomputer.c
index c53a81e68..9e5bd907e 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -608,5 +608,5 @@ void import_dialog(GtkWidget *w, gpointer data)
gtk_widget_destroy(dialog);
report_dives();
- dive_list_update_dives(dive_list);
+ dive_list_update_dives();
}
diff --git a/main.c b/main.c
index 6e6bbd084..dfd1b1447 100644
--- a/main.c
+++ b/main.c
@@ -14,7 +14,6 @@ GtkWidget *main_vbox;
GtkWidget *error_info_bar;
GtkWidget *error_label;
int error_count;
-struct DiveList dive_list;
GConfClient *gconf;
struct units output_units;
@@ -98,7 +97,7 @@ void update_dive(struct dive *new_dive)
if (old_dive) {
flush_dive_info_changes(old_dive);
flush_dive_equipment_changes(old_dive);
- flush_divelist(&dive_list, old_dive);
+ flush_divelist(old_dive);
}
if (new_dive) {
show_dive_info(new_dive);
@@ -190,7 +189,7 @@ static void file_open(GtkWidget *w, gpointer data)
}
g_slist_free(filenames);
report_dives();
- dive_list_update_dives(dive_list);
+ dive_list_update_dives();
}
gtk_widget_destroy(dialog);
}
@@ -316,7 +315,7 @@ static void unit_dialog(GtkWidget *w, gpointer data)
/* Make sure to flush any modified old dive data with old units */
update_dive(NULL);
output_units = menu_units;
- update_dive_list_units(&dive_list);
+ update_dive_list_units();
repaint_dive();
gconf_client_set_bool(gconf, GCONF_NAME(feet), output_units.length == FEET, NULL);
gconf_client_set_bool(gconf, GCONF_NAME(psi), output_units.pressure == PSI, NULL);
@@ -365,7 +364,8 @@ static void renumber_dialog(GtkWidget *w, gpointer data)
}
static GtkActionEntry menu_items[] = {
- { "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
+ { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
+ { "LogMenuAction", 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) },
{ "Print", GTK_STOCK_PRINT, NULL, "<control>P", NULL, G_CALLBACK(do_print) },
@@ -386,10 +386,11 @@ static const gchar* ui_string = " \
<separator name=\"Separator1\"/> \
<menuitem name=\"Import\" action=\"Import\" /> \
<separator name=\"Separator2\"/> \
+ <menuitem name=\"Quit\" action=\"Quit\" /> \
+ </menu> \
+ <menu name=\"LogMenu\" action=\"LogMenuAction\"> \
<menuitem name=\"Units\" action=\"Units\" /> \
<menuitem name=\"Renumber\" action=\"Renumber\" /> \
- <separator name=\"Separator3\"/> \
- <menuitem name=\"Quit\" action=\"Quit\" /> \
</menu> \
</menubar> \
</ui> \
@@ -424,6 +425,7 @@ int main(int argc, char **argv)
GtkWidget *info_box;
GtkWidget *notebook;
GtkWidget *dive_info;
+ GtkWidget *dive_list;
GtkWidget *equipment;
GtkWidget *menubar;
GtkWidget *vbox;
@@ -464,7 +466,7 @@ int main(int argc, char **argv)
/* Create the actual divelist */
dive_list = dive_list_create();
- gtk_paned_add2(GTK_PANED(paned), dive_list.container_widget);
+ gtk_paned_add2(GTK_PANED(paned), dive_list);
/* VBox for dive info, and tabs */
info_box = gtk_vbox_new(FALSE, 6);
@@ -509,7 +511,7 @@ int main(int argc, char **argv)
}
report_dives();
- dive_list_update_dives(dive_list);
+ dive_list_update_dives();
gtk_main();
return 0;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-02-05 16:59:38 +0000