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)
{
* 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(old_dive);
}
if (new_dive) {
show_dive_info(new_dive);
}
}
-static void report_error(GError* error)
+void report_error(GError* error)
{
if (error == NULL)
{
}
g_slist_free(filenames);
report_dives();
- dive_list_update_dives(dive_list);
+ dive_list_update_dives();
}
gtk_widget_destroy(dialog);
}
/* 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);
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, "<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) },
{ "Quit", GTK_STOCK_QUIT, NULL, "<control>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]);
<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=\"Units\" action=\"Units\" /> \
+ <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\" /> \
+ </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 *dive_list;
GtkWidget *equipment;
GtkWidget *menubar;
GtkWidget *vbox;
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 */
}
report_dives();
- dive_list_update_dives(dive_list);
+ dive_list_update_dives();
gtk_main();
return 0;
projects / ext / subsurface.git / blobdiff