mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only show tags checkboxes if all edited dives have same tags

Browse source 
This is trivially true if there is only one dive.

With this change the logic which tags apply after editing is much easier
to understand.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-04-10 08:43:18 -07:00
parent 0a64844abd
commit 5778d090a4
1 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
info.c
View file

@ -527,7 +527,7 @@ struct dive_info {
GtkTextView *notes; GtkTextView *notes;
}; };
static void save_dive_info_changes(struct dive *dive, struct dive *master, struct dive_info *info) static void save_dive_info_changes(struct dive *dive, struct dive *master, struct dive_info *info, int tags_shown)
{ {
char *old_text, *new_text; char *old_text, *new_text;
const char *gps_text; const char *gps_text;
@ -606,7 +606,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc
if (old_text) if (old_text)
g_free(old_text); g_free(old_text);
} }
if (dive->dive_tags != master->dive_tags) { if (tags_shown && dive->dive_tags != master->dive_tags) {
changed = 1; changed = 1;
dive->dive_tags = master->dive_tags; dive->dive_tags = master->dive_tags;
} }
@ -806,7 +806,7 @@ void divetag_toggle_cb(GtkWidget *widget, gpointer data)
edit_dive.dive_tags &= ~togglebit; edit_dive.dive_tags &= ~togglebit;
} }
static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_info *info, gboolean multi) static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_info *info, int multi, int *show_tags)
{ {
GtkWidget *hbox, *frame, *equipment, *ibox, *box, *button, *sbox, *framebox; GtkWidget *hbox, *frame, *equipment, *ibox, *box, *button, *sbox, *framebox;
#if HAVE_OSM_GPS_MAP #if HAVE_OSM_GPS_MAP
@ -816,7 +816,8 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf
char airtemp[10]; char airtemp[10];
const char *unit; const char *unit;
double value; double value;
int i; int i, tags;
struct dive *otherdive;
if (multi) { if (multi) {
GtkWidget *label; GtkWidget *label;
@ -884,12 +885,21 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf
airtemp[0] = '\0'; airtemp[0] = '\0';
info->airtemp = single_text_entry(hbox, buffer, airtemp); info->airtemp = single_text_entry(hbox, buffer, airtemp);
frame = gtk_frame_new(_("Dive Type")); frame = gtk_frame_new(_("Dive Tags"));
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
framebox = gtk_vbox_new(FALSE, 3); framebox = gtk_vbox_new(FALSE, 3);
gtk_container_add(GTK_CONTAINER(frame), framebox); gtk_container_add(GTK_CONTAINER(frame), framebox);
/* we only want to show the tags if we have a single dive or if all selected
* dives have the exact same set of tags (like none at all right after import) */
i = 0;
*show_tags = 1;
tags = dive->dive_tags;
for_each_dive(i, otherdive)
if (otherdive && otherdive->selected && otherdive->dive_tags != tags)
*show_tags = 0;
if (*show_tags) {
/* check boxes for the (currently fixed) list of tags; /* check boxes for the (currently fixed) list of tags;
* let's do 5 per row */ * let's do 5 per row */
for (i = 0; i < DTAG_NR; i++) { for (i = 0; i < DTAG_NR; i++) {
@ -900,9 +910,13 @@ static void dive_info_widget(GtkWidget *obox, struct dive *dive, struct dive_inf
button = gtk_check_button_new_with_label(_(dtag_names[i])); button = gtk_check_button_new_with_label(_(dtag_names[i]));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), dive->dive_tags & (1 << i)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), dive->dive_tags & (1 << i));
gtk_box_pack_start(GTK_BOX(sbox), button, FALSE, FALSE, 6); gtk_box_pack_start(GTK_BOX(sbox), button, FALSE, FALSE, 6);
g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(divetag_toggle_cb), GINT_TO_POINTER(1 << i)); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(divetag_toggle_cb),
GINT_TO_POINTER(1 << i));
}
} else {
sbox = gtk_label_new(_("Tags are only shown if they are identical for all edited dives"));
gtk_box_pack_start(GTK_BOX(framebox), sbox, TRUE, FALSE, 3);
} }
/* only show notes if editing a single dive */ /* only show notes if editing a single dive */
if (multi) { if (multi) {
info->notes = NULL; info->notes = NULL;
@ -1091,7 +1105,8 @@ int edit_multi_dive_info(struct dive *single_dive)
GtkRequisition size; GtkRequisition size;
struct dive_info info; struct dive_info info;
struct dive *master; struct dive *master;
gboolean multi; int multi;
int tags_shown;
scrolled_window = gtk_scrolled_window_new(NULL, NULL); scrolled_window = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
@ -1131,7 +1146,7 @@ int edit_multi_dive_info(struct dive *single_dive)
* edit widgets as we do here */ * edit widgets as we do here */
memcpy(&edit_dive, master, sizeof(struct dive)); memcpy(&edit_dive, master, sizeof(struct dive));
dive_info_widget(vbox, &edit_dive, &info, multi); dive_info_widget(vbox, &edit_dive, &info, multi, &tags_shown);
save_equipment_data(&edit_dive); save_equipment_data(&edit_dive);
gtk_widget_show_all(dialog); gtk_widget_show_all(dialog);
viewport = gtk_widget_get_ancestor(vbox, GTK_TYPE_VIEWPORT); viewport = gtk_widget_get_ancestor(vbox, GTK_TYPE_VIEWPORT);
@ -1155,7 +1170,7 @@ int edit_multi_dive_info(struct dive *single_dive)
if (dive == master || !dive->selected) if (dive == master || !dive->selected)
continue; continue;
/* copy all "info" fields */ /* copy all "info" fields */
save_dive_info_changes(dive, &edit_dive, &info); save_dive_info_changes(dive, &edit_dive, &info, tags_shown);
/* copy the cylinders / weightsystems */ /* copy the cylinders / weightsystems */
update_equipment_data(dive, &edit_dive); update_equipment_data(dive, &edit_dive);
/* this is extremely inefficient... it loops through all /* this is extremely inefficient... it loops through all
@ -1166,7 +1181,7 @@ int edit_multi_dive_info(struct dive *single_dive)
} }
/* Update the master dive last! */ /* Update the master dive last! */
save_dive_info_changes(master, &edit_dive, &info); save_dive_info_changes(master, &edit_dive, &info, tags_shown);
update_equipment_data(master, &edit_dive); update_equipment_data(master, &edit_dive);
update_cylinder_related_info(master); update_cylinder_related_info(master);
/* if there was only one dive we might also have changed dive->when /* if there was only one dive we might also have changed dive->when