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

Keep the "OK" button in "Import" disabled until a DC is selected

Browse source 
Only call report_dives() for GTK_RESPONSE_ACCEPT in the same dialog.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2012-09-21 21:32:12 +03:00 • committed by Dirk Hohndel
parent 529a72e6b4
commit 789cb0c710
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gtk-gui.c
View file

@ -1240,6 +1240,14 @@ void render_dive_computer(GtkCellLayout *cell,
g_object_set(renderer, "text", buffer, NULL); g_object_set(renderer, "text", buffer, NULL);
} }
static void dive_computer_selector_changed(GtkWidget *combo, gpointer data)
{
GtkWidget *import, *button;
import = gtk_widget_get_ancestor(combo, GTK_TYPE_DIALOG);
button = gtk_dialog_get_widget_for_response(GTK_DIALOG(import), GTK_RESPONSE_ACCEPT);
gtk_widget_set_sensitive(button, TRUE);
}
static GtkComboBox *dive_computer_selector(GtkWidget *vbox) static GtkComboBox *dive_computer_selector(GtkWidget *vbox)
{ {
@ -1258,6 +1266,7 @@ static GtkComboBox *dive_computer_selector(GtkWidget *vbox)
gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3); gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3);
combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(dive_computer_selector_changed), NULL);
gtk_container_add(GTK_CONTAINER(frame), combo_box); gtk_container_add(GTK_CONTAINER(frame), combo_box);
renderer = gtk_cell_renderer_text_new(); renderer = gtk_cell_renderer_text_new();
@ -1397,9 +1406,10 @@ static GtkWidget *import_dive_computer(device_data_t *data, GtkDialog *dialog)
void import_dialog(GtkWidget *w, gpointer data) void import_dialog(GtkWidget *w, gpointer data)
{ {
int result; int result;
GtkWidget *dialog, *hbox, *vbox, *label, *info = NULL; GtkWidget *dialog, *button, *hbox, *vbox, *label, *info = NULL;
GSList *filenames = NULL; GSList *filenames = NULL;
GtkComboBox *computer; GtkComboBox *computer;
GtkTreeIter iter;
GtkEntry *device; GtkEntry *device;
device_data_t devicedata = { device_data_t devicedata = {
.devname = NULL, .devname = NULL,
@ -1423,12 +1433,15 @@ void import_dialog(GtkWidget *w, gpointer data)
devicedata.progress.bar = gtk_progress_bar_new(); devicedata.progress.bar = gtk_progress_bar_new();
gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress.bar); gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress.bar);
button = gtk_dialog_get_widget_for_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
if (!gtk_combo_box_get_active_iter(computer, &iter))
gtk_widget_set_sensitive(button, FALSE);
repeat: repeat:
gtk_widget_show_all(dialog); gtk_widget_show_all(dialog);
result = gtk_dialog_run(GTK_DIALOG(dialog)); result = gtk_dialog_run(GTK_DIALOG(dialog));
switch (result) { switch (result) {
dc_descriptor_t *descriptor; dc_descriptor_t *descriptor;
GtkTreeIter iter;
GtkTreeModel *model; GtkTreeModel *model;
case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_ACCEPT:
@ -1441,6 +1454,7 @@ repeat:
if (!gtk_combo_box_get_active_iter(computer, &iter)) if (!gtk_combo_box_get_active_iter(computer, &iter))
break; break;
model = gtk_combo_box_get_model(computer); model = gtk_combo_box_get_model(computer);
gtk_tree_model_get(model, &iter, gtk_tree_model_get(model, &iter,
0, &descriptor, 0, &descriptor,
@ -1462,13 +1476,12 @@ repeat:
g_slist_foreach(filenames,do_import_file,NULL); g_slist_foreach(filenames,do_import_file,NULL);
g_slist_free(filenames); g_slist_free(filenames);
} }
report_dives(TRUE);
break; break;
default: default:
break; break;
} }
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
report_dives(TRUE);
} }
void update_progressbar(progressbar_t *progress, double value) void update_progressbar(progressbar_t *progress, double value)