X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=d125169e2898150bdddc46dd16a21a039ee0ee13;hb=9cf8d98711dff888f5bfa8efd52ca7b8cf8bfa07;hp=5367571ad6e6520c5b2fc6db21ee2c3907916f90;hpb=067506038a5fea72e60680513d768f89722671fd;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 5367571..d125169 100644 --- a/main.c +++ b/main.c @@ -14,12 +14,11 @@ GtkWidget *main_vbox; GtkWidget *error_info_bar; GtkWidget *error_label; int error_count; -struct DiveList dive_list; GConfClient *gconf; struct units output_units; -#define GCONF_NAME(x) "/apps/diveclog/" #x +#define GCONF_NAME(x) "/apps/subsurface/" #x static int sortfn(const void *_a, const void *_b) { @@ -37,7 +36,7 @@ static int sortfn(const void *_a, const void *_b) * This doesn't really report anything at all. We just sort the * dives, the GUI does the reporting */ -static void report_dives(void) +void report_dives(void) { int i; @@ -98,12 +97,13 @@ void update_dive(struct dive *new_dive) if (old_dive) { flush_dive_info_changes(old_dive); flush_dive_equipment_changes(old_dive); + flush_divelist(old_dive); } if (new_dive) { - buffered_dive = new_dive; show_dive_info(new_dive); show_dive_equipment(new_dive); } + buffered_dive = new_dive; } void repaint_dive(void) @@ -124,7 +124,7 @@ static void on_info_bar_response(GtkWidget *widget, gint response, } } -static void report_error(GError* error) +void report_error(GError* error) { if (error == NULL) { @@ -189,7 +189,7 @@ static void file_open(GtkWidget *w, gpointer data) } g_slist_free(filenames); report_dives(); - dive_list_update_dives(dive_list); + dive_list_update_dives(); } gtk_widget_destroy(dialog); } @@ -312,8 +312,10 @@ static void unit_dialog(GtkWidget *w, gpointer data) gtk_widget_show_all(dialog); result = gtk_dialog_run(GTK_DIALOG(dialog)); if (result == GTK_RESPONSE_ACCEPT) { + /* Make sure to flush any modified old dive data with old units */ + update_dive(NULL); output_units = menu_units; - update_dive_list_units(&dive_list); + update_dive_list_units(); repaint_dive(); gconf_client_set_bool(gconf, GCONF_NAME(feet), output_units.length == FEET, NULL); gconf_client_set_bool(gconf, GCONF_NAME(psi), output_units.pressure == PSI, NULL); @@ -323,12 +325,54 @@ static void unit_dialog(GtkWidget *w, gpointer data) gtk_widget_destroy(dialog); } +static void renumber_dives(int nr) +{ + int i; + + for (i = 0; i < dive_table.nr; i++) { + struct dive *dive = dive_table.dives[i]; + dive->number = nr + i; + } +} + +static void renumber_dialog(GtkWidget *w, gpointer data) +{ + int result; + GtkWidget *dialog, *frame, *button; + + dialog = gtk_dialog_new_with_buttons("Renumber", + GTK_WINDOW(main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + NULL); + + frame = gtk_frame_new("New starting number"); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), frame); + + button = gtk_spin_button_new_with_range(1, 50000, 1); + gtk_container_add(GTK_CONTAINER(frame), button); + + gtk_widget_show_all(dialog); + result = gtk_dialog_run(GTK_DIALOG(dialog)); + if (result == GTK_RESPONSE_ACCEPT) { + int nr = gtk_spin_button_get_value(GTK_SPIN_BUTTON(button)); + renumber_dives(nr); + repaint_dive(); + } + gtk_widget_destroy(dialog); +} + static GtkActionEntry menu_items[] = { - { "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL}, + { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, + { "LogMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL}, { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, + { "Print", GTK_STOCK_PRINT, NULL, "P", NULL, G_CALLBACK(do_print) }, + { "Import", NULL, "Import", NULL, NULL, G_CALLBACK(import_dialog) }, + { "Units", NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) }, + { "Renumber", NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) }, { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit) }, - { "Units", NULL, "Units", NULL, NULL, G_CALLBACK(unit_dialog) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); @@ -338,11 +382,16 @@ static const gchar* ui_string = " \ \ \ \ + \ \ - \ + \ \ \ \ + \ + \ + \ + \ \ \ "; @@ -363,6 +412,11 @@ static GtkWidget *get_menubar_menu(GtkWidget *window) return menu; } +static void switch_page(GtkNotebook *notebook, gint arg1, gpointer user_data) +{ + repaint_dive(); +} + int main(int argc, char **argv) { int i; @@ -370,8 +424,8 @@ int main(int argc, char **argv) GtkWidget *paned; GtkWidget *info_box; GtkWidget *notebook; - GtkWidget *frame; GtkWidget *dive_info; + GtkWidget *dive_list; GtkWidget *equipment; GtkWidget *menubar; GtkWidget *vbox; @@ -406,23 +460,20 @@ int main(int argc, char **argv) gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); /* HPane for left the dive list, and right the dive info */ - paned = gtk_hpaned_new(); + paned = gtk_vpaned_new(); gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0); /* Create the actual divelist */ dive_list = dive_list_create(); - gtk_paned_add1(GTK_PANED(paned), dive_list.container_widget); + gtk_paned_add2(GTK_PANED(paned), dive_list); /* VBox for dive info, and tabs */ info_box = gtk_vbox_new(FALSE, 6); - gtk_paned_add2(GTK_PANED(paned), info_box); - - /* Frame for minimal dive info */ - frame = dive_info_frame(); - gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 6); + gtk_paned_add1(GTK_PANED(paned), info_box); /* Notebook for dive info vs profile vs .. */ notebook = gtk_notebook_new(); + g_signal_connect(notebook, "switch-page", G_CALLBACK(switch_page), NULL); gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 6); /* Frame for dive profile */ @@ -459,7 +510,7 @@ int main(int argc, char **argv) } report_dives(); - dive_list_update_dives(dive_list); + dive_list_update_dives(); gtk_main(); return 0;