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

Don't enable equipment notebook buttons if there is no dive

Browse source 
The buttons didn't actually do anything when clicked, but this still
was inconsistent behavior.

Reported-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-10-18 20:45:26 -07:00
parent f4b6e53c4e
commit 0fc3a446e9
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
equipment.c
View file

@ -571,6 +571,14 @@ static void show_equipment(struct dive *dive, int max,
GtkTreeIter iter; GtkTreeIter iter;
GtkListStore *model = equipment_list->model; GtkListStore *model = equipment_list->model;
if (! model)
return;
if (! dive) {
gtk_widget_set_sensitive(equipment_list->edit, 0);
gtk_widget_set_sensitive(equipment_list->del, 0);
gtk_widget_set_sensitive(equipment_list->add, 0);
return;
}
gtk_list_store_clear(model); gtk_list_store_clear(model);
used = max; used = max;
do { do {
@ -1586,6 +1594,9 @@ GtkWidget *equipment_widget(int w_idx)
edit = gtk_button_new_from_stock(GTK_STOCK_EDIT); edit = gtk_button_new_from_stock(GTK_STOCK_EDIT);
add = gtk_button_new_from_stock(GTK_STOCK_ADD); add = gtk_button_new_from_stock(GTK_STOCK_ADD);
del = gtk_button_new_from_stock(GTK_STOCK_DELETE); del = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_set_sensitive(edit, FALSE);
gtk_widget_set_sensitive(add, FALSE);
gtk_widget_set_sensitive(del, FALSE);
gtk_box_pack_start(GTK_BOX(hbox), edit, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), del, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), del, FALSE, FALSE, 0);
@ -1623,6 +1634,9 @@ GtkWidget *equipment_widget(int w_idx)
edit = gtk_button_new_from_stock(GTK_STOCK_EDIT); edit = gtk_button_new_from_stock(GTK_STOCK_EDIT);
add = gtk_button_new_from_stock(GTK_STOCK_ADD); add = gtk_button_new_from_stock(GTK_STOCK_ADD);
del = gtk_button_new_from_stock(GTK_STOCK_DELETE); del = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_set_sensitive(edit, FALSE);
gtk_widget_set_sensitive(add, FALSE);
gtk_widget_set_sensitive(del, FALSE);
gtk_box_pack_start(GTK_BOX(hbox), edit, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), del, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), del, FALSE, FALSE, 0);

1
info.c
View file

@ -143,6 +143,7 @@ void show_dive_info(struct dive *dive)
SET_TEXT_VALUE(suit); SET_TEXT_VALUE(suit);
gtk_entry_set_text(rating, star_strings[0]); gtk_entry_set_text(rating, star_strings[0]);
gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes), "", -1); gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes), "", -1);
show_dive_equipment(NULL, W_IDX_PRIMARY);
return; return;
} }

2
main.c
View file

@ -201,8 +201,8 @@ void update_dive(struct dive *new_dive)
if (old_dive) { if (old_dive) {
flush_divelist(old_dive); flush_divelist(old_dive);
} }
show_dive_info(new_dive);
if (new_dive) { if (new_dive) {
show_dive_info(new_dive);
show_dive_equipment(new_dive, W_IDX_PRIMARY); show_dive_equipment(new_dive, W_IDX_PRIMARY);
show_dive_stats(new_dive); show_dive_stats(new_dive);
} }