Some UI beauty patches:

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index 186088bd4f95dd3450e33dc84079963da2267f91..99c4b6f2a104f0838ff07fe9a7b210b23206f02a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
@@ -25,7 +26,32 @@ static int sortfn(const void *_a, const void *_b)
  */
 static void report_dives(void)
 {
+       int i;
+
        qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
+
+       for (i = 1; i < dive_table.nr; i++) {
+               struct dive **pp = &dive_table.dives[i-1];
+               struct dive *prev = pp[0];
+               struct dive *dive = pp[1];
+               struct dive *merged;
+
+               if (prev->when + prev->duration.seconds < dive->when)
+                       continue;
+
+               merged = try_to_merge(prev, dive);
+               if (!merged)
+                       continue;
+
+               free(prev);
+               free(dive);
+               *pp = merged;
+               dive_table.nr--;
+               memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
+
+               /* Redo the new 'i'th dive */
+               i--;
+       }
 }
 
 static void parse_argument(const char *arg)
@@ -96,31 +122,52 @@ static void file_save(GtkWidget *w, gpointer data)
        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
                char *filename;
                filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-               printf("Save: '%s'\n", filename);
+               save_dives(filename);
                g_free(filename);
        }
        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)
@@ -130,6 +177,7 @@ int main(int argc, char **argv)
        GtkWidget *divelist;
        GtkWidget *table;
        GtkWidget *notebook;
+       GtkWidget *box;
        GtkWidget *frame;
        GtkWidget *menubar;
        GtkWidget *vbox;
@@ -151,7 +199,7 @@ int main(int argc, char **argv)
        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);
@@ -164,6 +212,7 @@ int main(int argc, char **argv)
        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 */
@@ -174,11 +223,12 @@ int main(int argc, char **argv)
        /* 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();
@@ -186,8 +236,8 @@ int main(int argc, char **argv)
        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);