return 0;
}
-static int alloc_samples;
-
-/* Don't pick a zero for MERGE_MIN() */
-#define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
-#define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
-
-static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
-{
- int nr = dive->samples;
- struct sample *d;
-
- if (nr >= alloc_samples) {
- alloc_samples = (alloc_samples + 64) * 3 / 2;
- dive = realloc(dive, dive_size(alloc_samples));
- if (!dive)
- return NULL;
- }
- dive->samples = nr+1;
- d = dive->sample + nr;
-
- *d = *sample;
- d->time.seconds = time;
- return dive;
-}
-
-/*
- * Merge samples. Dive 'a' is "offset" seconds before Dive 'b'
- */
-static struct dive *merge_samples(struct dive *res, struct dive *a, struct dive *b, int offset)
-{
- int asamples = a->samples;
- int bsamples = b->samples;
- struct sample *as = a->sample;
- struct sample *bs = b->sample;
-
- for (;;) {
- int at, bt;
- struct sample sample;
-
- if (!res)
- return NULL;
-
- at = asamples ? as->time.seconds : -1;
- bt = bsamples ? bs->time.seconds + offset : -1;
-
- /* No samples? All done! */
- if (at < 0 && bt < 0)
- return res;
-
- /* Only samples from a? */
- if (bt < 0) {
-add_sample_a:
- res = add_sample(as, at, res);
- as++;
- asamples--;
- continue;
- }
-
- /* Only samples from b? */
- if (at < 0) {
-add_sample_b:
- res = add_sample(bs, bt, res);
- bs++;
- bsamples--;
- continue;
- }
-
- if (at < bt)
- goto add_sample_a;
- if (at > bt)
- goto add_sample_b;
-
- /* same-time sample: add a merged sample. Take the non-zero ones */
- sample = *bs;
- if (as->depth.mm)
- sample.depth = as->depth;
- if (as->temperature.mkelvin)
- sample.temperature = as->temperature;
- if (as->tankpressure.mbar)
- sample.tankpressure = as->tankpressure;
- if (as->tankindex)
- sample.tankindex = as->tankindex;
-
- res = add_sample(&sample, at, res);
-
- as++;
- bs++;
- asamples--;
- bsamples--;
- }
-}
-
-static char *merge_text(const char *a, const char *b)
-{
- char *res;
-
- if (!a || !*a)
- return (char *)b;
- if (!b || !*b)
- return (char *)a;
- if (!strcmp(a,b))
- return (char *)a;
- res = malloc(strlen(a) + strlen(b) + 9);
- if (!res)
- return (char *)a;
- sprintf(res, "(%s) or (%s)", a, b);
- return res;
-}
-
-/*
- * This could do a lot more merging. Right now it really only
- * merges almost exact duplicates - something that happens easily
- * with overlapping dive downloads.
- */
-static struct dive *try_to_merge(struct dive *a, struct dive *b)
-{
- int i;
- struct dive *res;
-
- if (a->when != b->when)
- return NULL;
-
- alloc_samples = 5;
- res = malloc(dive_size(alloc_samples));
- if (!res)
- return NULL;
- memset(res, 0, dive_size(alloc_samples));
-
- res->when = a->when;
- res->name = merge_text(a->name, b->name);
- res->location = merge_text(a->location, b->location);
- res->notes = merge_text(a->notes, b->notes);
- MERGE_MAX(res, a, b, maxdepth.mm);
- MERGE_MAX(res, a, b, meandepth.mm); /* recalc! */
- MERGE_MAX(res, a, b, duration.seconds);
- MERGE_MAX(res, a, b, surfacetime.seconds);
- MERGE_MAX(res, a, b, airtemp.mkelvin);
- MERGE_MIN(res, a, b, watertemp.mkelvin);
- MERGE_MAX(res, a, b, beginning_pressure.mbar);
- MERGE_MAX(res, a, b, end_pressure.mbar);
- for (i = 0; i < MAX_MIXES; i++) {
- if (a->gasmix[i].o2.permille) {
- res->gasmix[i] = a->gasmix[i];
- continue;
- }
- res->gasmix[i] = b->gasmix[i];
- }
- return merge_samples(res, a, b, 0);
-}
-
/*
* This doesn't really report anything at all. We just sort the
* dives, the GUI does the reporting
gtk_widget_destroy(dialog);
}
-static GtkItemFactoryEntry menu_items[] = {
- { "/_File", NULL, NULL, 0, "<Branch>" },
- { "/File/_Open", "<control>O", file_open, 0, "<StockItem>", GTK_STOCK_OPEN },
- { "/File/_Save", "<control>S", file_save, 0, "<StockItem>", GTK_STOCK_SAVE },
+static void quit(GtkWidget *w, gpointer data)
+{
+ gtk_main_quit();
+}
+
+static GtkActionEntry menu_items[] = {
+ { "FileMenuAction", 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) },
+ { "Quit", GTK_STOCK_QUIT, NULL, "<control>Q", NULL, G_CALLBACK(quit) },
};
static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-/* This is just directly from the gtk menubar tutorial. */
+static const gchar* ui_string = " \
+ <ui> \
+ <menubar name=\"MainMenu\"> \
+ <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
+ <menuitem name=\"Open\" action=\"OpenFile\" /> \
+ <menuitem name=\"Save\" action=\"SaveFile\" /> \
+ <separator name=\"Seperator\"/> \
+ <menuitem name=\"Quit\" action=\"Quit\" /> \
+ </menu> \
+ </menubar> \
+ </ui> \
+";
+
static GtkWidget *get_menubar_menu(GtkWidget *window)
{
- GtkItemFactory *item_factory;
- GtkAccelGroup *accel_group;
+ GtkActionGroup *action_group = gtk_action_group_new("Menu");
+ gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0);
+
+ GtkUIManager *ui_manager = gtk_ui_manager_new();
+ gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
+ GError* error = 0;
+ gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error);
- accel_group = gtk_accel_group_new();
- item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
+ gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager));
+ GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
- gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
- gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
- return gtk_item_factory_get_widget(item_factory, "<main>");
+ return menu;
}
int main(int argc, char **argv)
GtkWidget *divelist;
GtkWidget *table;
GtkWidget *notebook;
+ GtkWidget *box;
GtkWidget *frame;
GtkWidget *menubar;
GtkWidget *vbox;
report_dives();
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
+ g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
main_window = win;
vbox = gtk_vbox_new(FALSE, 0);
table = gtk_table_new(2, 2, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 5);
gtk_box_pack_end(GTK_BOX(vbox), table, TRUE, TRUE, 0);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table);
/* Create the atual divelist */
/* Frame for minimal dive info */
frame = dive_info_frame();
gtk_table_attach(GTK_TABLE(table), frame, 1, 2, 0, 1,
- GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+ GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 6, 6);
/* Notebook for dive info vs profile vs .. */
notebook = gtk_notebook_new();
- gtk_table_attach_defaults(GTK_TABLE(table), notebook, 1, 2, 1, 2);
+ gtk_table_attach(GTK_TABLE(table), notebook, 1, 2, 1, 2,
+ GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 6, 6);
/* Frame for dive profile */
frame = dive_profile_frame();
dive_profile = frame;
/* Frame for extended dive info */
- frame = extended_dive_info_frame();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info"));
+ box = extended_dive_info_box();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), box, gtk_label_new("Extended Dive Info"));
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);
projects / ext / subsurface.git / blobdiff