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)
{
* 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;
if (old_dive) {
flush_dive_info_changes(old_dive);
flush_dive_equipment_changes(old_dive);
+ flush_divelist(&dive_list, old_dive);
}
if (new_dive) {
show_dive_info(new_dive);
}
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, "<control>O", NULL, G_CALLBACK(file_open) },
{ "SaveFile", GTK_STOCK_SAVE, NULL, "<control>S", NULL, G_CALLBACK(file_save) },
+ { "Print", GTK_STOCK_PRINT, NULL, "<control>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) },
<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
<menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Save\" action=\"SaveFile\" /> \
+ <menuitem name=\"Print\" action=\"Print\" /> \
<separator name=\"Separator1\"/> \
<menuitem name=\"Import\" action=\"Import\" /> \
<separator name=\"Separator2\"/> \
+ <menuitem name=\"Quit\" action=\"Quit\" /> \
+ </menu> \
+ <menu name=\"LogMenu\" action=\"LogMenuAction\"> \
<menuitem name=\"Units\" action=\"Units\" /> \
<menuitem name=\"Renumber\" action=\"Renumber\" /> \
- <separator name=\"Separator3\"/> \
- <menuitem name=\"Quit\" action=\"Quit\" /> \
</menu> \
</menubar> \
</ui> \
return menu;
}
+static void switch_page(GtkNotebook *notebook, gint arg1, gpointer user_data)
+{
+ repaint_dive();
+}
+
int main(int argc, char **argv)
{
int i;
GtkWidget *paned;
GtkWidget *info_box;
GtkWidget *notebook;
- GtkWidget *frame;
GtkWidget *dive_info;
GtkWidget *equipment;
GtkWidget *menubar;
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.container_widget);
/* 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 */