Fix default size for scrollable notebook

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index 0ee401488062aa3105850863bf15c1c8feaca8b0..adc6c590239d6837416f9f05038c10aac862dc1d 100644 (file)
--- a/info.c
+++ b/info.c
@@ -175,9 +175,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);
@@ -185,8 +193,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)
@@ -452,25 +460,33 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
 /* we use these to find out if we edited the cylinder or weightsystem entries */
 static cylinder_t remember_cyl[MAX_CYLINDERS];
 static weightsystem_t remember_ws[MAX_WEIGHTSYSTEMS];
+#define CYL_BYTES sizeof(cylinder_t) * MAX_CYLINDERS
+#define WS_BYTES sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS
 
 void save_equipment_data(struct dive *dive)
 {
        if (dive) {
-               memcpy(remember_cyl, dive->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
-               memcpy(remember_ws, dive->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
+               memcpy(remember_cyl, dive->cylinder, CYL_BYTES);
+               memcpy(remember_ws, dive->weightsystem, WS_BYTES);
        }
 }
 
+/* the editing happens on the master dive; we copy the equipment
+   data if it has changed in the master dive and the other dive
+   either has no entries for the equipment or the same entries
+   as the master dive had before it was edited */
 void update_equipment_data(struct dive *dive, struct dive *master)
 {
        if (dive == master)
                return;
-       if (memcmp(remember_cyl, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS)) {
-               memcpy(dive->cylinder, master->cylinder, sizeof(cylinder_t) * MAX_CYLINDERS);
-       }
-       if (memcmp(remember_ws, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS)) {
-               memcpy(dive->weightsystem, master->weightsystem, sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS);
-       }
+       if ( ! cylinders_equal(remember_cyl, master->cylinder) &&
+               (no_cylinders(dive->cylinder) ||
+                       cylinders_equal(dive->cylinder, remember_cyl)))
+               memcpy(dive->cylinder, master->cylinder, CYL_BYTES);
+       if (! weightsystems_equal(remember_ws, master->weightsystem) &&
+               (no_weightsystems(dive->weightsystem) ||
+                       weightsystems_equal(dive->weightsystem, remember_ws)))
+               memcpy(dive->weightsystem, master->weightsystem, WS_BYTES);
 }
 
 int edit_multi_dive_info(int nr, int *indices)
@@ -566,9 +582,7 @@ static time_t dive_time_widget(struct dive *dive)
        GtkWidget *duration, *depth;
        GtkWidget *label;
        guint yval, mval, dval;
-       struct tm tm, *tmp;
-       struct timeval tv;
-       time_t time;
+       struct tm tm, *time;
        int success;
        double depthinterval, val;
 
@@ -592,11 +606,27 @@ static time_t dive_time_widget(struct dive *dive)
        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);
+       /*
+        * If we have a dive selected, 'add dive' will default
+        * to one hour after the end of that dive. Otherwise,
+        * we'll just take the current time.
+        */
+       if (amount_selected == 1) {
+               time_t when = current_dive->when;
+               when += current_dive->duration.seconds;
+               when += 60*60;
+               time = gmtime(&when);
+       } else {
+               time_t now;
+               struct timeval tv;
+               gettimeofday(&tv, NULL);
+               now = tv.tv_sec;
+               time = localtime(&now);
+       }
+       gtk_calendar_select_month(GTK_CALENDAR(cal), time->tm_mon, time->tm_year + 1900);
+       gtk_calendar_select_day(GTK_CALENDAR(cal), time->tm_mday);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(h), time->tm_hour);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(m), (time->tm_min / 5)*5);
 
        gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(h), TRUE);
        gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(m), TRUE);