X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=info.c;h=1847a49bf98ba8aef7e545d98e57ca58f2b6dfb8;hp=a298a07e3e2080769e8936553bb6ee19b215f1fb;hb=618a20ba5f2a9adc0e5a35117535f8eaa9fd34a4;hpb=af290d5eb281662d336b8186a9df1a489d78ec9d diff --git a/info.c b/info.c index a298a07..1847a49 100644 --- a/info.c +++ b/info.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "dive.h" #include "display.h" @@ -38,8 +39,8 @@ static char *get_text(GtkTextView *view) * NOTW: NULL and "" need to be treated as "unchanged" */ static int text_changed(const char *old, const char *new) { - return ((old && strcmp(old,new)) || - (!old && strcmp("",new))); + return (old && strcmp(old,new)) || + (!old && strcmp("",new)); } static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp) @@ -100,19 +101,58 @@ void show_dive_info(struct dive *dive) dive && dive->notes ? dive->notes : "", -1); } +static int delete_dive_info(struct dive *dive) +{ + int success; + GtkWidget *dialog; + + if (!dive) + return 0; + + dialog = gtk_dialog_new_with_buttons("Delete Dive", + GTK_WINDOW(main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + NULL); + + gtk_widget_show_all(dialog); + success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT; + if (success) { + delete_dive(dive); + mark_divelist_changed(TRUE); + dive_list_update_dives(); + } + + gtk_widget_destroy(dialog); + + return success; +} + static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data) { edit_dive_info(current_dive); } -static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data) +static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *item = gtk_menu_item_new_with_label("Edit"); - g_signal_connect(item, "activate", G_CALLBACK(info_menu_edit_cb), NULL); + delete_dive_info(current_dive); +} + +static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuItem *, gpointer)) +{ + GtkWidget *item = gtk_menu_item_new_with_label(label); + g_signal_connect(item, "activate", G_CALLBACK(cb), NULL); gtk_widget_show(item); /* Yes, really */ gtk_menu_prepend(menu, item); } +static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data) +{ + add_menu_item(menu, "Delete", info_menu_delete_cb); + add_menu_item(menu, "Edit", info_menu_edit_cb); +} + static GtkEntry *text_value(GtkWidget *box, const char *label) { GtkWidget *widget; @@ -258,13 +298,13 @@ void add_location(const char *string) static int get_rating(const char *string) { - int rating = 0; + int rating_val = 0; int i; for (i = 0; i <= 5; i++) if (!strcmp(star_strings[i],string)) - rating = i; - return rating; + rating_val = i; + return rating_val; } struct dive_info { @@ -313,7 +353,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive_info *info) if (changed) { mark_divelist_changed(TRUE); - flush_divelist(dive); + update_dive(dive); } } @@ -333,16 +373,23 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info info->divemaster = text_entry(hbox, "Dive master", people_list, dive->divemaster); info->buddy = text_entry(hbox, "Buddy", people_list, dive->buddy); + + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0); + info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]); info->notes = text_view(box, "Notes", READ_WRITE); if (dive->notes && *dive->notes) gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1); + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0); + frame = gtk_frame_new("Cylinder"); cylinder = cylinder_list_widget(); gtk_container_add(GTK_CONTAINER(frame), cylinder); - gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0); } int edit_dive_info(struct dive *dive) @@ -374,6 +421,133 @@ int edit_dive_info(struct dive *dive) return success; } +static GtkWidget *frame_box(GtkWidget *vbox, const char *fmt, ...) +{ + va_list ap; + char buffer[64]; + GtkWidget *frame, *hbox; + + va_start(ap, fmt); + vsnprintf(buffer, sizeof(buffer), fmt, ap); + va_end(ap); + + frame = gtk_frame_new(buffer); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0); + hbox = gtk_hbox_new(0, 3); + gtk_container_add(GTK_CONTAINER(frame), hbox); + return hbox; +} + +/* Fixme - should do at least depths too - a dive without a depth is kind of pointless */ +static time_t dive_time_widget(struct dive *dive) +{ + GtkWidget *dialog; + GtkWidget *cal, *hbox, *vbox, *box; + GtkWidget *h, *m; + GtkWidget *duration, *depth; + GtkWidget *label; + guint yval, mval, dval; + struct tm tm, *tmp; + struct timeval tv; + time_t time; + int success; + double depthinterval, val; + + dialog = gtk_dialog_new_with_buttons("Date and Time", + GTK_WINDOW(main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + NULL); + + vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + + /* Calendar hbox */ + hbox = frame_box(vbox, "Date:"); + cal = gtk_calendar_new(); + gtk_box_pack_start(GTK_BOX(hbox), cal, FALSE, TRUE, 0); + + /* Time hbox */ + hbox = frame_box(vbox, "Time"); + + h = gtk_spin_button_new_with_range (0.0, 23.0, 1.0); + m = gtk_spin_button_new_with_range (0.0, 59.0, 1.0); + + gettimeofday(&tv, NULL); + time = tv.tv_sec; + tmp = localtime(&time); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(h), tmp->tm_hour); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(m), (tmp->tm_min / 5)*5); + + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(h), TRUE); + gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(m), TRUE); + + gtk_box_pack_end(GTK_BOX(hbox), m, FALSE, FALSE, 0); + label = gtk_label_new(":"); + gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox), h, FALSE, FALSE, 0); + + hbox = gtk_hbox_new(TRUE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + + /* Duration hbox */ + box = frame_box(hbox, "Duration (min)"); + duration = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0); + gtk_box_pack_end(GTK_BOX(box), duration, FALSE, FALSE, 0); + + /* Depth box */ + box = frame_box(hbox, "Depth (%s):", output_units.length == FEET ? "ft" : "m"); + if (output_units.length == FEET) { + depthinterval = 1.0; + } else { + depthinterval = 0.1; + } + depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval); + gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0); + + /* All done, show it and wait for editing */ + gtk_widget_show_all(dialog); + success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT; + if (!success) { + gtk_widget_destroy(dialog); + return 0; + } + + memset(&tm, 0, sizeof(tm)); + gtk_calendar_get_date(GTK_CALENDAR(cal), &yval, &mval, &dval); + tm.tm_year = yval; + tm.tm_mon = mval; + tm.tm_mday = dval; + + tm.tm_hour = gtk_spin_button_get_value(GTK_SPIN_BUTTON(h)); + tm.tm_min = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m)); + + val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(depth)); + if (output_units.length == FEET) { + dive->maxdepth.mm = feet_to_mm(val); + } else { + dive->maxdepth.mm = val * 1000 + 0.5; + } + + dive->duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60; + + gtk_widget_destroy(dialog); + dive->when = utc_mktime(&tm); + + return 1; +} + +int add_new_dive(struct dive *dive) +{ + if (!dive) + return 0; + + if (!dive_time_widget(dive)) + return 0; + + return edit_dive_info(dive); +} + GtkWidget *extended_dive_info_widget(void) { GtkWidget *vbox, *hbox; @@ -397,6 +571,10 @@ GtkWidget *extended_dive_info_widget(void) divemaster = text_value(hbox, "Divemaster"); buddy = text_value(hbox, "Buddy"); + + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + rating = text_value(hbox, "Rating"); notes = text_view(vbox, "Notes", READ_ONLY);