X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=ac043fd39d912527d6540a9b173cc823845caf45;hb=fefcbf125e89735d748307d0506938e4d4105321;hp=23570828e0e0490f3caac92de8142f8af9dddeee;hpb=425649a27816dbef9a6684b1da53e2ca6d8b7bd9;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 2357082..ac043fd 100644 --- a/main.c +++ b/main.c @@ -19,7 +19,7 @@ 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 +37,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; @@ -367,6 +367,7 @@ static GtkActionEntry menu_items[] = { { "FileMenuAction", 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) }, @@ -380,6 +381,7 @@ static const gchar* ui_string = " \ \ \ \ + \ \ \ \ @@ -408,6 +410,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; @@ -415,7 +422,6 @@ int main(int argc, char **argv) GtkWidget *paned; GtkWidget *info_box; GtkWidget *notebook; - GtkWidget *frame; GtkWidget *dive_info; GtkWidget *equipment; GtkWidget *menubar; @@ -462,12 +468,9 @@ int main(int argc, char **argv) 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); - /* 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 */