mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-01 06:30:26 +00:00
621761233b
This commit addresses two issues: We now can add / edit / delete equipment from the edit dive dialog We now can edit multiple dives at once The latter feature has some interesting design constraints: It picks the 'selected_dive' as the one to start the edit from - so if this dive already has some information filled in, that information needs to be overwritten before it is stored in all of the dives. Similarly, only changes to the cylinders or weightsystems are recorded. Also, the notes field is not editable in the multi dive edit mode (as that didn't seem useful). The workflow seems to work best if using the multi-edit right after importing new dives from a dive computer. The user then can select all the new dives and only needs to edit things like location, divemaster, buddy, weights, etc. once. This commit will create some obvious conflicts with the commit that adds exposure protection tracking. It was implemented on top of the tree_view changes as it reuses some of the infrastructure for tracking the selected dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
639 lines
17 KiB
C
639 lines
17 KiB
C
/* info.c */
|
|
/* creates the UI for the info frame -
|
|
* controlled through the following interfaces:
|
|
*
|
|
* void show_dive_info(struct dive *dive)
|
|
*
|
|
* called from gtk-ui:
|
|
* GtkWidget *extended_dive_info_widget(void)
|
|
*/
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
#include <ctype.h>
|
|
#include <sys/time.h>
|
|
|
|
#include "dive.h"
|
|
#include "display.h"
|
|
#include "display-gtk.h"
|
|
#include "divelist.h"
|
|
|
|
static GtkEntry *location, *buddy, *divemaster, *rating;
|
|
static GtkTextView *notes;
|
|
static GtkListStore *location_list, *people_list, *star_list;
|
|
|
|
static char *get_text(GtkTextView *view)
|
|
{
|
|
GtkTextBuffer *buffer;
|
|
GtkTextIter start;
|
|
GtkTextIter end;
|
|
|
|
buffer = gtk_text_view_get_buffer(view);
|
|
gtk_text_buffer_get_start_iter(buffer, &start);
|
|
gtk_text_buffer_get_end_iter(buffer, &end);
|
|
return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
|
|
}
|
|
|
|
/* old is NULL or a valid string, new is a valid string
|
|
* 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));
|
|
}
|
|
|
|
static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
|
|
{
|
|
char *old = *textp;
|
|
const gchar *new;
|
|
GtkEntry *entry;
|
|
|
|
entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
|
|
new = gtk_entry_get_text(entry);
|
|
while (isspace(*new))
|
|
new++;
|
|
if (!text_changed(old,new))
|
|
return NULL;
|
|
free(old);
|
|
*textp = strdup(new);
|
|
return *textp;
|
|
}
|
|
|
|
#define SET_TEXT_VALUE(x) \
|
|
gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
|
|
|
|
static int divename(char *buf, size_t size, struct dive *dive)
|
|
{
|
|
struct tm *tm = gmtime(&dive->when);
|
|
return snprintf(buf, size, "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
|
|
dive->number,
|
|
weekday(tm->tm_wday),
|
|
tm->tm_mon+1, tm->tm_mday,
|
|
tm->tm_year+1900,
|
|
tm->tm_hour, tm->tm_min);
|
|
}
|
|
|
|
void show_dive_info(struct dive *dive)
|
|
{
|
|
const char *text;
|
|
char buffer[80];
|
|
|
|
/* dive number and location (or lacking that, the date) go in the window title */
|
|
text = dive->location;
|
|
if (!text)
|
|
text = "";
|
|
if (*text) {
|
|
snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text);
|
|
} else {
|
|
divename(buffer, sizeof(buffer), dive);
|
|
}
|
|
text = buffer;
|
|
if (!dive->number)
|
|
text += 10; /* Skip the "Dive #0 - " part */
|
|
gtk_window_set_title(GTK_WINDOW(main_window), text);
|
|
|
|
SET_TEXT_VALUE(divemaster);
|
|
SET_TEXT_VALUE(buddy);
|
|
SET_TEXT_VALUE(location);
|
|
gtk_entry_set_text(rating, star_strings[dive->rating]);
|
|
gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
|
|
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 info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
|
|
{
|
|
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;
|
|
GtkWidget *frame = gtk_frame_new(label);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
|
|
widget = gtk_entry_new();
|
|
gtk_widget_set_can_focus(widget, FALSE);
|
|
gtk_editable_set_editable(GTK_EDITABLE(widget), FALSE);
|
|
gtk_container_add(GTK_CONTAINER(frame), widget);
|
|
g_signal_connect(widget, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
|
|
return GTK_ENTRY(widget);
|
|
}
|
|
|
|
static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text)
|
|
{
|
|
GtkEntry *entry;
|
|
GtkWidget *combo_box;
|
|
GtkWidget *frame = gtk_frame_new(label);
|
|
GtkEntryCompletion *completion;
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
|
|
|
|
combo_box = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(completions), 0);
|
|
gtk_container_add(GTK_CONTAINER(frame), combo_box);
|
|
|
|
entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
|
|
if (text && *text)
|
|
gtk_entry_set_text(entry, text);
|
|
|
|
completion = gtk_entry_completion_new();
|
|
gtk_entry_completion_set_text_column(completion, 0);
|
|
gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(completions));
|
|
gtk_entry_completion_set_inline_completion(completion, TRUE);
|
|
gtk_entry_completion_set_inline_selection(completion, TRUE);
|
|
gtk_entry_completion_set_popup_single_match(completion, FALSE);
|
|
gtk_entry_set_completion(entry, completion);
|
|
|
|
return GTK_COMBO_BOX_ENTRY(combo_box);
|
|
}
|
|
|
|
enum writable {
|
|
READ_ONLY,
|
|
READ_WRITE
|
|
};
|
|
|
|
static GtkTextView *text_view(GtkWidget *box, const char *label, enum writable writable)
|
|
{
|
|
GtkWidget *view, *vbox;
|
|
GtkWidget *frame = gtk_frame_new(label);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
|
|
box = gtk_hbox_new(FALSE, 3);
|
|
gtk_container_add(GTK_CONTAINER(frame), box);
|
|
vbox = gtk_vbox_new(FALSE, 3);
|
|
gtk_container_add(GTK_CONTAINER(box), vbox);
|
|
|
|
GtkWidget* scrolled_window = gtk_scrolled_window_new(0, 0);
|
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
|
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
|
|
|
|
view = gtk_text_view_new();
|
|
if (writable == READ_ONLY) {
|
|
gtk_widget_set_can_focus(view, FALSE);
|
|
gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
|
|
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
|
|
g_signal_connect(view, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
|
|
}
|
|
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
|
|
gtk_container_add(GTK_CONTAINER(scrolled_window), view);
|
|
gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
|
|
return GTK_TEXT_VIEW(view);
|
|
}
|
|
|
|
static enum {
|
|
MATCH_EXACT,
|
|
MATCH_PREPEND,
|
|
MATCH_AFTER
|
|
} found_string_entry;
|
|
static GtkTreeIter string_entry_location;
|
|
|
|
static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
|
|
{
|
|
const char *string = data;
|
|
char *entry;
|
|
int cmp;
|
|
|
|
gtk_tree_model_get(model, iter, 0, &entry, -1);
|
|
cmp = strcmp(entry, string);
|
|
|
|
/* Stop. The entry is bigger than the new one */
|
|
if (cmp > 0)
|
|
return TRUE;
|
|
|
|
/* Exact match */
|
|
if (!cmp) {
|
|
found_string_entry = MATCH_EXACT;
|
|
return TRUE;
|
|
}
|
|
|
|
string_entry_location = *iter;
|
|
found_string_entry = MATCH_AFTER;
|
|
return FALSE;
|
|
}
|
|
|
|
static int match_list(GtkListStore *list, const char *string)
|
|
{
|
|
found_string_entry = MATCH_PREPEND;
|
|
gtk_tree_model_foreach(GTK_TREE_MODEL(list), match_string_entry, (void *)string);
|
|
return found_string_entry;
|
|
}
|
|
|
|
static void add_string_list_entry(const char *string, GtkListStore *list)
|
|
{
|
|
GtkTreeIter *iter, loc;
|
|
|
|
if (!string || !*string)
|
|
return;
|
|
|
|
switch (match_list(list, string)) {
|
|
case MATCH_EXACT:
|
|
return;
|
|
case MATCH_PREPEND:
|
|
iter = NULL;
|
|
break;
|
|
case MATCH_AFTER:
|
|
iter = &string_entry_location;
|
|
break;
|
|
}
|
|
gtk_list_store_insert_after(list, &loc, iter);
|
|
gtk_list_store_set(list, &loc, 0, string, -1);
|
|
}
|
|
|
|
void add_people(const char *string)
|
|
{
|
|
add_string_list_entry(string, people_list);
|
|
}
|
|
|
|
void add_location(const char *string)
|
|
{
|
|
add_string_list_entry(string, location_list);
|
|
}
|
|
|
|
static int get_rating(const char *string)
|
|
{
|
|
int rating_val = 0;
|
|
int i;
|
|
|
|
for (i = 0; i <= 5; i++)
|
|
if (!strcmp(star_strings[i],string))
|
|
rating_val = i;
|
|
return rating_val;
|
|
}
|
|
|
|
struct dive_info {
|
|
GtkComboBoxEntry *location, *divemaster, *buddy, *rating;
|
|
GtkTextView *notes;
|
|
};
|
|
|
|
static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
|
|
{
|
|
char *old_text, *new_text;
|
|
char *rating_string;
|
|
int changed = 0;
|
|
|
|
new_text = get_combo_box_entry_text(info->location, &dive->location);
|
|
if (new_text) {
|
|
add_location(new_text);
|
|
changed = 1;
|
|
}
|
|
|
|
new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster);
|
|
if (new_text) {
|
|
add_people(new_text);
|
|
changed = 1;
|
|
}
|
|
|
|
new_text = get_combo_box_entry_text(info->buddy, &dive->buddy);
|
|
if (new_text) {
|
|
add_people(new_text);
|
|
changed = 1;
|
|
}
|
|
|
|
rating_string = strdup(star_strings[dive->rating]);
|
|
new_text = get_combo_box_entry_text(info->rating, &rating_string);
|
|
if (new_text) {
|
|
dive->rating = get_rating(rating_string);
|
|
free(rating_string);
|
|
changed =1;
|
|
}
|
|
|
|
if (info->notes) {
|
|
old_text = dive->notes;
|
|
dive->notes = get_text(info->notes);
|
|
if (text_changed(old_text,dive->notes))
|
|
changed = 1;
|
|
if (old_text)
|
|
g_free(old_text);
|
|
}
|
|
if (changed) {
|
|
mark_divelist_changed(TRUE);
|
|
update_dive(dive);
|
|
}
|
|
}
|
|
|
|
static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info, gboolean multi)
|
|
{
|
|
GtkWidget *hbox, *label, *frame, *equipment;
|
|
char buffer[80] = "Edit multiple dives";
|
|
|
|
if (!multi)
|
|
divename(buffer, sizeof(buffer), dive);
|
|
label = gtk_label_new(buffer);
|
|
gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
|
|
|
|
info->location = text_entry(box, "Location", location_list, dive->location);
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
|
|
|
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]);
|
|
|
|
/* only show notes if editing a single dive */
|
|
if (multi) {
|
|
info->notes = NULL;
|
|
} else {
|
|
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);
|
|
|
|
/* create a secondary Equipment widget */
|
|
frame = gtk_frame_new("Equipment");
|
|
equipment = equipment_widget(W_IDX_SECONDARY);
|
|
gtk_container_add(GTK_CONTAINER(frame), equipment);
|
|
gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
|
|
}
|
|
|
|
/* we use these to find out if we edited the cylinder or weightsystem entries */
|
|
static cylinder_t remember_cyl[MAX_CYLINDERS];
|
|
static weightsystem_t remember_ws[MAX_WEIGHTSYSTEMS];
|
|
|
|
void save_equipment_data(struct dive *dive)
|
|
{
|
|
if (dive) {
|
|
memcpy(remember_cyl, dive->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
|
|
memcpy(remember_ws, dive->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
|
|
}
|
|
}
|
|
|
|
void update_equipment_data(struct dive *dive, struct dive *master)
|
|
{
|
|
if (dive == master)
|
|
return;
|
|
if (memcmp(remember_cyl, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS)) {
|
|
memcpy(dive->cylinder, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
|
|
}
|
|
if (memcmp(remember_ws, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS)) {
|
|
memcpy(dive->weightsystem, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
|
|
}
|
|
}
|
|
|
|
int edit_multi_dive_info(int nr, int *indices)
|
|
{
|
|
int success, i;
|
|
GtkWidget *dialog, *vbox;
|
|
struct dive_info info;
|
|
struct dive *dive;
|
|
|
|
if (!nr)
|
|
return 0;
|
|
dialog = gtk_dialog_new_with_buttons("Dive Info",
|
|
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));
|
|
/* SCARY STUFF - IS THIS THE BEST WAY TO DO THIS???
|
|
*
|
|
* current_dive is one of our selected dives - and that is
|
|
* the one that is used to pre-fill the edit widget. Its
|
|
* data is used as the starting point for all selected dives
|
|
* I think it would be better to somehow collect and combine
|
|
* info from all the selected dives */
|
|
dive = current_dive;
|
|
dive_info_widget(vbox, dive, &info, (nr > 1));
|
|
show_dive_equipment(dive, W_IDX_SECONDARY);
|
|
save_equipment_data(dive);
|
|
gtk_widget_show_all(dialog);
|
|
success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
|
|
if (success)
|
|
for (i = 0; i < nr; i++) {
|
|
/* copy all "info" fields */
|
|
save_dive_info_changes(get_dive(indices[i]), &info);
|
|
/* copy the cylinders / weightsystems */
|
|
update_equipment_data(get_dive(indices[i]), dive);
|
|
/* this is extremely inefficient... it loops through all
|
|
dives to find the right one - but we KNOW the index already */
|
|
flush_divelist(get_dive(indices[i]));
|
|
}
|
|
gtk_widget_destroy(dialog);
|
|
|
|
return success;
|
|
}
|
|
|
|
int edit_dive_info(struct dive *dive)
|
|
{
|
|
int idx;
|
|
|
|
if (!dive)
|
|
return 0;
|
|
idx = dive->number;
|
|
return edit_multi_dive_info(1, &idx);
|
|
}
|
|
|
|
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;
|
|
vbox = gtk_vbox_new(FALSE, 6);
|
|
|
|
people_list = gtk_list_store_new(1, G_TYPE_STRING);
|
|
location_list = gtk_list_store_new(1, G_TYPE_STRING);
|
|
star_list = gtk_list_store_new(1, G_TYPE_STRING);
|
|
add_string_list_entry(ZERO_STARS, star_list);
|
|
add_string_list_entry(ONE_STARS, star_list);
|
|
add_string_list_entry(TWO_STARS, star_list);
|
|
add_string_list_entry(THREE_STARS, star_list);
|
|
add_string_list_entry(FOUR_STARS, star_list);
|
|
add_string_list_entry(FIVE_STARS, star_list);
|
|
|
|
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
|
|
location = text_value(vbox, "Location");
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
|
|
|
|
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);
|
|
return vbox;
|
|
}
|