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.
|
|
|
|
*/
|
2013-01-28 00:40:01 +00:00
|
|
|
static char *get_combo_box_entry_text(GtkComboBox *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;
|
|
|
|
|
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;
|
|
|
|
|
2013-01-28 00:40:01 +00:00
|
|
|
new = get_active_text(combo_box);
|
2011-11-03 05:11:31 +00:00
|
|
|
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-17 08:21:03 +00:00
|
|
|
/*++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min */
|
|
|
|
return snprintf(buf, size, _("Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$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
|
|
|
{
|
2012-10-17 21:43:48 +00:00
|
|
|
const char *subs = "Subsurface: ";
|
2011-09-20 05:09:47 +00:00
|
|
|
const char *text;
|
2012-10-17 21:43:48 +00:00
|
|
|
const int maxlen = 128;
|
2012-09-18 11:24:54 +00:00
|
|
|
char *basename;
|
2012-10-17 21:43:48 +00:00
|
|
|
char *title;
|
|
|
|
char *buffer = NULL;
|
|
|
|
int len1, len2, sz;
|
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);
|
2012-10-17 21:43:48 +00:00
|
|
|
len1 = strlen(subs);
|
|
|
|
len2 = g_utf8_strlen(basename, -1);
|
|
|
|
sz = (len1 + len2 + 1) * sizeof(gunichar);
|
|
|
|
title = malloc(sz);
|
|
|
|
strncpy(title, subs, len1);
|
|
|
|
g_utf8_strncpy(title + len1, basename, len2);
|
2012-09-15 12:29:12 +00:00
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), title);
|
2012-10-17 21:43:48 +00:00
|
|
|
free(basename);
|
|
|
|
free(title);
|
2012-09-15 12:29:12 +00:00
|
|
|
} 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);
|
2012-10-19 03:45:26 +00:00
|
|
|
show_dive_equipment(NULL, W_IDX_PRIMARY);
|
2012-09-10 21:32:55 +00:00
|
|
|
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-16 15:33:03 +00:00
|
|
|
if (dive->number) {
|
2012-10-17 21:43:48 +00:00
|
|
|
len1 = g_utf8_strlen(text, -1);
|
|
|
|
sz = (len1 + 32) * sizeof(gunichar);
|
|
|
|
buffer = malloc(sz);
|
|
|
|
snprintf(buffer, sz, _("Dive #%d - "), dive->number);
|
|
|
|
g_utf8_strncpy(buffer + strlen(buffer), text, len1);
|
2012-10-16 15:33:03 +00:00
|
|
|
text = buffer;
|
|
|
|
}
|
2011-09-20 05:09:47 +00:00
|
|
|
} else {
|
2012-10-17 21:43:48 +00:00
|
|
|
sz = (maxlen + 32) * sizeof(gunichar);
|
|
|
|
buffer = malloc(sz);
|
|
|
|
divename(buffer, sz, dive);
|
2012-10-16 15:33:03 +00:00
|
|
|
text = buffer;
|
2011-09-20 05:09:47 +00:00
|
|
|
}
|
|
|
|
|
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);
|
2012-10-17 21:43:48 +00:00
|
|
|
len1 = g_utf8_strlen(basename, -1);
|
|
|
|
len2 = g_utf8_strlen(text, -1);
|
|
|
|
if (len2 > maxlen)
|
|
|
|
len2 = maxlen;
|
|
|
|
sz = (len1 + len2 + 3) * sizeof(gunichar); /* reserver space for ": " */
|
|
|
|
title = malloc(sz);
|
|
|
|
g_utf8_strncpy(title, basename, len1);
|
|
|
|
strncpy(title + strlen(basename), (const char *)": ", 2);
|
|
|
|
g_utf8_strncpy(title + strlen(basename) + 2, text, len2);
|
2012-09-15 12:29:12 +00:00
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), title);
|
2012-10-17 21:43:48 +00:00
|
|
|
free(basename);
|
|
|
|
free(title);
|
2012-09-15 12:29:12 +00:00
|
|
|
} else {
|
|
|
|
gtk_window_set_title(GTK_WINDOW(main_window), text);
|
|
|
|
}
|
2012-10-17 21:43:48 +00:00
|
|
|
if (buffer)
|
|
|
|
free(buffer);
|
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
|
|
|
}
|
|
|
|
|
2011-11-19 17:06:20 +00:00
|
|
|
static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
|
|
|
|
{
|
2012-10-23 14:42:27 +00:00
|
|
|
if (amount_selected)
|
|
|
|
edit_multi_dive_info(NULL);
|
2011-11-19 17:06:20 +00:00
|
|
|
}
|
|
|
|
|
2013-01-28 00:40:01 +00:00
|
|
|
static void add_menu_item(GtkMenuShell *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 */
|
2013-01-28 00:40:01 +00:00
|
|
|
gtk_menu_shell_prepend(menu, item);
|
2011-11-19 17:06:20 +00:00
|
|
|
}
|
|
|
|
|
2013-01-28 00:40:01 +00:00
|
|
|
static void populate_popup_cb(GtkTextView *entry, GtkMenuShell *menu, gpointer user_data)
|
2012-04-03 02:19:01 +00:00
|
|
|
{
|
2012-10-23 15:39:44 +00:00
|
|
|
if (amount_selected)
|
2012-10-23 14:42:27 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2012-10-28 22:49:02 +00:00
|
|
|
static GtkEntry *single_text_entry(GtkWidget *box, const char *label, const char *text)
|
|
|
|
{
|
|
|
|
GtkEntry *entry;
|
|
|
|
GtkWidget *frame = gtk_frame_new(label);
|
|
|
|
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
|
|
|
|
entry = GTK_ENTRY(gtk_entry_new());
|
|
|
|
gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(entry));
|
|
|
|
if (text && *text)
|
|
|
|
gtk_entry_set_text(entry, text);
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
2013-01-28 00:40:01 +00:00
|
|
|
static GtkComboBox *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
|
|
|
GtkWidget *combo_box;
|
2011-09-04 12:38:01 +00:00
|
|
|
GtkWidget *frame = gtk_frame_new(label);
|
|
|
|
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
|
|
|
|
|
2013-01-28 00:40:01 +00:00
|
|
|
combo_box = combo_box_with_model_and_entry(completions);
|
2011-10-23 07:07:01 +00:00
|
|
|
gtk_container_add(GTK_CONTAINER(frame), combo_box);
|
2011-09-04 12:38:01 +00:00
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
if (text && *text)
|
2013-01-28 00:40:01 +00:00
|
|
|
set_active_text(GTK_COMBO_BOX(combo_box), text);
|
2011-10-23 06:47:19 +00:00
|
|
|
|
2013-01-28 00:40:01 +00:00
|
|
|
return GTK_COMBO_BOX(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 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
|
|
|
}
|
|
|
|
|
2013-01-08 16:48:13 +00:00
|
|
|
int match_list(GtkListStore *list, const char *string)
|
2011-10-23 06:47:19 +00:00
|
|
|
{
|
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;
|
|
|
|
}
|
|
|
|
|
2013-01-06 07:14:42 +00:00
|
|
|
void add_string_list_entry(const char *string, GtkListStore *list)
|
2011-10-23 06:47:19 +00:00
|
|
|
{
|
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
|
|
|
}
|
|
|
|
|
2013-02-03 21:31:45 +00:00
|
|
|
/* this is used to skip the cardinal directions (or check if they are
|
|
|
|
* present). You pass in the text and a STRING with the direction.
|
|
|
|
* This checks for both the standard english text (just one character)
|
|
|
|
* and the translated text (possibly longer) and returns 0 if not found
|
|
|
|
* and the number of chars to skip otherwise. */
|
|
|
|
static int string_advance_cardinal(const char *text, const char *look)
|
|
|
|
{
|
|
|
|
char *trans;
|
|
|
|
int len = strlen(look);
|
|
|
|
if (!strncasecmp(text, look, len))
|
|
|
|
return len;
|
|
|
|
trans = _(look);
|
|
|
|
len = strlen(trans);
|
|
|
|
if (!strncasecmp(text, trans, len))
|
|
|
|
return len;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-27 22:42:14 +00:00
|
|
|
/* this has to be done with UTF8 as people might want to enter the degree symbol */
|
2013-01-27 20:26:27 +00:00
|
|
|
static gboolean parse_gps_text(const char *gps_text, double *latitude, double *longitude)
|
|
|
|
{
|
|
|
|
const char *text = gps_text;
|
2013-01-27 22:42:14 +00:00
|
|
|
char *endptr;
|
|
|
|
gboolean south = FALSE;
|
|
|
|
gboolean west = FALSE;
|
|
|
|
double parselat, parselong;
|
|
|
|
gunichar degrees = UCS4_DEGREE;
|
|
|
|
gunichar c;
|
2013-02-03 21:31:45 +00:00
|
|
|
int incr;
|
2013-01-27 20:26:27 +00:00
|
|
|
|
2013-01-27 22:42:14 +00:00
|
|
|
while (g_unichar_isspace(g_utf8_get_char(text)))
|
|
|
|
text = g_utf8_next_char(text);
|
2013-01-27 20:26:27 +00:00
|
|
|
|
|
|
|
/* an empty string is interpreted as 0.0,0.0 and therefore "no gps location" */
|
|
|
|
if (!*text) {
|
|
|
|
*latitude = 0.0;
|
|
|
|
*longitude = 0.0;
|
|
|
|
return TRUE;
|
|
|
|
}
|
2013-01-27 22:42:14 +00:00
|
|
|
/* ok, let's parse by hand - first degrees of latitude */
|
2013-02-03 21:31:45 +00:00
|
|
|
text += string_advance_cardinal(text, "N");
|
|
|
|
if ((incr = string_advance_cardinal(text, "S")) > 0) {
|
|
|
|
text += incr;
|
2013-01-27 22:42:14 +00:00
|
|
|
south = TRUE;
|
|
|
|
}
|
|
|
|
parselat = strtod(text, &endptr);
|
|
|
|
if (text == endptr)
|
|
|
|
return FALSE;
|
|
|
|
text = endptr;
|
|
|
|
if (parselat < 0.0) {
|
|
|
|
south = TRUE;
|
|
|
|
parselat *= -1;
|
|
|
|
}
|
2013-01-27 20:26:27 +00:00
|
|
|
|
2013-01-27 22:42:14 +00:00
|
|
|
/* next optional minutes as decimal, skipping degree symbol */
|
|
|
|
while (g_unichar_isspace(c = g_utf8_get_char(text)) || c == degrees)
|
|
|
|
text = g_utf8_next_char(text);
|
2013-02-03 21:31:45 +00:00
|
|
|
incr = string_advance_cardinal(text, "E") + string_advance_cardinal(text, "W");
|
|
|
|
if (!incr && c != ';' && c != ',') {
|
2013-01-27 22:42:14 +00:00
|
|
|
parselat += strtod(text, &endptr) / 60.0;
|
|
|
|
if (text == endptr)
|
|
|
|
return FALSE;
|
|
|
|
text = endptr;
|
|
|
|
/* skip trailing minute symbol */
|
|
|
|
if (g_utf8_get_char(text) == '\'')
|
|
|
|
text = g_utf8_next_char(text);
|
|
|
|
}
|
|
|
|
/* skip seperator between latitude and longitude */
|
|
|
|
while (g_unichar_isspace(c = g_utf8_get_char(text)) || c == ';' || c == ',')
|
|
|
|
text = g_utf8_next_char(text);
|
|
|
|
|
|
|
|
/* next degrees of longitude */
|
2013-02-03 21:31:45 +00:00
|
|
|
text += string_advance_cardinal(text, "E");
|
|
|
|
if ((incr = string_advance_cardinal(text, "W")) > 0) {
|
|
|
|
text += incr;
|
2013-01-27 22:42:14 +00:00
|
|
|
west = TRUE;
|
|
|
|
}
|
|
|
|
parselong = strtod(text, &endptr);
|
|
|
|
if (text == endptr)
|
|
|
|
return FALSE;
|
|
|
|
text = endptr;
|
|
|
|
if (parselong < 0.0) {
|
|
|
|
west = TRUE;
|
|
|
|
parselong *= -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* next optional minutes as decimal, skipping degree symbol */
|
|
|
|
while (g_unichar_isspace(c = g_utf8_get_char(text)) || c == degrees)
|
|
|
|
text = g_utf8_next_char(text);
|
|
|
|
if (*text) {
|
|
|
|
parselong += strtod(text, &endptr) / 60.0;
|
|
|
|
if (text == endptr)
|
|
|
|
return FALSE;
|
|
|
|
text = endptr;
|
|
|
|
/* skip trailing minute symbol */
|
|
|
|
if (g_utf8_get_char(text) == '\'')
|
|
|
|
text = g_utf8_next_char(text);
|
|
|
|
/* make sure there's nothing else left on the input */
|
|
|
|
while (g_unichar_isspace(g_utf8_get_char(text)))
|
|
|
|
text = g_utf8_next_char(text);
|
|
|
|
if (*text)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
if (west && parselong > 0.0)
|
|
|
|
parselong *= -1;
|
|
|
|
if (south && parselat > 0.0)
|
|
|
|
parselat *= -1;
|
|
|
|
*latitude = parselat;
|
|
|
|
*longitude = parselong;
|
|
|
|
return TRUE;
|
2013-01-27 20:26:27 +00:00
|
|
|
}
|
|
|
|
|
2013-01-27 19:58:13 +00:00
|
|
|
static gboolean gps_changed(struct dive *dive, struct dive *master, const char *gps_text)
|
|
|
|
{
|
|
|
|
double latitude, longitude;
|
|
|
|
int latudeg, longudeg;
|
|
|
|
|
|
|
|
/* if we have a master and the dive's gps address is different from it,
|
|
|
|
* don't change the dive */
|
|
|
|
if (master && (master->latitude.udeg != dive->latitude.udeg ||
|
|
|
|
master->longitude.udeg != dive->longitude.udeg))
|
|
|
|
return FALSE;
|
2013-01-27 20:26:27 +00:00
|
|
|
|
|
|
|
if (!parse_gps_text(gps_text, &latitude, &longitude))
|
2013-01-27 19:58:13 +00:00
|
|
|
return FALSE;
|
2013-01-27 20:26:27 +00:00
|
|
|
|
2013-01-27 19:58:13 +00:00
|
|
|
latudeg = 1000000 * latitude + 0.5;
|
|
|
|
longudeg = 1000000 * longitude + 0.5;
|
|
|
|
|
|
|
|
/* if master gps didn't change, don't change dive */
|
|
|
|
if (master && master->latitude.udeg == latudeg && master->longitude.udeg == longudeg)
|
|
|
|
return FALSE;
|
|
|
|
/* if dive gps didn't change, nothing changed */
|
|
|
|
if (dive->latitude.udeg == latudeg && dive->longitude.udeg == longudeg)
|
|
|
|
return FALSE;
|
|
|
|
/* ok, update the dive and mark things changed */
|
|
|
|
dive->latitude.udeg = latudeg;
|
|
|
|
dive->longitude.udeg = longudeg;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2011-11-19 15:11:56 +00:00
|
|
|
struct dive_info {
|
2013-01-28 00:40:01 +00:00
|
|
|
GtkComboBox *location, *divemaster, *buddy, *rating, *suit, *viz;
|
2013-01-27 19:58:13 +00:00
|
|
|
GtkEntry *airtemp, *gps;
|
2013-01-28 15:54:30 +00:00
|
|
|
GtkWidget *gps_icon;
|
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;
|
2013-01-27 19:58:13 +00:00
|
|
|
const char *gps_text;
|
2011-12-07 19:58:16 +00:00
|
|
|
char *rating_string;
|
2012-10-28 22:49:02 +00:00
|
|
|
double newtemp;
|
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;
|
|
|
|
}
|
|
|
|
|
2013-01-27 19:58:13 +00:00
|
|
|
gps_text = gtk_entry_get_text(info->gps);
|
|
|
|
if (gps_changed(dive, master, gps_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-10-28 22:49:02 +00:00
|
|
|
rating_string = strdup(star_strings[dive->visibility]);
|
|
|
|
new_text = get_combo_box_entry_text(info->viz, &rating_string, star_strings[master->visibility]);
|
|
|
|
if (new_text) {
|
|
|
|
dive->visibility = get_rating(rating_string);
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
free(rating_string);
|
|
|
|
|
|
|
|
new_text = (char *)gtk_entry_get_text(info->airtemp);
|
2013-01-29 21:10:46 +00:00
|
|
|
if (sscanf(new_text, "%lf", &newtemp) == 1) {
|
2012-10-28 22:49:02 +00:00
|
|
|
unsigned long mkelvin;
|
2013-01-11 01:26:10 +00:00
|
|
|
switch (prefs.units.temperature) {
|
2012-10-28 22:49:02 +00:00
|
|
|
case CELSIUS:
|
|
|
|
mkelvin = C_to_mkelvin(newtemp);
|
|
|
|
break;
|
|
|
|
case FAHRENHEIT:
|
|
|
|
mkelvin = F_to_mkelvin(newtemp);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
mkelvin = 0;
|
|
|
|
}
|
2013-02-03 09:40:45 +00:00
|
|
|
if (mkelvin != dive->dc.airtemp.mkelvin && dive->dc.airtemp.mkelvin == master->dc.airtemp.mkelvin) {
|
2013-01-23 18:25:31 +00:00
|
|
|
dive->dc.airtemp.mkelvin = mkelvin;
|
2012-10-28 22:49:02 +00:00
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-17 21:43:47 +00:00
|
|
|
char buffer[128] = 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);
|
|
|
|
}
|
|
|
|
|
2013-01-28 15:54:30 +00:00
|
|
|
struct location_update {
|
2013-02-03 08:03:36 +00:00
|
|
|
char text[45];
|
|
|
|
char set_by_hand;
|
2013-01-28 15:54:30 +00:00
|
|
|
GtkEntry *entry;
|
|
|
|
struct dive *dive;
|
|
|
|
void (*callback)(float, float);
|
|
|
|
} location_update;
|
|
|
|
|
2013-01-29 21:10:46 +00:00
|
|
|
static void print_gps_coordinates(char *buffer, int len, float lat, float lon)
|
2013-01-28 15:54:30 +00:00
|
|
|
{
|
|
|
|
unsigned int latdeg, londeg;
|
|
|
|
float latmin, lonmin;
|
|
|
|
char *lath, *lonh;
|
|
|
|
|
2013-02-03 08:03:36 +00:00
|
|
|
if (!lat && !lon) {
|
|
|
|
*buffer = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-01-29 09:27:36 +00:00
|
|
|
lath = lat >= 0.0 ? _("N") : _("S");
|
|
|
|
lonh = lon >= 0.0 ? _("E") : _("W");
|
2013-01-28 15:54:30 +00:00
|
|
|
lat = fabs(lat);
|
|
|
|
lon = fabs(lon);
|
|
|
|
latdeg = lat;
|
|
|
|
londeg = lon;
|
|
|
|
latmin = (lat - latdeg) * 60.0;
|
|
|
|
lonmin = (lon - londeg) * 60.0;
|
2013-02-09 00:35:39 +00:00
|
|
|
snprintf(buffer, len, "%s%u%s %8.5f\' , %s%u%s %8.5f\'",
|
2013-01-28 15:54:30 +00:00
|
|
|
lath, latdeg, UTF8_DEGREE, latmin,
|
|
|
|
lonh, londeg, UTF8_DEGREE, lonmin);
|
|
|
|
}
|
|
|
|
|
2013-01-29 21:10:46 +00:00
|
|
|
static void update_gps_entry(float lat, float lon)
|
2013-01-28 15:54:30 +00:00
|
|
|
{
|
GPS location map input
On 28 January 2013 23:26, Dirk Hohndel <dirk@hohndel.org> wrote:
>
> Just pushed out Linus' Gtk3 readiness changes plus my change that allows
> the user to not only type in GPS coordinates but also use a map widget
> to pick the dive site.
>
> There were a few very odd Gtk things going on - when I opened the map
> widget from the dive info dialog (by clicking the button), the widget
> would be completely unresponsive. No panning, no zooming, no
> right-click, nothing.
>
> Opening an equipent widget and immideately closing it again suddenly
> made the map widget responsive. WTF?
>
> I worked around this by doing an explicit grab in the map widget, but
> that seems like a hack and just to work around the underlying issue.
>
> If anyone can figure this out, patches welcome.
>
> The other shortcomings (besides the uglyness of the UI) are that it may
> be non-obvious to the user that it takes a right click to get a menu
> item that allows you to "mark location here" - I'm sure there's a more
> intuitive way to do this, but since left click is used for panning, this
> was the best idea I could come up with...
>
> Please test - I wouldn't be surprised if there are a few bugs still
> hidden in this code.
>
here an fix to make this work on win32 and also solve a potential issue of type:
(subsurface.bin:19441): Gtk-CRITICAL **: IA__gtk_entry_set_text:
assertion `GTK_IS_ENTRY (entry)' failed
my commit message is explicit on the reasons:
------------------------
When called from the "dive edit" dialog the, map windows seems
inactive on Windows. It cannot accept focus and is also behind all
other application windows.
There are a couple of important new calls in gps.c:show_map():
gtk_window_set_transient_for(GTK_WINDOW(*window), GTK_WINDOW(main_window));
(^ docs say gtk "may" call this one for us, on what condition - not specified)
gtk_window_set_modal(GTK_WINDOW(*window), TRUE);
(^ broken on ubuntu 12.04, but needed on Win32))
Making the window transient for the main window and also modal for
the entire application's window stack (or at least try).
Older versions of gtk+2 and also in the most recently tested
libgtk2.0-0 2.24.10-0ubuntu6, seem not to recognize the significance
of gtk_window_set_modal() and the call does not work as expected.
This forces us to check if the dialog from which the call originated
exists, since its possible to close it _while_ the map widget is active.
More specifically, we check in info.c if the location_update.entry pointer
was set to NULL before performing actions with in the update_gps_entry()
callback.
------------------------
also removed the gtk_window_present() call as it seemed redundant post
these changes (?).
-------
on a side note:
looks like i'm above 100 commits...
cheers everyone <has a sip of some late beer> :0 ~ c|_|
lubomir
--
From fe9967c7ad2ec3b93ad336c2c6bed492a5ad0d8b Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <neolit123@gmail.com>
Date: Tue, 29 Jan 2013 00:24:21 +0200
Subject: [PATCH] Fix a "stacking" issue with the map-window on Windows
When called from the "dive edit" dialog the, map windows seems
inactive on Windows. It cannot accept focus and is also behind all
other application windows.
There are a couple of important new calls in gps.c:show_map():
gtk_window_set_transient_for(GTK_WINDOW(*window), GTK_WINDOW(main_window));
(^ docs say gtk "may" call this one for us, on what condition - not specified)
gtk_window_set_modal(GTK_WINDOW(*window), TRUE);
(^ broken on ubuntu 12.04, but needed on Win32))
Making the window transient for the main window and also modal for
the entire application's window stack (or at least try).
Older versions of gtk+2 and also in the most recently tested
libgtk2.0-0 2.24.10-0ubuntu6, seem not to recognize the significance
of gtk_window_set_modal() and the call does not work as expected.
This forces us to check if the dialog from which the call originated
exists, since its possible to close it _while_ the map widget is active.
More specifically, we check in info.c if the location_update.entry pointer
was set to NULL before performing actions with in the update_gps_entry()
callback.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-28 22:58:14 +00:00
|
|
|
if (location_update.entry) {
|
2013-02-03 08:03:36 +00:00
|
|
|
print_gps_coordinates(location_update.text, 45, lat, lon);
|
|
|
|
gtk_entry_set_text(location_update.entry, location_update.text);
|
GPS location map input
On 28 January 2013 23:26, Dirk Hohndel <dirk@hohndel.org> wrote:
>
> Just pushed out Linus' Gtk3 readiness changes plus my change that allows
> the user to not only type in GPS coordinates but also use a map widget
> to pick the dive site.
>
> There were a few very odd Gtk things going on - when I opened the map
> widget from the dive info dialog (by clicking the button), the widget
> would be completely unresponsive. No panning, no zooming, no
> right-click, nothing.
>
> Opening an equipent widget and immideately closing it again suddenly
> made the map widget responsive. WTF?
>
> I worked around this by doing an explicit grab in the map widget, but
> that seems like a hack and just to work around the underlying issue.
>
> If anyone can figure this out, patches welcome.
>
> The other shortcomings (besides the uglyness of the UI) are that it may
> be non-obvious to the user that it takes a right click to get a menu
> item that allows you to "mark location here" - I'm sure there's a more
> intuitive way to do this, but since left click is used for panning, this
> was the best idea I could come up with...
>
> Please test - I wouldn't be surprised if there are a few bugs still
> hidden in this code.
>
here an fix to make this work on win32 and also solve a potential issue of type:
(subsurface.bin:19441): Gtk-CRITICAL **: IA__gtk_entry_set_text:
assertion `GTK_IS_ENTRY (entry)' failed
my commit message is explicit on the reasons:
------------------------
When called from the "dive edit" dialog the, map windows seems
inactive on Windows. It cannot accept focus and is also behind all
other application windows.
There are a couple of important new calls in gps.c:show_map():
gtk_window_set_transient_for(GTK_WINDOW(*window), GTK_WINDOW(main_window));
(^ docs say gtk "may" call this one for us, on what condition - not specified)
gtk_window_set_modal(GTK_WINDOW(*window), TRUE);
(^ broken on ubuntu 12.04, but needed on Win32))
Making the window transient for the main window and also modal for
the entire application's window stack (or at least try).
Older versions of gtk+2 and also in the most recently tested
libgtk2.0-0 2.24.10-0ubuntu6, seem not to recognize the significance
of gtk_window_set_modal() and the call does not work as expected.
This forces us to check if the dialog from which the call originated
exists, since its possible to close it _while_ the map widget is active.
More specifically, we check in info.c if the location_update.entry pointer
was set to NULL before performing actions with in the update_gps_entry()
callback.
------------------------
also removed the gtk_window_present() call as it seemed redundant post
these changes (?).
-------
on a side note:
looks like i'm above 100 commits...
cheers everyone <has a sip of some late beer> :0 ~ c|_|
lubomir
--
From fe9967c7ad2ec3b93ad336c2c6bed492a5ad0d8b Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <neolit123@gmail.com>
Date: Tue, 29 Jan 2013 00:24:21 +0200
Subject: [PATCH] Fix a "stacking" issue with the map-window on Windows
When called from the "dive edit" dialog the, map windows seems
inactive on Windows. It cannot accept focus and is also behind all
other application windows.
There are a couple of important new calls in gps.c:show_map():
gtk_window_set_transient_for(GTK_WINDOW(*window), GTK_WINDOW(main_window));
(^ docs say gtk "may" call this one for us, on what condition - not specified)
gtk_window_set_modal(GTK_WINDOW(*window), TRUE);
(^ broken on ubuntu 12.04, but needed on Win32))
Making the window transient for the main window and also modal for
the entire application's window stack (or at least try).
Older versions of gtk+2 and also in the most recently tested
libgtk2.0-0 2.24.10-0ubuntu6, seem not to recognize the significance
of gtk_window_set_modal() and the call does not work as expected.
This forces us to check if the dialog from which the call originated
exists, since its possible to close it _while_ the map widget is active.
More specifically, we check in info.c if the location_update.entry pointer
was set to NULL before performing actions with in the update_gps_entry()
callback.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-28 22:58:14 +00:00
|
|
|
}
|
2013-01-28 15:54:30 +00:00
|
|
|
}
|
|
|
|
|
2013-01-28 22:19:36 +00:00
|
|
|
#if HAVE_OSM_GPS_MAP
|
2013-01-28 15:54:30 +00:00
|
|
|
static gboolean gps_map_callback(GtkWidget *w, gpointer data)
|
|
|
|
{
|
2013-02-03 10:01:07 +00:00
|
|
|
const char *gps_text = NULL;
|
2013-01-28 15:54:30 +00:00
|
|
|
struct dive *dive = location_update.dive;
|
2013-02-03 10:01:07 +00:00
|
|
|
if (location_update.entry) {
|
|
|
|
gps_text = gtk_entry_get_text(location_update.entry);
|
|
|
|
(void)gps_changed(dive, NULL, gps_text);
|
|
|
|
}
|
2013-01-28 15:54:30 +00:00
|
|
|
show_gps_location(dive, update_gps_entry);
|
2013-02-03 08:03:36 +00:00
|
|
|
location_update.set_by_hand = 1;
|
2013-01-28 15:54:30 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2013-01-28 22:19:36 +00:00
|
|
|
#endif
|
2013-01-28 15:54:30 +00:00
|
|
|
|
2013-02-03 08:03:36 +00:00
|
|
|
/*
|
|
|
|
* If somebody sets the string by editing the text entry,
|
|
|
|
* we consider a clear string an opportunity to set things
|
|
|
|
* automatically.
|
|
|
|
*
|
|
|
|
* A non-empty string, on the other hand, means that we
|
|
|
|
* should *not* touch it when we change the location field.
|
|
|
|
*/
|
|
|
|
static gboolean gps_entry_change_cb(GtkEntry *gps, GdkEvent *event, gpointer userdata)
|
|
|
|
{
|
|
|
|
const char *string = gtk_entry_get_text(gps);
|
|
|
|
|
|
|
|
/* A clear string is never considered to be "set" */
|
|
|
|
if (!string) {
|
|
|
|
location_update.set_by_hand = 0;
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If it wasn't set by hand, and it hasn't changed,
|
|
|
|
* it's still not set by hand
|
|
|
|
*/
|
|
|
|
if (!location_update.set_by_hand) {
|
|
|
|
if (!strcmp(location_update.text, string))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Otherwise, check if it's all empty.. */
|
|
|
|
while (isspace(*string))
|
|
|
|
string++;
|
|
|
|
location_update.set_by_hand = !!*string;
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void location_entry_change_cb(GtkComboBox *location, gpointer *userdata)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't do any automatic gps changes of entries that have been
|
|
|
|
* explicitly set to some value!
|
|
|
|
*/
|
|
|
|
if (location_update.set_by_hand)
|
|
|
|
return;
|
|
|
|
|
|
|
|
name = get_active_text(location);
|
|
|
|
for_each_dive(i, dive) {
|
|
|
|
if (!dive_has_gps_location(dive))
|
|
|
|
continue;
|
|
|
|
if (!dive->location || strcasecmp(dive->location, name))
|
|
|
|
continue;
|
|
|
|
update_gps_entry(dive->latitude.udeg / 1000000.0, dive->longitude.udeg / 1000000.0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
update_gps_entry(0, 0);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2013-01-28 15:54:30 +00:00
|
|
|
GtkWidget *hbox, *label, *frame, *equipment, *image;
|
2012-10-17 21:43:47 +00:00
|
|
|
char buffer[128];
|
2012-10-28 22:49:02 +00:00
|
|
|
char airtemp[6];
|
|
|
|
const char *unit;
|
|
|
|
double value;
|
2012-10-15 20:29:37 +00:00
|
|
|
|
|
|
|
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);
|
2013-02-03 08:03:36 +00:00
|
|
|
g_signal_connect(G_OBJECT(info->location), "changed", G_CALLBACK(location_entry_change_cb), NULL);
|
2011-11-19 15:11:56 +00:00
|
|
|
|
2013-01-28 15:54:30 +00:00
|
|
|
hbox = gtk_hbox_new(FALSE, 2);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
2013-02-03 08:03:36 +00:00
|
|
|
info->gps = single_text_entry(hbox, _("GPS (WGS84 or GPS format)"), NULL);
|
|
|
|
|
|
|
|
location_update.entry = info->gps;
|
|
|
|
location_update.dive = dive;
|
|
|
|
update_gps_entry(dive->latitude.udeg / 1000000.0, dive->longitude.udeg / 1000000.0);
|
|
|
|
location_update.set_by_hand = !!location_update.text[0];
|
|
|
|
|
|
|
|
gtk_widget_add_events(GTK_WIDGET(info->gps), GDK_FOCUS_CHANGE_MASK);
|
|
|
|
g_signal_connect(G_OBJECT(info->gps), "focus-out-event", G_CALLBACK(gps_entry_change_cb), NULL);
|
2013-01-28 15:54:30 +00:00
|
|
|
gtk_entry_set_width_chars(info->gps, 30);
|
2013-01-28 22:19:36 +00:00
|
|
|
#if HAVE_OSM_GPS_MAP
|
2013-01-28 15:54:30 +00:00
|
|
|
info->gps_icon = gtk_button_new_with_label(_("Pick on map"));
|
|
|
|
gtk_box_pack_start(GTK_BOX(hbox), info->gps_icon, FALSE, FALSE, 6);
|
|
|
|
image = gtk_image_new_from_pixbuf(get_gps_icon());
|
|
|
|
gtk_image_set_pixel_size(GTK_IMAGE(image), 128);
|
|
|
|
gtk_button_set_image(GTK_BUTTON(info->gps_icon), image);
|
|
|
|
|
|
|
|
g_signal_connect(G_OBJECT(info->gps_icon), "clicked", G_CALLBACK(gps_map_callback), NULL);
|
2013-01-28 22:19:36 +00:00
|
|
|
#endif
|
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-10-28 22:49:02 +00:00
|
|
|
hbox = gtk_hbox_new(FALSE, 3);
|
|
|
|
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
|
|
|
|
|
|
|
|
info->viz = text_entry(hbox, _("Visibility"), star_list, star_strings[dive->visibility]);
|
|
|
|
|
2013-01-23 18:25:31 +00:00
|
|
|
value = get_temp_units(dive->dc.airtemp.mkelvin, &unit);
|
2012-10-28 22:49:02 +00:00
|
|
|
snprintf(buffer, sizeof(buffer), _("Air Temp in %s"), unit);
|
2013-01-23 18:25:31 +00:00
|
|
|
if (dive->dc.airtemp.mkelvin)
|
2012-10-28 22:49:02 +00:00
|
|
|
snprintf(airtemp, sizeof(airtemp), "%.1f", value);
|
|
|
|
else
|
|
|
|
airtemp[0] = '\0';
|
|
|
|
info->airtemp = single_text_entry(hbox, buffer, airtemp);
|
|
|
|
|
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 */
|
2013-01-29 21:10:46 +00:00
|
|
|
static void update_equipment_data(struct dive *dive, struct dive *master)
|
2012-08-15 22:21:34 +00:00
|
|
|
{
|
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;
|
2013-01-31 11:21:53 +00:00
|
|
|
if (!master)
|
|
|
|
return 0;
|
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);
|
GPS location map input
On 28 January 2013 23:26, Dirk Hohndel <dirk@hohndel.org> wrote:
>
> Just pushed out Linus' Gtk3 readiness changes plus my change that allows
> the user to not only type in GPS coordinates but also use a map widget
> to pick the dive site.
>
> There were a few very odd Gtk things going on - when I opened the map
> widget from the dive info dialog (by clicking the button), the widget
> would be completely unresponsive. No panning, no zooming, no
> right-click, nothing.
>
> Opening an equipent widget and immideately closing it again suddenly
> made the map widget responsive. WTF?
>
> I worked around this by doing an explicit grab in the map widget, but
> that seems like a hack and just to work around the underlying issue.
>
> If anyone can figure this out, patches welcome.
>
> The other shortcomings (besides the uglyness of the UI) are that it may
> be non-obvious to the user that it takes a right click to get a menu
> item that allows you to "mark location here" - I'm sure there's a more
> intuitive way to do this, but since left click is used for panning, this
> was the best idea I could come up with...
>
> Please test - I wouldn't be surprised if there are a few bugs still
> hidden in this code.
>
here an fix to make this work on win32 and also solve a potential issue of type:
(subsurface.bin:19441): Gtk-CRITICAL **: IA__gtk_entry_set_text:
assertion `GTK_IS_ENTRY (entry)' failed
my commit message is explicit on the reasons:
------------------------
When called from the "dive edit" dialog the, map windows seems
inactive on Windows. It cannot accept focus and is also behind all
other application windows.
There are a couple of important new calls in gps.c:show_map():
gtk_window_set_transient_for(GTK_WINDOW(*window), GTK_WINDOW(main_window));
(^ docs say gtk "may" call this one for us, on what condition - not specified)
gtk_window_set_modal(GTK_WINDOW(*window), TRUE);
(^ broken on ubuntu 12.04, but needed on Win32))
Making the window transient for the main window and also modal for
the entire application's window stack (or at least try).
Older versions of gtk+2 and also in the most recently tested
libgtk2.0-0 2.24.10-0ubuntu6, seem not to recognize the significance
of gtk_window_set_modal() and the call does not work as expected.
This forces us to check if the dialog from which the call originated
exists, since its possible to close it _while_ the map widget is active.
More specifically, we check in info.c if the location_update.entry pointer
was set to NULL before performing actions with in the update_gps_entry()
callback.
------------------------
also removed the gtk_window_present() call as it seemed redundant post
these changes (?).
-------
on a side note:
looks like i'm above 100 commits...
cheers everyone <has a sip of some late beer> :0 ~ c|_|
lubomir
--
From fe9967c7ad2ec3b93ad336c2c6bed492a5ad0d8b Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <neolit123@gmail.com>
Date: Tue, 29 Jan 2013 00:24:21 +0200
Subject: [PATCH] Fix a "stacking" issue with the map-window on Windows
When called from the "dive edit" dialog the, map windows seems
inactive on Windows. It cannot accept focus and is also behind all
other application windows.
There are a couple of important new calls in gps.c:show_map():
gtk_window_set_transient_for(GTK_WINDOW(*window), GTK_WINDOW(main_window));
(^ docs say gtk "may" call this one for us, on what condition - not specified)
gtk_window_set_modal(GTK_WINDOW(*window), TRUE);
(^ broken on ubuntu 12.04, but needed on Win32))
Making the window transient for the main window and also modal for
the entire application's window stack (or at least try).
Older versions of gtk+2 and also in the most recently tested
libgtk2.0-0 2.24.10-0ubuntu6, seem not to recognize the significance
of gtk_window_set_modal() and the call does not work as expected.
This forces us to check if the dialog from which the call originated
exists, since its possible to close it _while_ the map widget is active.
More specifically, we check in info.c if the location_update.entry pointer
was set to NULL before performing actions with in the update_gps_entry()
callback.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-28 22:58:14 +00:00
|
|
|
location_update.entry = NULL;
|
2011-11-19 15:11:56 +00:00
|
|
|
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
2012-11-04 19:35:59 +00:00
|
|
|
int edit_dive_info(struct dive *dive, gboolean newdive)
|
2012-08-15 22:21:34 +00:00
|
|
|
{
|
2012-11-04 19:35:59 +00:00
|
|
|
if (!dive || (!newdive && !amount_selected))
|
2012-08-15 22:21:34 +00:00
|
|
|
return 0;
|
2012-11-04 19:35:59 +00:00
|
|
|
|
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-12-10 21:16:17 +00:00
|
|
|
GtkWidget *create_date_time_widget(struct tm *time, GtkWidget **cal, GtkWidget **h, GtkWidget **m)
|
2012-06-27 20:11:54 +00:00
|
|
|
{
|
|
|
|
GtkWidget *dialog;
|
2012-12-10 21:16:17 +00:00
|
|
|
GtkWidget *hbox, *vbox;
|
2012-06-27 20:11:54 +00:00
|
|
|
GtkWidget *label;
|
|
|
|
|
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-12-10 21:16:17 +00:00
|
|
|
*cal = gtk_calendar_new();
|
|
|
|
gtk_box_pack_start(GTK_BOX(hbox), *cal, FALSE, TRUE, 0);
|
2012-06-27 20:11:54 +00:00
|
|
|
|
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
|
|
|
|
2012-12-10 21:16:17 +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);
|
|
|
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
return dialog;
|
|
|
|
}
|
|
|
|
|
|
|
|
static timestamp_t dive_time_widget(struct dive *dive)
|
|
|
|
{
|
|
|
|
GtkWidget *dialog;
|
|
|
|
GtkWidget *cal, *vbox, *hbox, *box;
|
|
|
|
GtkWidget *h, *m;
|
|
|
|
GtkWidget *duration, *depth;
|
|
|
|
guint yval, mval, dval;
|
|
|
|
struct tm tm, *time;
|
|
|
|
int success;
|
|
|
|
double depthinterval, val;
|
2012-06-27 20:11:54 +00:00
|
|
|
|
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;
|
2013-02-08 06:48:07 +00:00
|
|
|
when += get_duration_in_sec(current_dive);
|
2012-08-18 18:47:29 +00:00
|
|
|
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);
|
|
|
|
}
|
2012-12-10 21:16:17 +00:00
|
|
|
dialog = create_date_time_widget(time, &cal, &h, &m);
|
|
|
|
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
|
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 */
|
2013-01-11 01:26:10 +00:00
|
|
|
box = frame_box(hbox, _("Depth (%s):"), prefs.units.length == FEET ? _("ft") : _("m"));
|
|
|
|
if (prefs.units.length == FEET) {
|
2012-06-27 21:29:29 +00:00
|
|
|
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));
|
2013-01-11 01:26:10 +00:00
|
|
|
if (prefs.units.length == FEET) {
|
2013-01-23 18:25:31 +00:00
|
|
|
dive->dc.maxdepth.mm = feet_to_mm(val);
|
2012-06-27 21:29:29 +00:00
|
|
|
} else {
|
2013-01-23 18:25:31 +00:00
|
|
|
dive->dc.maxdepth.mm = val * 1000 + 0.5;
|
2012-06-27 21:29:29 +00:00
|
|
|
}
|
|
|
|
|
2013-01-23 18:25:31 +00:00
|
|
|
dive->dc.duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60;
|
2012-06-27 20:11:54 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
2012-11-04 19:35:59 +00:00
|
|
|
return edit_dive_info(dive, TRUE);
|
2012-06-27 20:11:54 +00:00
|
|
|
}
|
|
|
|
|
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);
|
2012-10-22 18:22:17 +00:00
|
|
|
add_string_list_entry(star_strings[0], star_list);
|
|
|
|
add_string_list_entry(star_strings[1], star_list);
|
|
|
|
add_string_list_entry(star_strings[2], star_list);
|
|
|
|
add_string_list_entry(star_strings[3], star_list);
|
|
|
|
add_string_list_entry(star_strings[4], star_list);
|
|
|
|
add_string_list_entry(star_strings[5], 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
|
|
|
}
|