Changes to menu icons

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index 813d58adcfb0572dc88c278ca13820bd2e0380d3..e935823b2ddb267b56d25ca63eda2d8f415fdaf4 100644 (file)
--- a/info.c
+++ b/info.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
+#include <sys/time.h>
 
 #include "dive.h"
 #include "display.h"
@@ -138,9 +139,17 @@ static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data)
        delete_dive_info(current_dive);
 }
 
-static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuItem *, gpointer))
+static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, void (*cb)(GtkMenuItem *, gpointer))
 {
-       GtkWidget *item = gtk_menu_item_new_with_label(label);
+       GtkWidget *item;
+       if (icon) {
+               GtkWidget *image;
+               item = gtk_image_menu_item_new_with_label(label);
+               image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU);
+               gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+       } else {
+               item = gtk_menu_item_new_with_label(label);
+       }
        g_signal_connect(item, "activate", G_CALLBACK(cb), NULL);
        gtk_widget_show(item); /* Yes, really */
        gtk_menu_prepend(menu, item);
@@ -148,8 +157,8 @@ static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuIt
 
 static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
 {
-       add_menu_item(menu, "Delete", info_menu_delete_cb);
-       add_menu_item(menu, "Edit", info_menu_edit_cb);
+       add_menu_item(menu, "Delete", GTK_STOCK_DELETE, info_menu_delete_cb);
+       add_menu_item(menu, "Edit", GTK_STOCK_EDIT, info_menu_edit_cb);
 }
 
 static GtkEntry *text_value(GtkWidget *box, const char *label)
@@ -420,6 +429,133 @@ int edit_dive_info(struct dive *dive)
        return success;
 }
 
+static GtkWidget *frame_box(GtkWidget *vbox, const char *fmt, ...)
+{
+       va_list ap;
+       char buffer[64];
+       GtkWidget *frame, *hbox;
+
+       va_start(ap, fmt);
+       vsnprintf(buffer, sizeof(buffer), fmt, ap);
+       va_end(ap);
+
+       frame = gtk_frame_new(buffer);
+       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+       hbox = gtk_hbox_new(0, 3);
+       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       return hbox;
+}
+
+/* Fixme - should do at least depths too - a dive without a depth is kind of pointless */
+static time_t dive_time_widget(struct dive *dive)
+{
+       GtkWidget *dialog;
+       GtkWidget *cal, *hbox, *vbox, *box;
+       GtkWidget *h, *m;
+       GtkWidget *duration, *depth;
+       GtkWidget *label;
+       guint yval, mval, dval;
+       struct tm tm, *tmp;
+       struct timeval tv;
+       time_t time;
+       int success;
+       double depthinterval, val;
+
+       dialog = gtk_dialog_new_with_buttons("Date and Time",
+               GTK_WINDOW(main_window),
+               GTK_DIALOG_DESTROY_WITH_PARENT,
+               GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+               GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+               NULL);
+
+       vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+
+       /* Calendar hbox */
+       hbox = frame_box(vbox, "Date:");
+       cal = gtk_calendar_new();
+       gtk_box_pack_start(GTK_BOX(hbox), cal, FALSE, TRUE, 0);
+
+       /* Time hbox */
+       hbox = frame_box(vbox, "Time");
+
+       h = gtk_spin_button_new_with_range (0.0, 23.0, 1.0);
+       m = gtk_spin_button_new_with_range (0.0, 59.0, 1.0);
+
+       gettimeofday(&tv, NULL);
+       time = tv.tv_sec;
+       tmp = localtime(&time);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(h), tmp->tm_hour);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(m), (tmp->tm_min / 5)*5);
+
+       gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(h), TRUE);
+       gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(m), TRUE);
+
+       gtk_box_pack_end(GTK_BOX(hbox), m, FALSE, FALSE, 0);
+       label = gtk_label_new(":");
+       gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(hbox), h, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new(TRUE, 3);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+       /* Duration hbox */
+       box = frame_box(hbox, "Duration (min)");
+       duration = gtk_spin_button_new_with_range (0.0, 1000.0, 1.0);
+       gtk_box_pack_end(GTK_BOX(box), duration, FALSE, FALSE, 0);
+
+       /* Depth box */
+       box = frame_box(hbox, "Depth (%s):", output_units.length == FEET ? "ft" : "m");
+       if (output_units.length == FEET) {
+               depthinterval = 1.0;
+       } else {
+               depthinterval = 0.1;
+       }
+       depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval);
+       gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0);
+
+       /* All done, show it and wait for editing */
+       gtk_widget_show_all(dialog);
+       success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
+       if (!success) {
+               gtk_widget_destroy(dialog);
+               return 0;
+       }
+
+       memset(&tm, 0, sizeof(tm));
+       gtk_calendar_get_date(GTK_CALENDAR(cal), &yval, &mval, &dval);
+       tm.tm_year = yval;
+       tm.tm_mon = mval;
+       tm.tm_mday = dval;
+
+       tm.tm_hour = gtk_spin_button_get_value(GTK_SPIN_BUTTON(h));
+       tm.tm_min = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m));
+
+       val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(depth));
+       if (output_units.length == FEET) {
+               dive->maxdepth.mm = feet_to_mm(val);
+       } else {
+               dive->maxdepth.mm = val * 1000 + 0.5;
+       }
+
+       dive->duration.seconds = gtk_spin_button_get_value(GTK_SPIN_BUTTON(duration))*60;
+
+       gtk_widget_destroy(dialog);
+       dive->when = utc_mktime(&tm);
+
+       return 1;
+}
+
+int add_new_dive(struct dive *dive)
+{
+       if (!dive)
+               return 0;
+
+       if (!dive_time_widget(dive))
+               return 0;
+
+       return edit_dive_info(dive);
+}
+
 GtkWidget *extended_dive_info_widget(void)
 {
        GtkWidget *vbox, *hbox;