info.c

   1 /* info.c */
   2 /* creates the UI for the info frame -
   3  * controlled through the following interfaces:
   4  *
   5  * void show_dive_info(struct dive *dive)
   6  *
   7  * called from gtk-ui:
   8  * GtkWidget *extended_dive_info_widget(void)
   9  */
  10 #include <stdio.h>
  11 #include <string.h>
  12 #include <stdlib.h>
  13 #include <time.h>
  14 #include <ctype.h>
  15 #include <sys/time.h>
  16
  17 #include "dive.h"
  18 #include "display.h"
  19 #include "display-gtk.h"
  20 #include "divelist.h"
  21
  22 static GtkEntry *location, *buddy, *divemaster, *rating, *suit;
  23 static GtkTextView *notes;
  24 static GtkListStore *location_list, *people_list, *star_list, *suit_list;
  25
  26 static char *get_text(GtkTextView *view)
  27 {
  28         GtkTextBuffer *buffer;
  29         GtkTextIter start;
  30         GtkTextIter end;
  31
  32         buffer = gtk_text_view_get_buffer(view);
  33         gtk_text_buffer_get_start_iter(buffer, &start);
  34         gtk_text_buffer_get_end_iter(buffer, &end);
  35         return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
  36 }
  37
  38 /* old is NULL or a valid string, new is a valid string
  39  * NOTW: NULL and "" need to be treated as "unchanged" */
  40 static int text_changed(const char *old, const char *new)
  41 {
  42         return (old && strcmp(old,new)) ||
  43                 (!old && strcmp("",new));
  44 }
  45
  46 static const char *skip_space(const char *str)
  47 {
  48         if (str) {
  49                 while (isspace(*str))
  50                         str++;
  51                 if (!*str)
  52                         str = NULL;
  53         }
  54         return str;
  55 }
  56
  57 /*
  58  * Get the string from a combo box.
  59  *
  60  * The "master" string is the string of the current dive - we only consider it
  61  * changed if the old string is either empty, or matches that master string.
  62  */
  63 static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp, const char *master)
  64 {
  65         char *old = *textp;
  66         const char *old_text;
  67         const gchar *new;
  68         GtkEntry *entry;
  69
  70         old_text = skip_space(old);
  71         master = skip_space(master);
  72
  73         /*
  74          * If we had a master string, and it doesn't match our old
  75          * string, we will always pick the old value (it means that
  76          * we're editing another dive's info that already had a
  77          * valid value).
  78          */
  79         if (master && old_text)
  80                 if (strcmp(master, old_text))
  81                         return NULL;
  82
  83         entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
  84         new = gtk_entry_get_text(entry);
  85         while (isspace(*new))
  86                 new++;
  87         /* If the master string didn't change, don't change other dives either! */
  88         if (!text_changed(master,new))
  89                 return NULL;
  90         if (!text_changed(old,new))
  91                 return NULL;
  92         free(old);
  93         *textp = strdup(new);
  94         return *textp;
  95 }
  96
  97 #define SET_TEXT_VALUE(x) \
  98         gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
  99
 100 static int divename(char *buf, size_t size, struct dive *dive)
 101 {
 102         struct tm *tm = gmtime(&dive->when);
 103         return snprintf(buf, size, "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
 104                 dive->number,
 105                 weekday(tm->tm_wday),
 106                 tm->tm_mon+1, tm->tm_mday,
 107                 tm->tm_year+1900,
 108                 tm->tm_hour, tm->tm_min);
 109 }
 110
 111 void show_dive_info(struct dive *dive)
 112 {
 113         const char *text;
 114         char buffer[80];
 115
 116         /* dive number and location (or lacking that, the date) go in the window title */
 117         text = dive->location;
 118         if (!text)
 119                 text = "";
 120         if (*text) {
 121                 snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text);
 122         } else {
 123                 divename(buffer, sizeof(buffer), dive);
 124         }
 125         text = buffer;
 126         if (!dive->number)
 127                 text += 10;     /* Skip the "Dive #0 - " part */
 128         gtk_window_set_title(GTK_WINDOW(main_window), text);
 129
 130         SET_TEXT_VALUE(divemaster);
 131         SET_TEXT_VALUE(buddy);
 132         SET_TEXT_VALUE(location);
 133         SET_TEXT_VALUE(suit);
 134         gtk_entry_set_text(rating, star_strings[dive->rating]);
 135         gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
 136                 dive && dive->notes ? dive->notes : "", -1);
 137 }
 138
 139 static int delete_dive_info(struct dive *dive)
 140 {
 141         int success;
 142         GtkWidget *dialog;
 143
 144         if (!dive)
 145                 return 0;
 146
 147         dialog = gtk_dialog_new_with_buttons("Delete Dive",
 148                 GTK_WINDOW(main_window),
 149                 GTK_DIALOG_DESTROY_WITH_PARENT,
 150                 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 151                 GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 152                 NULL);
 153
 154         gtk_widget_show_all(dialog);
 155         success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
 156         if (success) {
 157                 delete_dive(dive);
 158                 mark_divelist_changed(TRUE);
 159                 dive_list_update_dives();
 160         }
 161
 162         gtk_widget_destroy(dialog);
 163
 164         return success;
 165 }
 166
 167 static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
 168 {
 169         edit_multi_dive_info(amount_selected, selectiontracker);
 170 }
 171
 172 static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
 173 {
 174         /* this needs to delete all the selected dives as well, I guess? */
 175         delete_dive_info(current_dive);
 176 }
 177
 178 static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, void (*cb)(GtkMenuItem *, gpointer))
 179 {
 180         GtkWidget *item;
 181         if (icon) {
 182                 GtkWidget *image;
 183                 item = gtk_image_menu_item_new_with_label(label);
 184                 image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU);
 185                 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
 186         } else {
 187                 item = gtk_menu_item_new_with_label(label);
 188         }
 189         g_signal_connect(item, "activate", G_CALLBACK(cb), NULL);
 190         gtk_widget_show(item); /* Yes, really */
 191         gtk_menu_prepend(menu, item);
 192 }
 193
 194 static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
 195 {
 196         add_menu_item(menu, "Delete", GTK_STOCK_DELETE, info_menu_delete_cb);
 197         add_menu_item(menu, "Edit", GTK_STOCK_EDIT, info_menu_edit_cb);
 198 }
 199
 200 static GtkEntry *text_value(GtkWidget *box, const char *label)
 201 {
 202         GtkWidget *widget;
 203         GtkWidget *frame = gtk_frame_new(label);
 204
 205         gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
 206         widget = gtk_entry_new();
 207         gtk_widget_set_can_focus(widget, FALSE);
 208         gtk_editable_set_editable(GTK_EDITABLE(widget), FALSE);
 209         gtk_container_add(GTK_CONTAINER(frame), widget);
 210         g_signal_connect(widget, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
 211         return GTK_ENTRY(widget);
 212 }
 213
 214 static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text)
 215 {
 216         GtkEntry *entry;
 217         GtkWidget *combo_box;
 218         GtkWidget *frame = gtk_frame_new(label);
 219         GtkEntryCompletion *completion;
 220
 221         gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
 222
 223         combo_box = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(completions), 0);
 224         gtk_container_add(GTK_CONTAINER(frame), combo_box);
 225
 226         entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
 227         if (text && *text)
 228                 gtk_entry_set_text(entry, text);
 229
 230         completion = gtk_entry_completion_new();
 231         gtk_entry_completion_set_text_column(completion, 0);
 232         gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(completions));
 233         gtk_entry_completion_set_inline_completion(completion, TRUE);
 234         gtk_entry_completion_set_inline_selection(completion, TRUE);
 235         gtk_entry_completion_set_popup_single_match(completion, FALSE);
 236         gtk_entry_set_completion(entry, completion);
 237
 238         return GTK_COMBO_BOX_ENTRY(combo_box);
 239 }
 240
 241 enum writable {
 242         READ_ONLY,
 243         READ_WRITE
 244 };
 245
 246 static GtkTextView *text_view(GtkWidget *box, const char *label, enum writable writable)
 247 {
 248         GtkWidget *view, *vbox;
 249         GtkWidget *frame = gtk_frame_new(label);
 250
 251         gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
 252         box = gtk_hbox_new(FALSE, 3);
 253         gtk_container_add(GTK_CONTAINER(frame), box);
 254         vbox = gtk_vbox_new(FALSE, 3);
 255         gtk_container_add(GTK_CONTAINER(box), vbox);
 256
 257         GtkWidget* scrolled_window = gtk_scrolled_window_new(0, 0);
 258         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 259         gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
 260
 261         view = gtk_text_view_new();
 262         if (writable == READ_ONLY) {
 263                 gtk_widget_set_can_focus(view, FALSE);
 264                 gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
 265                 gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
 266                 g_signal_connect(view, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
 267         }
 268         gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
 269         gtk_container_add(GTK_CONTAINER(scrolled_window), view);
 270         gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
 271         return GTK_TEXT_VIEW(view);
 272 }
 273
 274 static enum {
 275         MATCH_EXACT,
 276         MATCH_PREPEND,
 277         MATCH_AFTER
 278 } found_string_entry;
 279 static GtkTreeIter string_entry_location;
 280
 281 static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 282 {
 283         const char *string = data;
 284         char *entry;
 285         int cmp;
 286
 287         gtk_tree_model_get(model, iter, 0, &entry, -1);
 288         cmp = strcmp(entry, string);
 289         if (entry)
 290                 free(entry);
 291
 292         /* Stop. The entry is bigger than the new one */
 293         if (cmp > 0)
 294                 return TRUE;
 295
 296         /* Exact match */
 297         if (!cmp) {
 298                 found_string_entry = MATCH_EXACT;
 299                 return TRUE;
 300         }
 301
 302         string_entry_location = *iter;
 303         found_string_entry = MATCH_AFTER;
 304         return FALSE;
 305 }
 306
 307 static int match_list(GtkListStore *list, const char *string)
 308 {
 309         found_string_entry = MATCH_PREPEND;
 310         gtk_tree_model_foreach(GTK_TREE_MODEL(list), match_string_entry, (void *)string);
 311         return found_string_entry;
 312 }
 313
 314 static void add_string_list_entry(const char *string, GtkListStore *list)
 315 {
 316         GtkTreeIter *iter, loc;
 317
 318         if (!string || !*string)
 319                 return;
 320
 321         switch (match_list(list, string)) {
 322         case MATCH_EXACT:
 323                 return;
 324         case MATCH_PREPEND:
 325                 iter = NULL;
 326                 break;
 327         case MATCH_AFTER:
 328                 iter = &string_entry_location;
 329                 break;
 330         }
 331         gtk_list_store_insert_after(list, &loc, iter);
 332         gtk_list_store_set(list, &loc, 0, string, -1);
 333 }
 334
 335 void add_people(const char *string)
 336 {
 337         add_string_list_entry(string, people_list);
 338 }
 339
 340 void add_location(const char *string)
 341 {
 342         add_string_list_entry(string, location_list);
 343 }
 344
 345 void add_suit(const char *string)
 346 {
 347         add_string_list_entry(string, suit_list);
 348 }
 349
 350 static int get_rating(const char *string)
 351 {
 352         int rating_val = 0;
 353         int i;
 354
 355         for (i = 0; i <= 5; i++)
 356                 if (!strcmp(star_strings[i],string))
 357                         rating_val = i;
 358         return rating_val;
 359 }
 360
 361 struct dive_info {
 362         GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit;
 363         GtkTextView *notes;
 364 };
 365
 366 static void save_dive_info_changes(struct dive *dive, struct dive *master, struct dive_info *info)
 367 {
 368         char *old_text, *new_text;
 369         char *rating_string;
 370         int changed = 0;
 371
 372         new_text = get_combo_box_entry_text(info->location, &dive->location, master->location);
 373         if (new_text) {
 374                 add_location(new_text);
 375                 changed = 1;
 376         }
 377
 378         new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster, master->divemaster);
 379         if (new_text) {
 380                 add_people(new_text);
 381                 changed = 1;
 382         }
 383
 384         new_text = get_combo_box_entry_text(info->buddy, &dive->buddy, master->buddy);
 385         if (new_text) {
 386                 add_people(new_text);
 387                 changed = 1;
 388         }
 389
 390         new_text = get_combo_box_entry_text(info->suit, &dive->suit, master->suit);
 391         if (new_text) {
 392                 add_suit(new_text);
 393                 changed = 1;
 394         }
 395
 396         rating_string = strdup(star_strings[dive->rating]);
 397         new_text = get_combo_box_entry_text(info->rating, &rating_string, star_strings[master->rating]);
 398         if (new_text) {
 399                 dive->rating = get_rating(rating_string);
 400                 free(rating_string);
 401                 changed =1;
 402         }
 403
 404         if (info->notes) {
 405                 old_text = dive->notes;
 406                 dive->notes = get_text(info->notes);
 407                 if (text_changed(old_text,dive->notes))
 408                         changed = 1;
 409                 if (old_text)
 410                         g_free(old_text);
 411         }
 412         if (changed) {
 413                 mark_divelist_changed(TRUE);
 414                 update_dive(dive);
 415         }
 416 }
 417
 418 static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info, gboolean multi)
 419 {
 420         GtkWidget *hbox, *label, *frame, *equipment;
 421         char buffer[80] = "Edit multiple dives";
 422
 423         if (!multi)
 424                 divename(buffer, sizeof(buffer), dive);
 425         label = gtk_label_new(buffer);
 426         gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
 427
 428         info->location = text_entry(box, "Location", location_list, dive->location);
 429
 430         hbox = gtk_hbox_new(FALSE, 3);
 431         gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
 432
 433         info->divemaster = text_entry(hbox, "Dive master", people_list, dive->divemaster);
 434         info->buddy = text_entry(hbox, "Buddy", people_list, dive->buddy);
 435
 436         hbox = gtk_hbox_new(FALSE, 3);
 437         gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
 438
 439         info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]);
 440         info->suit = text_entry(hbox, "Suit", suit_list, dive->suit);
 441
 442         /* only show notes if editing a single dive */
 443         if (multi) {
 444                 info->notes = NULL;
 445         } else {
 446                 info->notes = text_view(box, "Notes", READ_WRITE);
 447                 if (dive->notes && *dive->notes)
 448                         gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
 449         }
 450         hbox = gtk_hbox_new(FALSE, 3);
 451         gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
 452
 453         /* create a secondary Equipment widget */
 454         frame = gtk_frame_new("Equipment");
 455         equipment = equipment_widget(W_IDX_SECONDARY);
 456         gtk_container_add(GTK_CONTAINER(frame), equipment);
 457         gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
 458 }
 459
 460 /* we use these to find out if we edited the cylinder or weightsystem entries */
 461 static cylinder_t remember_cyl[MAX_CYLINDERS];
 462 static weightsystem_t remember_ws[MAX_WEIGHTSYSTEMS];
 463
 464 void save_equipment_data(struct dive *dive)
 465 {
 466         if (dive) {
 467                 memcpy(remember_cyl, dive->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
 468                 memcpy(remember_ws, dive->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
 469         }
 470 }
 471
 472 void update_equipment_data(struct dive *dive, struct dive *master)
 473 {
 474         if (dive == master)
 475                 return;
 476         if (memcmp(remember_cyl, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS) &&
 477                 cylinder_none(dive->cylinder))
 478                 memcpy(dive->cylinder, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
 479         if (memcmp(remember_ws, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS) &&
 480                 weightsystem_none(dive->weightsystem))
 481                 memcpy(dive->weightsystem, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
 482 }
 483
 484 int edit_multi_dive_info(int nr, int *indices)
 485 {
 486         int success, i;
 487         GtkWidget *dialog, *vbox;
 488         struct dive_info info;
 489         struct dive *master;
 490
 491         if (!nr)
 492                 return 0;
 493         dialog = gtk_dialog_new_with_buttons("Dive Info",
 494                 GTK_WINDOW(main_window),
 495                 GTK_DIALOG_DESTROY_WITH_PARENT,
 496                 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 497                 GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 498                 NULL);
 499
 500         vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 501         /* SCARY STUFF - IS THIS THE BEST WAY TO DO THIS???
 502          *
 503          * current_dive is one of our selected dives - and that is
 504          * the one that is used to pre-fill the edit widget. Its
 505          * data is used as the starting point for all selected dives
 506          * I think it would be better to somehow collect and combine
 507          * info from all the selected dives */
 508         master = current_dive;
 509         dive_info_widget(vbox, master, &info, (nr > 1));
 510         show_dive_equipment(master, W_IDX_SECONDARY);
 511         save_equipment_data(master);
 512         gtk_widget_show_all(dialog);
 513         success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
 514         if (success) {
 515                 /* Update the other non-current dives first */
 516                 for (i = 0; i < nr; i++) {
 517                         int idx = indices[i];
 518                         struct dive *dive = get_dive(idx);
 519
 520                         if (!dive || dive == master)
 521                                 continue;
 522                         /* copy all "info" fields */
 523                         save_dive_info_changes(dive, master, &info);
 524                         /* copy the cylinders / weightsystems */
 525                         update_equipment_data(dive, master);
 526                         /* this is extremely inefficient... it loops through all
 527                            dives to find the right one - but we KNOW the index already */
 528                         flush_divelist(dive);
 529                 }
 530
 531                 /* Update the master dive last! */
 532                 save_dive_info_changes(master, master, &info);
 533                 update_equipment_data(master, master);
 534                 flush_divelist(master);
 535         }
 536         gtk_widget_destroy(dialog);
 537
 538         return success;
 539 }
 540
 541 int edit_dive_info(struct dive *dive)
 542 {
 543         int idx;
 544
 545         if (!dive)
 546                 return 0;
 547         idx = dive->number;
 548         return edit_multi_dive_info(1, &idx);
 549 }
 550
 551 static GtkWidget *frame_box(GtkWidget *vbox, const char *fmt, ...)
 552 {
 553         va_list ap;
 554         char buffer[64];
 555         GtkWidget *frame, *hbox;
 556
 557         va_start(ap, fmt);
 558         vsnprintf(buffer, sizeof(buffer), fmt, ap);
 559         va_end(ap);
 560
 561         frame = gtk_frame_new(buffer);
 562         gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
 563         hbox = gtk_hbox_new(0, 3);
 564         gtk_container_add(GTK_CONTAINER(frame), hbox);
 565         return hbox;
 566 }
 567
 568 /* Fixme - should do at least depths too - a dive without a depth is kind of pointless */
 569 static time_t dive_time_widget(struct dive *dive)
 570 {
 571         GtkWidget *dialog;
 572         GtkWidget *cal, *hbox, *vbox, *box;
 573         GtkWidget *h, *m;
 574         GtkWidget *duration, *depth;
 575         GtkWidget *label;
 576         guint yval, mval, dval;
 577         struct tm tm, *tmp;
 578         struct timeval tv;
 579         time_t time;
 580         int success;
 581         double depthinterval, val;
 582
 583         dialog = gtk_dialog_new_with_buttons("Date and Time",
 584                 GTK_WINDOW(main_window),
 585                 GTK_DIALOG_DESTROY_WITH_PARENT,
 586                 GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 587                 GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 588                 NULL);
 589
 590         vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 591
 592         /* Calendar hbox */
 593         hbox = frame_box(vbox, "Date:");
 594         cal = gtk_calendar_new();
 595         gtk_box_pack_start(GTK_BOX(hbox), cal, FALSE, TRUE, 0);
 596
 597         /* Time hbox */
 598         hbox = frame_box(vbox, "Time");
 599
 600         h = gtk_spin_button_new_with_range (0.0, 23.0, 1.0);
 601         m = gtk_spin_button_new_with_range (0.0, 59.0, 1.0);
 602
 603         gettimeofday(&tv, NULL);
 604         time = tv.tv_sec;
 605         tmp = localtime(&time);
 606         gtk_spin_button_set_value(GTK_SPIN_BUTTON(h), tmp->tm_hour);
 607         gtk_spin_button_set_value(GTK_SPIN_BUTTON(m), (tmp->tm_min / 5)*5);
 608
 609         gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(h), TRUE);
 610         gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(m), TRUE);
 611
 612         gtk_box_pack_end(GTK_BOX(hbox), m, FALSE, FALSE, 0);
 613         label = gtk_label_new(":");
 614         gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 615         gtk_box_pack_end(GTK_BOX(hbox), h, FALSE, FALSE, 0);
 616
 617         hbox = gtk_hbox_new(TRUE, 3);
 618         gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 619
 620         /* Duration hbox */
 621         box = frame_box(hbox, "Duration (min)");
 622         duration = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
 623         gtk_box_pack_end(GTK_BOX(box), duration, FALSE, FALSE, 0);
 624
 625         /* Depth box */
 626         box = frame_box(hbox, "Depth (%s):", output_units.length == FEET ? "ft" : "m");
 627         if (output_units.length == FEET) {
 628                 depthinterval = 1.0;
 629         } else {
 630                 depthinterval = 0.1;
 631         }
 632         depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval);
 633         gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0);
 634
 635         /* All done, show it and wait for editing */
 636         gtk_widget_show_all(dialog);
 637         success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
 638         if (!success) {
 639                 gtk_widget_destroy(dialog);
 640                 return 0;
 641         }
 642
 643         memset(&tm, 0, sizeof(tm));
 644         gtk_calendar_get_date(GTK_CALENDAR(cal), &yval, &mval, &dval);
 645         tm.tm_year = yval;
 646         tm.tm_mon = mval;
 647         tm.tm_mday = dval;
 648
 649         tm.tm_hour = gtk_spin_button_get_value(GTK_SPIN_BUTTON(h));
 650         tm.tm_min = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m));
 651
 652         val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(depth));
 653         if (output_units.length == FEET) {
 654                 dive->maxdepth.mm = feet_to_mm(val);
 655         } else {
 656                 dive->maxdepth.mm = val * 1000 + 0.5;
 657         }
 658
 659         dive->duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60;
 660
 661         gtk_widget_destroy(dialog);
 662         dive->when = utc_mktime(&tm);
 663
 664         return 1;
 665 }
 666
 667 int add_new_dive(struct dive *dive)
 668 {
 669         if (!dive)
 670                 return 0;
 671
 672         if (!dive_time_widget(dive))
 673                 return 0;
 674
 675         return edit_dive_info(dive);
 676 }
 677
 678 GtkWidget *extended_dive_info_widget(void)
 679 {
 680         GtkWidget *vbox, *hbox;
 681         vbox = gtk_vbox_new(FALSE, 6);
 682
 683         people_list = gtk_list_store_new(1, G_TYPE_STRING);
 684         location_list = gtk_list_store_new(1, G_TYPE_STRING);
 685         star_list = gtk_list_store_new(1, G_TYPE_STRING);
 686         add_string_list_entry(ZERO_STARS, star_list);
 687         add_string_list_entry(ONE_STARS, star_list);
 688         add_string_list_entry(TWO_STARS, star_list);
 689         add_string_list_entry(THREE_STARS, star_list);
 690         add_string_list_entry(FOUR_STARS, star_list);
 691         add_string_list_entry(FIVE_STARS, star_list);
 692         suit_list = gtk_list_store_new(1, G_TYPE_STRING);
 693
 694         gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 695         location = text_value(vbox, "Location");
 696
 697         hbox = gtk_hbox_new(FALSE, 3);
 698         gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
 699
 700         divemaster = text_value(hbox, "Divemaster");
 701         buddy = text_value(hbox, "Buddy");
 702
 703         hbox = gtk_hbox_new(FALSE, 3);
 704         gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
 705
 706         rating = text_value(hbox, "Rating");
 707         suit = text_value(hbox, "Suit");
 708
 709         notes = text_view(vbox, "Notes", READ_ONLY);
 710         return vbox;
 711 }