#include <stdlib.h>
#include <time.h>
#include <ctype.h>
+#include <sys/time.h>
#include "dive.h"
#include "display.h"
* 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)
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;
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 {
if (changed) {
mark_divelist_changed(TRUE);
- flush_divelist(dive);
+ update_dive(dive);
}
}
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)
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;
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);
projects / ext / subsurface.git / blobdiff