2011-09-20 19:40:34 +00:00
|
|
|
/* info.c */
|
2012-08-26 21:41:05 +00:00
|
|
|
/* creates the UI for the info frame -
|
2011-09-20 19:40:34 +00:00
|
|
|
* controlled through the following interfaces:
|
2012-08-26 21:41:05 +00:00
|
|
|
*
|
2011-09-20 19:40:34 +00:00
|
|
|
* void show_dive_info(struct dive *dive)
|
|
|
|
*
|
|
|
|
* called from gtk-ui:
|
|
|
|
* GtkWidget *extended_dive_info_widget(void)
|
|
|
|
*/
|
2011-08-31 19:09:19 +00:00
|
|
|
#include <stdio.h>
|
2011-09-03 03:00:10 +00:00
|
|
|
#include <string.h>
|
2011-08-31 19:09:19 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <time.h>
|
2011-11-03 05:11:31 +00:00
|
|
|
#include <ctype.h>
|
2012-06-28 01:56:41 +00:00
|
|
|
#include <sys/time.h>
|
2012-10-11 00:42:59 +00:00
|
|
|
#include <glib/gi18n.h>
|
2011-08-31 19:09:19 +00:00
|
|
|
|
|
|
|
#include "dive.h"
|
|
|
|
#include "display.h"
|
2011-09-20 19:40:34 +00:00
|
|
|
#include "display-gtk.h"
|
2011-09-05 19:12:58 +00:00
|
|
|
#include "divelist.h"
|
2011-08-31 19:09:19 +00:00
|
|
|
|
2012-08-14 23:07:25 +00:00
|
|
|
static GtkEntry *location, *buddy, *divemaster, *rating, *suit;
|
2011-11-19 15:11:56 +00:00
|
|
|
static GtkTextView *notes;
|
2012-08-14 23:07:25 +00:00
|
|
|
static GtkListStore *location_list, *people_list, *star_list, *suit_list;
|
2011-11-18 13:13:02 +00:00
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
static char *get_text(GtkTextView *view)
|
2011-09-02 02:56:04 +00:00
|
|
|
{
|
2011-11-19 15:11:56 +00:00
|
|
|
GtkTextBuffer *buffer;
|
2011-09-02 02:56:04 +00:00
|
|
|
GtkTextIter start;
|
|
|
|
GtkTextIter end;
|
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
buffer = gtk_text_view_get_buffer(view);
|
2011-09-02 02:56:04 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2011-09-21 04:29:09 +00:00
|
|
|
/* old is NULL or a valid string, new is a valid string
|
|
|
|
* NOTW: NULL and "" need to be treated as "unchanged" */
|
2011-11-03 05:11:31 +00:00
|
|
|
static int text_changed(const char *old, const char *new)
|
2011-09-21 04:29:09 +00:00
|
|
|
{
|
2011-12-15 04:49:40 +00:00
|
|
|
return (old && strcmp(old,new)) ||
|
|
|
|
(!old && strcmp("",new));
|
2011-09-21 04:29:09 +00:00
|
|
|
}
|
|
|
|
|
2012-08-17 16:36:04 +00:00
|
|
|
static const char *skip_space(const char *str)
|
2012-08-17 03:30:32 +00:00
|
|
|
{
|
|
|
|
if (str) {
|
|
|
|
while (isspace(*str))
|
|
|
|
str++;
|
|
|
|
if (!*str)
|
|
|
|
str = NULL;
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the string from a combo box.
|
|
|
|
*
|
|
|
|
* The "master" string is the string of the current dive - we only consider it
|
|
|
|
* changed if the old string is either empty, or matches that master string.
|
|
|
|
*/
|
2012-08-17 16:36:04 +00:00
|
|
|
static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp, const char *master)
|
2011-11-03 05:11:31 +00:00
|
|
|
{
|
|
|
|
char *old = *textp;
|
2012-08-17 16:36:04 +00:00
|
|
|
const char *old_text;
|
2011-11-03 05:11:31 +00:00
|
|
|
const gchar *new;
|
|
|
|
GtkEntry *entry;
|
|
|
|
|
2012-08-17 16:36:04 +00:00
|
|
|
old_text = skip_space(old);
|
2012-08-17 03:30:32 +00:00
|
|
|
master = skip_space(master);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we had a master string, and it doesn't match our old
|
|
|
|
* string, we will always pick the old value (it means that
|
|
|
|
* we're editing another dive's info that already had a
|
|
|
|
* valid value).
|
|
|
|
*/
|
2012-08-17 16:36:04 +00:00
|
|
|
if (master && old_text)
|
|
|
|
if (strcmp(master, old_text))
|
2012-08-17 03:30:32 +00:00
|
|
|
return NULL;
|
|
|
|
|
2011-11-03 05:11:31 +00:00
|
|
|
entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
|
|
|
|
new = gtk_entry_get_text(entry);
|
|
|
|
while (isspace(*new))
|
|
|
|
new++;
|
2012-08-17 14:39:50 +00:00
|
|
|
/* If the master string didn't change, don't change other dives either! */
|
|
|
|
if (!text_changed(master,new))
|
|
|
|
return NULL;
|
2011-11-03 05:11:31 +00:00
|
|
|
if (!text_changed(old,new))
|
|
|
|
return NULL;
|
|
|
|
free(old);
|
|
|
|
*textp = strdup(new);
|
|
|
|
return *textp;
|
|
|
|
}
|
|
|
|
|
2011-11-18 13:13:02 +00:00
|
|
|
#define SET_TEXT_VALUE(x) \
|
|
|
|
gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
|
2011-09-02 02:56:04 +00:00
|
|
|
|
2011-11-19 17:23:58 +00:00
|
|
|
static int divename(char *buf, size_t size, struct dive *dive)
|
|
|
|
{
|
2012-09-20 00:35:52 +00:00
|
|
|
struct tm tm;
|
|
|
|
|
|
|
|
utc_mkdate(dive->when, &tm);
|
2012-10-11 00:42:59 +00:00
|
|
|
return snprintf(buf, size, _("Dive #%d - %s %02d/%02d/%04d at %d:%02d"),
|
2011-11-19 17:23:58 +00:00
|
|
|
dive->number,
|
2012-09-20 00:35:52 +00:00
|
|
|
weekday(tm.tm_wday),
|
|
|
|
tm.tm_mon+1, tm.tm_mday,
|
|
|
|
tm.tm_year+1900,
|
|
|
|
tm.tm_hour, tm.tm_min);
|
2011-11-19 17:23:58 +00:00
|
|
|
}
|
|
|
|
|
2011-09-19 19:39:35 +00:00
|
|
|
void show_dive_info(struct dive *dive)
|
2011-09-01 03:36:51 +00:00
|
|
|
{
|
2011-09-20 05:09:47 +00:00
|
|
|
const char *text;
|
|
|
|
char buffer[80];
|
2012-09-15 12:29:12 +00:00
|
|
|
char title[80];
|
2012-09-18 11:24:54 +00:00
|
|
|
char *basename;
|
2011-09-20 05:09:47 +00:00
|
|
|
|
2012-09-10 21:32:55 +00:00
|
|
|
if (!dive) {
|
2012-09-15 12:29:12 +00:00
|
|
|
if (existing_filename) {
|
2012-09-18 11:24:54 +00:00
|
|
|
basename = g_path_get_basename(existing_filename);
|
|
|
|
snprintf(title, 80, "Subsurface: %s", basename);
|
|
|
|
free(basename);
|
2012-09-15 12:29:12 +00:00
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), title);
|
|
|
|
} else {
|
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), "Subsurface");
|
|
|
|
}
|
2012-09-10 21:32:55 +00:00
|
|
|
SET_TEXT_VALUE(divemaster);
|
|
|
|
SET_TEXT_VALUE(buddy);
|
|
|
|
SET_TEXT_VALUE(location);
|
|
|
|
SET_TEXT_VALUE(suit);
|
|
|
|
gtk_entry_set_text(rating, star_strings[0]);
|
|
|
|
gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes), "", -1);
|
|
|
|
return;
|
|
|
|
}
|
2011-09-20 05:09:47 +00:00
|
|
|
|
|
|
|
/* dive number and location (or lacking that, the date) go in the window title */
|
|
|
|
text = dive->location;
|
|
|
|
if (!text)
|
|
|
|
text = "";
|
|
|
|
if (*text) {
|
2012-10-11 00:42:59 +00:00
|
|
|
snprintf(buffer, sizeof(buffer), _("Dive #%d - %s"), dive->number, text);
|
2011-09-20 05:09:47 +00:00
|
|
|
} else {
|
2011-11-19 17:23:58 +00:00
|
|
|
divename(buffer, sizeof(buffer), dive);
|
2011-09-20 05:09:47 +00:00
|
|
|
}
|
|
|
|
text = buffer;
|
|
|
|
if (!dive->number)
|
|
|
|
text += 10; /* Skip the "Dive #0 - " part */
|
|
|
|
|
2012-09-15 12:29:12 +00:00
|
|
|
/* put it all together */
|
|
|
|
if (existing_filename) {
|
2012-09-18 11:24:54 +00:00
|
|
|
basename = g_path_get_basename(existing_filename);
|
|
|
|
snprintf(title, 80, "%s: %s", basename, text);
|
|
|
|
free(basename);
|
2012-09-15 12:29:12 +00:00
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), title);
|
|
|
|
} else {
|
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), text);
|
|
|
|
}
|
2011-11-18 13:13:02 +00:00
|
|
|
SET_TEXT_VALUE(divemaster);
|
|
|
|
SET_TEXT_VALUE(buddy);
|
|
|
|
SET_TEXT_VALUE(location);
|
2012-08-14 23:07:25 +00:00
|
|
|
SET_TEXT_VALUE(suit);
|
2011-12-07 19:58:16 +00:00
|
|
|
gtk_entry_set_text(rating, star_strings[dive->rating]);
|
2011-11-19 15:11:56 +00:00
|
|
|
gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
|
|
|
|
dive && dive->notes ? dive->notes : "", -1);
|
2011-09-01 01:30:42 +00:00
|
|
|
}
|
|
|
|
|
2012-04-03 02:19:01 +00:00
|
|
|
static int delete_dive_info(struct dive *dive)
|
|
|
|
{
|
|
|
|
int success;
|
|
|
|
GtkWidget *dialog;
|
|
|
|
|
|
|
|
if (!dive)
|
|
|
|
return 0;
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
dialog = gtk_dialog_new_with_buttons(_("Delete Dive"),
|
2012-04-03 02:19:01 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2011-11-19 17:06:20 +00:00
|
|
|
static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
|
|
|
|
{
|
2012-08-21 22:37:38 +00:00
|
|
|
edit_multi_dive_info(NULL);
|
2011-11-19 17:06:20 +00:00
|
|
|
}
|
|
|
|
|
2012-04-03 02:19:01 +00:00
|
|
|
static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
|
|
|
|
{
|
2012-08-16 19:48:29 +00:00
|
|
|
/* this needs to delete all the selected dives as well, I guess? */
|
2012-04-03 02:19:01 +00:00
|
|
|
delete_dive_info(current_dive);
|
|
|
|
}
|
|
|
|
|
2012-07-29 10:15:04 +00:00
|
|
|
static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, void (*cb)(GtkMenuItem *, gpointer))
|
2011-11-19 17:06:20 +00:00
|
|
|
{
|
2012-07-29 10:15:04 +00:00
|
|
|
GtkWidget *item;
|
|
|
|
if (icon) {
|
|
|
|
GtkWidget *image;
|
|
|
|
item = gtk_image_menu_item_new_with_label(label);
|
|
|
|
image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU);
|
|
|
|
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
|
|
|
|
} else {
|
|
|
|
item = gtk_menu_item_new_with_label(label);
|
|
|
|
}
|
2012-04-03 02:19:01 +00:00
|
|
|
g_signal_connect(item, "activate", G_CALLBACK(cb), NULL);
|
2011-11-19 17:06:20 +00:00
|
|
|
gtk_widget_show(item); /* Yes, really */
|
|
|
|
gtk_menu_prepend(menu, item);
|
|
|
|
}
|
|
|
|
|
2012-04-03 02:19:01 +00:00
|
|
|
static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
|
|
|
|
{
|
2012-10-11 00:42:59 +00:00
|
|
|
add_menu_item(menu, _("Delete"), GTK_STOCK_DELETE, info_menu_delete_cb);
|
|
|
|
add_menu_item(menu, _("Edit"), GTK_STOCK_EDIT, info_menu_edit_cb);
|
2012-04-03 02:19:01 +00:00
|
|
|
}
|
|
|
|
|
2011-11-18 13:13:02 +00:00
|
|
|
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);
|
2011-11-19 17:06:20 +00:00
|
|
|
g_signal_connect(widget, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
|
2011-11-18 13:13:02 +00:00
|
|
|
return GTK_ENTRY(widget);
|
|
|
|
}
|
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text)
|
2011-09-04 12:38:01 +00:00
|
|
|
{
|
2011-10-23 07:07:01 +00:00
|
|
|
GtkEntry *entry;
|
|
|
|
GtkWidget *combo_box;
|
2011-09-04 12:38:01 +00:00
|
|
|
GtkWidget *frame = gtk_frame_new(label);
|
2011-10-23 07:07:01 +00:00
|
|
|
GtkEntryCompletion *completion;
|
2011-09-04 12:38:01 +00:00
|
|
|
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
|
|
|
|
|
2011-10-23 07:07:01 +00:00
|
|
|
combo_box = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(completions), 0);
|
|
|
|
gtk_container_add(GTK_CONTAINER(frame), combo_box);
|
2011-09-04 12:38:01 +00:00
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
|
|
|
|
if (text && *text)
|
|
|
|
gtk_entry_set_text(entry, text);
|
2011-10-23 07:07:01 +00:00
|
|
|
|
|
|
|
completion = gtk_entry_completion_new();
|
|
|
|
gtk_entry_completion_set_text_column(completion, 0);
|
|
|
|
gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(completions));
|
2011-10-23 08:00:48 +00:00
|
|
|
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);
|
2011-10-23 07:07:01 +00:00
|
|
|
gtk_entry_set_completion(entry, completion);
|
2012-10-01 19:22:12 +00:00
|
|
|
g_object_unref(completion);
|
2011-10-23 06:47:19 +00:00
|
|
|
|
2011-10-23 07:07:01 +00:00
|
|
|
return GTK_COMBO_BOX_ENTRY(combo_box);
|
2011-09-04 12:38:01 +00:00
|
|
|
}
|
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
enum writable {
|
|
|
|
READ_ONLY,
|
|
|
|
READ_WRITE
|
|
|
|
};
|
|
|
|
|
|
|
|
static GtkTextView *text_view(GtkWidget *box, const char *label, enum writable writable)
|
2011-09-01 03:36:51 +00:00
|
|
|
{
|
2011-09-11 23:34:01 +00:00
|
|
|
GtkWidget *view, *vbox;
|
2011-09-01 03:36:51 +00:00
|
|
|
GtkWidget *frame = gtk_frame_new(label);
|
2011-09-02 02:56:04 +00:00
|
|
|
|
2011-09-11 23:34:01 +00:00
|
|
|
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);
|
2011-09-02 02:56:04 +00:00
|
|
|
|
2011-09-11 23:34:01 +00:00
|
|
|
GtkWidget* scrolled_window = gtk_scrolled_window_new(0, 0);
|
2011-09-04 13:08:01 +00:00
|
|
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
2011-09-04 00:37:22 +00:00
|
|
|
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
|
|
|
|
|
2011-09-11 23:34:01 +00:00
|
|
|
view = gtk_text_view_new();
|
2011-11-19 15:11:56 +00:00
|
|
|
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);
|
2011-11-19 17:06:20 +00:00
|
|
|
g_signal_connect(view, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
|
2011-11-19 15:11:56 +00:00
|
|
|
}
|
2011-09-04 13:08:01 +00:00
|
|
|
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
|
2011-09-04 00:37:22 +00:00
|
|
|
gtk_container_add(GTK_CONTAINER(scrolled_window), view);
|
2011-09-11 23:34:01 +00:00
|
|
|
gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
|
2011-11-19 15:11:56 +00:00
|
|
|
return GTK_TEXT_VIEW(view);
|
2011-09-01 03:36:51 +00:00
|
|
|
}
|
|
|
|
|
2011-10-23 07:20:35 +00:00
|
|
|
static enum {
|
|
|
|
MATCH_EXACT,
|
|
|
|
MATCH_PREPEND,
|
|
|
|
MATCH_AFTER
|
|
|
|
} found_string_entry;
|
|
|
|
static GtkTreeIter string_entry_location;
|
2011-10-23 06:47:19 +00:00
|
|
|
|
|
|
|
static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
|
|
|
|
{
|
|
|
|
const char *string = data;
|
|
|
|
char *entry;
|
2011-10-23 07:20:35 +00:00
|
|
|
int cmp;
|
2011-10-23 06:47:19 +00:00
|
|
|
|
|
|
|
gtk_tree_model_get(model, iter, 0, &entry, -1);
|
2011-10-23 07:20:35 +00:00
|
|
|
cmp = strcmp(entry, string);
|
2012-08-14 21:52:14 +00:00
|
|
|
if (entry)
|
|
|
|
free(entry);
|
2011-10-23 07:20:35 +00:00
|
|
|
|
|
|
|
/* 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;
|
2011-10-23 06:47:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int match_list(GtkListStore *list, const char *string)
|
|
|
|
{
|
2011-10-23 07:20:35 +00:00
|
|
|
found_string_entry = MATCH_PREPEND;
|
2011-10-23 06:47:19 +00:00
|
|
|
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)
|
|
|
|
{
|
2011-10-23 07:20:35 +00:00
|
|
|
GtkTreeIter *iter, loc;
|
2011-10-23 06:47:19 +00:00
|
|
|
|
|
|
|
if (!string || !*string)
|
|
|
|
return;
|
|
|
|
|
2011-10-23 07:20:35 +00:00
|
|
|
switch (match_list(list, string)) {
|
|
|
|
case MATCH_EXACT:
|
2011-10-23 06:47:19 +00:00
|
|
|
return;
|
2011-10-23 07:20:35 +00:00
|
|
|
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);
|
2011-10-23 06:47:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2012-08-14 23:07:25 +00:00
|
|
|
void add_suit(const char *string)
|
|
|
|
{
|
|
|
|
add_string_list_entry(string, suit_list);
|
|
|
|
}
|
|
|
|
|
2011-12-07 19:58:16 +00:00
|
|
|
static int get_rating(const char *string)
|
|
|
|
{
|
2012-01-05 16:16:08 +00:00
|
|
|
int rating_val = 0;
|
2011-12-07 19:58:16 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i <= 5; i++)
|
|
|
|
if (!strcmp(star_strings[i],string))
|
2012-01-05 16:16:08 +00:00
|
|
|
rating_val = i;
|
|
|
|
return rating_val;
|
2011-12-07 19:58:16 +00:00
|
|
|
}
|
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
struct dive_info {
|
2012-08-14 23:07:25 +00:00
|
|
|
GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit;
|
2011-11-19 15:11:56 +00:00
|
|
|
GtkTextView *notes;
|
|
|
|
};
|
|
|
|
|
2012-08-17 03:30:32 +00:00
|
|
|
static void save_dive_info_changes(struct dive *dive, struct dive *master, struct dive_info *info)
|
2011-11-19 15:11:56 +00:00
|
|
|
{
|
|
|
|
char *old_text, *new_text;
|
2011-12-07 19:58:16 +00:00
|
|
|
char *rating_string;
|
2011-11-19 15:11:56 +00:00
|
|
|
int changed = 0;
|
|
|
|
|
2012-08-17 03:30:32 +00:00
|
|
|
new_text = get_combo_box_entry_text(info->location, &dive->location, master->location);
|
2011-11-19 15:11:56 +00:00
|
|
|
if (new_text) {
|
|
|
|
add_location(new_text);
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
|
2012-08-17 03:30:32 +00:00
|
|
|
new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster, master->divemaster);
|
2011-11-19 15:11:56 +00:00
|
|
|
if (new_text) {
|
|
|
|
add_people(new_text);
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
|
2012-08-17 03:30:32 +00:00
|
|
|
new_text = get_combo_box_entry_text(info->buddy, &dive->buddy, master->buddy);
|
2011-11-19 15:11:56 +00:00
|
|
|
if (new_text) {
|
|
|
|
add_people(new_text);
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
|
2012-08-17 03:30:32 +00:00
|
|
|
new_text = get_combo_box_entry_text(info->suit, &dive->suit, master->suit);
|
2012-08-14 23:07:25 +00:00
|
|
|
if (new_text) {
|
|
|
|
add_suit(new_text);
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
|
2011-12-07 19:58:16 +00:00
|
|
|
rating_string = strdup(star_strings[dive->rating]);
|
2012-08-17 03:30:32 +00:00
|
|
|
new_text = get_combo_box_entry_text(info->rating, &rating_string, star_strings[master->rating]);
|
2011-12-07 19:58:16 +00:00
|
|
|
if (new_text) {
|
|
|
|
dive->rating = get_rating(rating_string);
|
2012-10-01 19:22:12 +00:00
|
|
|
changed = 1;
|
2011-12-07 19:58:16 +00:00
|
|
|
}
|
2012-10-01 19:22:12 +00:00
|
|
|
free(rating_string);
|
2011-12-07 19:58:16 +00:00
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
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);
|
|
|
|
}
|
2011-11-19 15:11:56 +00:00
|
|
|
if (changed) {
|
|
|
|
mark_divelist_changed(TRUE);
|
2012-04-25 02:05:56 +00:00
|
|
|
update_dive(dive);
|
2011-11-19 15:11:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-20 03:42:11 +00:00
|
|
|
static void dive_trip_widget(GtkWidget *box, dive_trip_t *trip, struct dive_info *info)
|
2012-08-31 23:26:04 +00:00
|
|
|
{
|
|
|
|
GtkWidget *hbox, *label;
|
2012-10-11 00:42:59 +00:00
|
|
|
char buffer[80] = N_("Edit trip summary");
|
2012-08-31 23:26:04 +00:00
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
label = gtk_label_new(_(buffer));
|
2012-08-31 23:26:04 +00:00
|
|
|
gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
info->location = text_entry(box, _("Location"), location_list, trip->location);
|
2012-08-31 23:26:04 +00:00
|
|
|
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
info->notes = text_view(box, _("Notes"), READ_WRITE);
|
2012-08-31 23:26:04 +00:00
|
|
|
if (trip->notes && *trip->notes)
|
|
|
|
gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), trip->notes, -1);
|
|
|
|
}
|
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info, gboolean multi)
|
2011-11-19 15:11:56 +00:00
|
|
|
{
|
2012-08-15 22:21:34 +00:00
|
|
|
GtkWidget *hbox, *label, *frame, *equipment;
|
2012-10-15 20:29:37 +00:00
|
|
|
char buffer[80];
|
|
|
|
|
|
|
|
snprintf(buffer, sizeof(buffer), "%s", _("Edit multiple dives"));
|
2011-11-19 17:23:58 +00:00
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
if (!multi)
|
2012-10-15 20:29:37 +00:00
|
|
|
divename(buffer, sizeof(buffer), dive);
|
|
|
|
label = gtk_label_new(buffer);
|
2011-11-19 17:23:58 +00:00
|
|
|
gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
|
2011-11-19 15:11:56 +00:00
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
info->location = text_entry(box, _("Location"), location_list, dive->location);
|
2011-11-19 15:11:56 +00:00
|
|
|
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
info->divemaster = text_entry(hbox, _("Dive master"), people_list, dive->divemaster);
|
|
|
|
info->buddy = text_entry(hbox, _("Buddy"), people_list, dive->buddy);
|
2011-12-12 17:24:47 +00:00
|
|
|
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
info->rating = text_entry(hbox, _("Rating"), star_list, star_strings[dive->rating]);
|
|
|
|
info->suit = text_entry(hbox, _("Suit"), suit_list, dive->suit);
|
2011-11-19 15:11:56 +00:00
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
/* only show notes if editing a single dive */
|
|
|
|
if (multi) {
|
|
|
|
info->notes = NULL;
|
|
|
|
} else {
|
2012-10-11 00:42:59 +00:00
|
|
|
info->notes = text_view(box, _("Notes"), READ_WRITE);
|
2012-08-15 22:21:34 +00:00
|
|
|
if (dive->notes && *dive->notes)
|
|
|
|
gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
|
|
|
|
}
|
2011-12-11 19:09:37 +00:00
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
/* create a secondary Equipment widget */
|
2012-10-11 00:42:59 +00:00
|
|
|
frame = gtk_frame_new(_("Equipment"));
|
2012-08-15 22:21:34 +00:00
|
|
|
equipment = equipment_widget(W_IDX_SECONDARY);
|
|
|
|
gtk_container_add(GTK_CONTAINER(frame), equipment);
|
2011-12-11 19:09:37 +00:00
|
|
|
gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
|
2011-11-19 15:11:56 +00:00
|
|
|
}
|
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
/* 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];
|
2012-08-18 15:28:52 +00:00
|
|
|
#define CYL_BYTES sizeof(cylinder_t) * MAX_CYLINDERS
|
|
|
|
#define WS_BYTES sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS
|
2012-08-15 22:21:34 +00:00
|
|
|
|
2012-09-11 20:37:06 +00:00
|
|
|
static void save_equipment_data(struct dive *dive)
|
2011-11-19 15:11:56 +00:00
|
|
|
{
|
2012-08-15 22:21:34 +00:00
|
|
|
if (dive) {
|
2012-08-18 15:28:52 +00:00
|
|
|
memcpy(remember_cyl, dive->cylinder, CYL_BYTES);
|
|
|
|
memcpy(remember_ws, dive->weightsystem, WS_BYTES);
|
2012-08-15 22:21:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-24 19:03:58 +00:00
|
|
|
/* Empty and NULL compare equal */
|
|
|
|
static int same_string(const char *a, const char *b)
|
|
|
|
{
|
|
|
|
/* Both NULL or same */
|
|
|
|
if (a == b)
|
|
|
|
return 1;
|
|
|
|
/* Both non-NULL: strcmp */
|
|
|
|
if (a && b)
|
|
|
|
return !strcmp(a, b);
|
|
|
|
/* One non-NULL? Is that one empty? */
|
|
|
|
return !*(a ? a : b);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int same_type(cylinder_t *dst, cylinder_t *src)
|
|
|
|
{
|
|
|
|
return dst->type.size.mliter == src->type.size.mliter &&
|
|
|
|
dst->type.workingpressure.mbar == src->type.workingpressure.mbar &&
|
|
|
|
same_string(dst->type.description, src->type.description);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void copy_type(cylinder_t *dst, cylinder_t *src)
|
|
|
|
{
|
|
|
|
dst->type.size = src->type.size;
|
|
|
|
dst->type.workingpressure = src->type.workingpressure;
|
|
|
|
if (dst->type.description)
|
|
|
|
free((void *)dst->type.description);
|
|
|
|
if (!src->type.description || !*src->type.description)
|
|
|
|
dst->type.description = NULL;
|
|
|
|
else
|
|
|
|
dst->type.description = strdup((char *)src->type.description);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int same_gasmix(cylinder_t *dst, cylinder_t *src)
|
|
|
|
{
|
|
|
|
return !memcmp(&dst->gasmix, &src->gasmix, sizeof(dst->gasmix));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void copy_gasmix(cylinder_t *dst, cylinder_t *src)
|
|
|
|
{
|
|
|
|
memcpy(&dst->gasmix, &src->gasmix, sizeof(dst->gasmix));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int same_press(cylinder_t *dst, cylinder_t *src)
|
|
|
|
{
|
|
|
|
return dst->start.mbar == src->start.mbar &&
|
|
|
|
dst->end.mbar == src->end.mbar;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void copy_press(cylinder_t *dst, cylinder_t *src)
|
|
|
|
{
|
|
|
|
dst->start = src->start;
|
|
|
|
dst->end = src->end;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When we update the cylinder information, we do it individually
|
|
|
|
* by type/gasmix/pressure, so that you can change them separately.
|
|
|
|
*
|
|
|
|
* The rule is: the destination has to be the same as the original
|
|
|
|
* field, and the source has to have changed. If so, we change the
|
|
|
|
* destination field.
|
|
|
|
*/
|
|
|
|
static void update_cylinder(cylinder_t *dst, cylinder_t *src, cylinder_t *orig)
|
|
|
|
{
|
|
|
|
/* Destination type same? Change it */
|
|
|
|
if (same_type(dst, orig) && !same_type(src, orig))
|
|
|
|
copy_type(dst, src);
|
|
|
|
|
|
|
|
/* Destination gasmix same? Change it */
|
|
|
|
if (same_gasmix(dst, orig) && !same_gasmix(src, orig))
|
|
|
|
copy_gasmix(dst, src);
|
|
|
|
|
|
|
|
/* Destination pressures the same? */
|
|
|
|
if (same_press(dst, orig) && !same_press(src, orig))
|
|
|
|
copy_press(dst, src);
|
|
|
|
}
|
|
|
|
|
2012-08-18 15:28:52 +00:00
|
|
|
/* the editing happens on the master dive; we copy the equipment
|
|
|
|
data if it has changed in the master dive and the other dive
|
|
|
|
either has no entries for the equipment or the same entries
|
|
|
|
as the master dive had before it was edited */
|
2012-08-15 22:21:34 +00:00
|
|
|
void update_equipment_data(struct dive *dive, struct dive *master)
|
|
|
|
{
|
2012-09-24 19:03:58 +00:00
|
|
|
int i;
|
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
if (dive == master)
|
|
|
|
return;
|
2012-09-24 19:03:58 +00:00
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++)
|
|
|
|
update_cylinder(dive->cylinder+i, master->cylinder+i, remember_cyl+i);
|
2012-08-18 15:28:52 +00:00
|
|
|
if (! weightsystems_equal(remember_ws, master->weightsystem) &&
|
|
|
|
(no_weightsystems(dive->weightsystem) ||
|
|
|
|
weightsystems_equal(dive->weightsystem, remember_ws)))
|
|
|
|
memcpy(dive->weightsystem, master->weightsystem, WS_BYTES);
|
2012-08-15 22:21:34 +00:00
|
|
|
}
|
|
|
|
|
2012-09-20 03:42:11 +00:00
|
|
|
gboolean edit_trip(dive_trip_t *trip)
|
2012-08-31 23:26:04 +00:00
|
|
|
{
|
|
|
|
GtkWidget *dialog, *vbox;
|
|
|
|
int success;
|
|
|
|
gboolean changed = FALSE;
|
|
|
|
char *old_text, *new_text;
|
|
|
|
struct dive_info info;
|
|
|
|
|
|
|
|
memset(&info, 0, sizeof(struct dive_info));
|
2012-10-11 00:42:59 +00:00
|
|
|
dialog = gtk_dialog_new_with_buttons(_("Edit Trip Info"),
|
2012-08-31 23:26:04 +00:00
|
|
|
GTK_WINDOW(main_window),
|
|
|
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
|
|
|
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
|
|
|
|
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
|
|
|
|
NULL);
|
2012-09-29 11:58:24 +00:00
|
|
|
gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 300);
|
2012-08-31 23:26:04 +00:00
|
|
|
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
|
|
|
|
dive_trip_widget(vbox, trip, &info);
|
|
|
|
gtk_widget_show_all(dialog);
|
|
|
|
success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
|
|
|
|
if (success) {
|
|
|
|
/* we need to store the edited location and notes */
|
|
|
|
new_text = get_combo_box_entry_text(info.location, &trip->location, trip->location);
|
|
|
|
if (new_text) {
|
|
|
|
add_location(new_text);
|
2012-09-02 18:17:31 +00:00
|
|
|
changed = TRUE;
|
2012-08-31 23:26:04 +00:00
|
|
|
}
|
|
|
|
if (info.notes) {
|
|
|
|
old_text = trip->notes;
|
|
|
|
trip->notes = get_text(info.notes);
|
|
|
|
if (text_changed(old_text, trip->notes))
|
2012-09-02 18:17:31 +00:00
|
|
|
changed = TRUE;
|
2012-08-31 23:26:04 +00:00
|
|
|
if (old_text)
|
|
|
|
g_free(old_text);
|
|
|
|
}
|
2012-09-20 03:42:11 +00:00
|
|
|
if (changed)
|
2012-08-31 23:26:04 +00:00
|
|
|
mark_divelist_changed(TRUE);
|
|
|
|
}
|
|
|
|
gtk_widget_destroy(dialog);
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
2012-08-21 22:37:38 +00:00
|
|
|
int edit_multi_dive_info(struct dive *single_dive)
|
2012-08-15 22:21:34 +00:00
|
|
|
{
|
2012-08-20 12:48:07 +00:00
|
|
|
int success;
|
2011-11-19 15:11:56 +00:00
|
|
|
GtkWidget *dialog, *vbox;
|
|
|
|
struct dive_info info;
|
2012-08-17 03:30:32 +00:00
|
|
|
struct dive *master;
|
2012-08-21 21:35:08 +00:00
|
|
|
gboolean multi;
|
2011-11-19 15:11:56 +00:00
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
dialog = gtk_dialog_new_with_buttons(_("Dive Info"),
|
2011-11-19 15:11:56 +00:00
|
|
|
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));
|
2012-08-21 22:37:38 +00:00
|
|
|
master = single_dive;
|
2012-08-20 12:48:07 +00:00
|
|
|
if (!master)
|
|
|
|
master = current_dive;
|
2012-08-21 21:35:08 +00:00
|
|
|
|
|
|
|
/* See if we should use multi dive mode */
|
|
|
|
multi = FALSE;
|
2012-08-28 20:16:57 +00:00
|
|
|
if (!single_dive) {
|
2012-08-21 21:35:08 +00:00
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
|
2012-08-28 20:16:57 +00:00
|
|
|
for_each_dive(i, dive) {
|
2012-08-21 21:35:08 +00:00
|
|
|
if (dive != master && dive->selected) {
|
|
|
|
multi = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-09-11 20:37:06 +00:00
|
|
|
/* edit a temporary copy of the master dive;
|
|
|
|
* edit_dive is a global dive structure that is modified by the
|
|
|
|
* cylinder / weightsystem dialogs if we open W_IDX_SECONDARY
|
|
|
|
* edit widgets as we do here */
|
|
|
|
memcpy(&edit_dive, master, sizeof(struct dive));
|
|
|
|
|
|
|
|
dive_info_widget(vbox, &edit_dive, &info, multi);
|
|
|
|
show_dive_equipment(&edit_dive, W_IDX_SECONDARY);
|
|
|
|
save_equipment_data(&edit_dive);
|
2011-11-19 15:11:56 +00:00
|
|
|
gtk_widget_show_all(dialog);
|
|
|
|
success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
|
2012-08-17 03:30:32 +00:00
|
|
|
if (success) {
|
2012-09-11 20:37:06 +00:00
|
|
|
mark_divelist_changed(TRUE);
|
2012-08-20 12:48:07 +00:00
|
|
|
/* Update the non-current selected dives first */
|
2012-08-21 22:37:38 +00:00
|
|
|
if (!single_dive) {
|
2012-08-20 12:48:07 +00:00
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
|
2012-08-21 22:51:34 +00:00
|
|
|
for_each_dive(i, dive) {
|
2012-08-20 12:48:07 +00:00
|
|
|
if (dive == master || !dive->selected)
|
|
|
|
continue;
|
|
|
|
/* copy all "info" fields */
|
2012-09-11 20:37:06 +00:00
|
|
|
save_dive_info_changes(dive, &edit_dive, &info);
|
2012-08-20 12:48:07 +00:00
|
|
|
/* copy the cylinders / weightsystems */
|
2012-09-11 20:37:06 +00:00
|
|
|
update_equipment_data(dive, &edit_dive);
|
2012-08-20 12:48:07 +00:00
|
|
|
/* this is extremely inefficient... it loops through all
|
|
|
|
dives to find the right one - but we KNOW the index already */
|
2012-09-11 20:37:06 +00:00
|
|
|
update_cylinder_related_info(dive);
|
2012-08-20 12:48:07 +00:00
|
|
|
flush_divelist(dive);
|
|
|
|
}
|
2012-08-15 22:21:34 +00:00
|
|
|
}
|
2012-08-17 03:30:32 +00:00
|
|
|
|
|
|
|
/* Update the master dive last! */
|
2012-09-11 20:37:06 +00:00
|
|
|
save_dive_info_changes(master, &edit_dive, &info);
|
|
|
|
update_equipment_data(master, &edit_dive);
|
|
|
|
update_cylinder_related_info(master);
|
2012-08-17 03:30:32 +00:00
|
|
|
flush_divelist(master);
|
2012-09-11 20:37:06 +00:00
|
|
|
process_selected_dives();
|
|
|
|
update_dive(master);
|
2012-08-17 03:30:32 +00:00
|
|
|
}
|
2011-11-19 15:11:56 +00:00
|
|
|
gtk_widget_destroy(dialog);
|
|
|
|
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
2012-08-15 22:21:34 +00:00
|
|
|
int edit_dive_info(struct dive *dive)
|
|
|
|
{
|
|
|
|
if (!dive)
|
|
|
|
return 0;
|
2012-08-21 22:37:38 +00:00
|
|
|
return edit_multi_dive_info(dive);
|
2012-08-15 22:21:34 +00:00
|
|
|
}
|
|
|
|
|
2012-06-28 01:56:41 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-06-27 20:11:54 +00:00
|
|
|
/* Fixme - should do at least depths too - a dive without a depth is kind of pointless */
|
2012-09-20 00:35:52 +00:00
|
|
|
static timestamp_t dive_time_widget(struct dive *dive)
|
2012-06-27 20:11:54 +00:00
|
|
|
{
|
|
|
|
GtkWidget *dialog;
|
2012-06-28 01:56:41 +00:00
|
|
|
GtkWidget *cal, *hbox, *vbox, *box;
|
2012-06-27 20:11:54 +00:00
|
|
|
GtkWidget *h, *m;
|
2012-06-27 21:29:29 +00:00
|
|
|
GtkWidget *duration, *depth;
|
2012-06-27 20:11:54 +00:00
|
|
|
GtkWidget *label;
|
|
|
|
guint yval, mval, dval;
|
2012-08-18 18:47:29 +00:00
|
|
|
struct tm tm, *time;
|
2012-06-27 20:11:54 +00:00
|
|
|
int success;
|
2012-06-27 21:29:29 +00:00
|
|
|
double depthinterval, val;
|
2012-06-27 20:11:54 +00:00
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
dialog = gtk_dialog_new_with_buttons(_("Date and Time"),
|
2012-06-27 20:11:54 +00:00
|
|
|
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 */
|
2012-10-11 00:42:59 +00:00
|
|
|
hbox = frame_box(vbox, _("Date:"));
|
2012-06-27 20:11:54 +00:00
|
|
|
cal = gtk_calendar_new();
|
|
|
|
gtk_box_pack_start(GTK_BOX(hbox), cal, FALSE, TRUE, 0);
|
|
|
|
|
2012-06-28 01:56:41 +00:00
|
|
|
/* Time hbox */
|
2012-10-11 00:42:59 +00:00
|
|
|
hbox = frame_box(vbox, _("Time"));
|
2012-06-27 20:11:54 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
|
2012-08-18 18:47:29 +00:00
|
|
|
/*
|
|
|
|
* If we have a dive selected, 'add dive' will default
|
|
|
|
* to one hour after the end of that dive. Otherwise,
|
|
|
|
* we'll just take the current time.
|
|
|
|
*/
|
|
|
|
if (amount_selected == 1) {
|
2012-09-20 00:35:52 +00:00
|
|
|
timestamp_t when = current_dive->when;
|
2012-08-18 18:47:29 +00:00
|
|
|
when += current_dive->duration.seconds;
|
|
|
|
when += 60*60;
|
2012-09-20 00:35:52 +00:00
|
|
|
utc_mkdate(when, &tm);
|
|
|
|
time = &tm;
|
2012-08-18 18:47:29 +00:00
|
|
|
} else {
|
2012-09-20 17:53:45 +00:00
|
|
|
time_t now;
|
2012-08-18 18:47:29 +00:00
|
|
|
struct timeval tv;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
now = tv.tv_sec;
|
|
|
|
time = localtime(&now);
|
|
|
|
}
|
|
|
|
gtk_calendar_select_month(GTK_CALENDAR(cal), time->tm_mon, time->tm_year + 1900);
|
|
|
|
gtk_calendar_select_day(GTK_CALENDAR(cal), time->tm_mday);
|
|
|
|
gtk_spin_button_set_value(GTK_SPIN_BUTTON(h), time->tm_hour);
|
|
|
|
gtk_spin_button_set_value(GTK_SPIN_BUTTON(m), (time->tm_min / 5)*5);
|
2012-06-28 01:56:41 +00:00
|
|
|
|
2012-06-27 20:11:54 +00:00
|
|
|
gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(h), TRUE);
|
|
|
|
gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(m), TRUE);
|
|
|
|
|
2012-06-28 01:56:41 +00:00
|
|
|
gtk_box_pack_end(GTK_BOX(hbox), m, FALSE, FALSE, 0);
|
2012-06-27 20:11:54 +00:00
|
|
|
label = gtk_label_new(":");
|
2012-06-28 01:56:41 +00:00
|
|
|
gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
|
|
|
|
gtk_box_pack_end(GTK_BOX(hbox), h, FALSE, FALSE, 0);
|
2012-06-27 20:11:54 +00:00
|
|
|
|
2012-06-28 01:56:41 +00:00
|
|
|
hbox = gtk_hbox_new(TRUE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
|
2012-06-27 20:11:54 +00:00
|
|
|
|
2012-06-28 01:56:41 +00:00
|
|
|
/* Duration hbox */
|
2012-10-11 00:42:59 +00:00
|
|
|
box = frame_box(hbox, _("Duration (min)"));
|
2012-06-28 01:56:41 +00:00
|
|
|
duration = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
|
|
|
|
gtk_box_pack_end(GTK_BOX(box), duration, FALSE, FALSE, 0);
|
2012-06-27 21:29:29 +00:00
|
|
|
|
2012-06-28 01:56:41 +00:00
|
|
|
/* Depth box */
|
2012-10-11 00:42:59 +00:00
|
|
|
box = frame_box(hbox, _("Depth (%s):"), output_units.length == FEET ? "ft" : "m");
|
2012-06-27 21:29:29 +00:00
|
|
|
if (output_units.length == FEET) {
|
|
|
|
depthinterval = 1.0;
|
|
|
|
} else {
|
|
|
|
depthinterval = 0.1;
|
|
|
|
}
|
|
|
|
depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval);
|
2012-06-28 01:56:41 +00:00
|
|
|
gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0);
|
2012-06-27 21:29:29 +00:00
|
|
|
|
|
|
|
/* All done, show it and wait for editing */
|
2012-06-27 20:11:54 +00:00
|
|
|
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));
|
|
|
|
|
2012-06-27 21:29:29 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-06-27 20:11:54 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2011-09-04 17:01:30 +00:00
|
|
|
GtkWidget *extended_dive_info_widget(void)
|
2011-09-01 01:30:42 +00:00
|
|
|
{
|
2011-09-13 21:58:06 +00:00
|
|
|
GtkWidget *vbox, *hbox;
|
2011-09-04 15:08:40 +00:00
|
|
|
vbox = gtk_vbox_new(FALSE, 6);
|
2011-09-01 01:30:42 +00:00
|
|
|
|
2011-10-23 06:47:19 +00:00
|
|
|
people_list = gtk_list_store_new(1, G_TYPE_STRING);
|
|
|
|
location_list = gtk_list_store_new(1, G_TYPE_STRING);
|
2011-12-07 19:58:16 +00:00
|
|
|
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);
|
2012-08-14 23:07:25 +00:00
|
|
|
suit_list = gtk_list_store_new(1, G_TYPE_STRING);
|
2011-10-23 06:47:19 +00:00
|
|
|
|
2011-09-04 15:08:40 +00:00
|
|
|
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
|
2012-10-11 00:42:59 +00:00
|
|
|
location = text_value(vbox, _("Location"));
|
2011-09-13 21:58:06 +00:00
|
|
|
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
divemaster = text_value(hbox, _("Divemaster"));
|
|
|
|
buddy = text_value(hbox, _("Buddy"));
|
2011-12-12 17:24:47 +00:00
|
|
|
|
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
|
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
rating = text_value(hbox, _("Rating"));
|
|
|
|
suit = text_value(hbox, _("Suit"));
|
2011-09-13 21:58:06 +00:00
|
|
|
|
2012-10-11 00:42:59 +00:00
|
|
|
notes = text_view(vbox, _("Notes"), READ_ONLY);
|
2011-09-04 15:08:40 +00:00
|
|
|
return vbox;
|
2011-08-31 19:09:19 +00:00
|
|
|
}
|