summaryrefslogtreecommitdiffstats
path: root/info.c
diff options
context:
space:
mode:
Diffstat (limited to 'info.c')
-rw-r--r--info.c98
1 files changed, 79 insertions, 19 deletions
diff --git a/info.c b/info.c
index 842a15001..846d51efc 100644
--- a/info.c
+++ b/info.c
@@ -19,9 +19,9 @@
#include "display-gtk.h"
#include "divelist.h"
-static GtkEntry *location, *buddy, *divemaster, *rating;
+static GtkEntry *location, *buddy, *divemaster, *rating, *suit;
static GtkTextView *notes;
-static GtkListStore *location_list, *people_list, *star_list;
+static GtkListStore *location_list, *people_list, *star_list, *suit_list;
static char *get_text(GtkTextView *view)
{
@@ -43,12 +43,42 @@ static int text_changed(const char *old, const char *new)
(!old && strcmp("",new));
}
-static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
+static char *skip_space(char *str)
+{
+ 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.
+ */
+static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp, char *master)
{
char *old = *textp;
const gchar *new;
GtkEntry *entry;
+ old = skip_space(old);
+ 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).
+ */
+ if (master && old)
+ if (strcmp(master, old))
+ return NULL;
+
entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
new = gtk_entry_get_text(entry);
while (isspace(*new))
@@ -96,6 +126,7 @@ void show_dive_info(struct dive *dive)
SET_TEXT_VALUE(divemaster);
SET_TEXT_VALUE(buddy);
SET_TEXT_VALUE(location);
+ SET_TEXT_VALUE(suit);
gtk_entry_set_text(rating, star_strings[dive->rating]);
gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
dive && dive->notes ? dive->notes : "", -1);
@@ -131,11 +162,12 @@ static int delete_dive_info(struct dive *dive)
static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
{
- edit_dive_info(current_dive);
+ edit_multi_dive_info(amount_selected, selectiontracker);
}
static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+ /* this needs to delete all the selected dives as well, I guess? */
delete_dive_info(current_dive);
}
@@ -242,6 +274,8 @@ static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTr
gtk_tree_model_get(model, iter, 0, &entry, -1);
cmp = strcmp(entry, string);
+ if (entry)
+ free(entry);
/* Stop. The entry is bigger than the new one */
if (cmp > 0)
@@ -296,6 +330,11 @@ void add_location(const char *string)
add_string_list_entry(string, location_list);
}
+void add_suit(const char *string)
+{
+ add_string_list_entry(string, suit_list);
+}
+
static int get_rating(const char *string)
{
int rating_val = 0;
@@ -308,36 +347,42 @@ static int get_rating(const char *string)
}
struct dive_info {
- GtkComboBoxEntry *location, *divemaster, *buddy, *rating;
+ GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit;
GtkTextView *notes;
};
-static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
+static void save_dive_info_changes(struct dive *dive, struct dive *master, struct dive_info *info)
{
char *old_text, *new_text;
char *rating_string;
int changed = 0;
- new_text = get_combo_box_entry_text(info->location, &dive->location);
+ new_text = get_combo_box_entry_text(info->location, &dive->location, master->location);
if (new_text) {
add_location(new_text);
changed = 1;
}
- new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster);
+ new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster, master->divemaster);
if (new_text) {
add_people(new_text);
changed = 1;
}
- new_text = get_combo_box_entry_text(info->buddy, &dive->buddy);
+ new_text = get_combo_box_entry_text(info->buddy, &dive->buddy, master->buddy);
if (new_text) {
add_people(new_text);
changed = 1;
}
+ new_text = get_combo_box_entry_text(info->suit, &dive->suit, master->suit);
+ if (new_text) {
+ add_suit(new_text);
+ changed = 1;
+ }
+
rating_string = strdup(star_strings[dive->rating]);
- new_text = get_combo_box_entry_text(info->rating, &rating_string);
+ new_text = get_combo_box_entry_text(info->rating, &rating_string, star_strings[master->rating]);
if (new_text) {
dive->rating = get_rating(rating_string);
free(rating_string);
@@ -380,6 +425,7 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]);
+ info->suit = text_entry(hbox, "Suit", suit_list, dive->suit);
/* only show notes if editing a single dive */
if (multi) {
@@ -428,7 +474,7 @@ int edit_multi_dive_info(int nr, int *indices)
int success, i;
GtkWidget *dialog, *vbox;
struct dive_info info;
- struct dive *dive;
+ struct dive *master;
if (!nr)
return 0;
@@ -447,22 +493,34 @@ int edit_multi_dive_info(int nr, int *indices)
* data is used as the starting point for all selected dives
* I think it would be better to somehow collect and combine
* info from all the selected dives */
- dive = current_dive;
- dive_info_widget(vbox, dive, &info, (nr > 1));
- show_dive_equipment(dive, W_IDX_SECONDARY);
- save_equipment_data(dive);
+ master = current_dive;
+ dive_info_widget(vbox, master, &info, (nr > 1));
+ show_dive_equipment(master, W_IDX_SECONDARY);
+ save_equipment_data(master);
gtk_widget_show_all(dialog);
success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
- if (success)
+ if (success) {
+ /* Update the other non-current dives first */
for (i = 0; i < nr; i++) {
+ int idx = indices[i];
+ struct dive *dive = get_dive(idx);
+
+ if (!dive || dive == master)
+ continue;
/* copy all "info" fields */
- save_dive_info_changes(get_dive(indices[i]), &info);
+ save_dive_info_changes(dive, master, &info);
/* copy the cylinders / weightsystems */
- update_equipment_data(get_dive(indices[i]), dive);
+ update_equipment_data(dive, master);
/* this is extremely inefficient... it loops through all
dives to find the right one - but we KNOW the index already */
- flush_divelist(get_dive(indices[i]));
+ flush_divelist(dive);
}
+
+ /* Update the master dive last! */
+ save_dive_info_changes(master, master, &info);
+ update_equipment_data(master, master);
+ flush_divelist(master);
+ }
gtk_widget_destroy(dialog);
return success;
@@ -619,6 +677,7 @@ GtkWidget *extended_dive_info_widget(void)
add_string_list_entry(THREE_STARS, star_list);
add_string_list_entry(FOUR_STARS, star_list);
add_string_list_entry(FIVE_STARS, star_list);
+ suit_list = gtk_list_store_new(1, G_TYPE_STRING);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
location = text_value(vbox, "Location");
@@ -633,6 +692,7 @@ GtkWidget *extended_dive_info_widget(void)
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
rating = text_value(hbox, "Rating");
+ suit = text_value(hbox, "Suit");
notes = text_view(vbox, "Notes", READ_ONLY);
return vbox;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-02-14 10:46:28 +0000