#include "dive.h"
#include "display.h"
+#include "divelist.h"
static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
-static GtkTextBuffer *location, *notes;
+static GtkEntry *location;
+static GtkTextBuffer *notes;
static int location_changed = 1, notes_changed = 1;
static struct dive *buffered_dive;
if (location_changed) {
g_free(dive->location);
- dive->location = get_text(location);
+ dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1);
}
if (notes_changed) {
tm->tm_hour, tm->tm_min, tm->tm_sec);
gtk_label_set_text(GTK_LABEL(divetime), buffer);
- snprintf(buffer, sizeof(buffer),
- "%d ft",
- to_feet(dive->maxdepth));
+ switch (output_units.length) {
+ case METERS:
+ snprintf(buffer, sizeof(buffer),
+ "%.1f m",
+ dive->maxdepth.mm / 1000.0);
+ break;
+ case FEET:
+ snprintf(buffer, sizeof(buffer),
+ "%d ft",
+ to_feet(dive->maxdepth));
+ break;
+ }
gtk_label_set_text(GTK_LABEL(depth), buffer);
snprintf(buffer, sizeof(buffer),
gtk_label_set_text(GTK_LABEL(duration), buffer);
*buffer = 0;
- if (dive->watertemp.mkelvin)
- snprintf(buffer, sizeof(buffer),
- "%d C",
- to_C(dive->watertemp));
+ if (dive->watertemp.mkelvin) {
+ switch (output_units.temperature) {
+ case CELSIUS:
+ snprintf(buffer, sizeof(buffer),
+ "%d C",
+ to_C(dive->watertemp));
+ break;
+ case FAHRENHEIT:
+ snprintf(buffer, sizeof(buffer),
+ "%d F",
+ to_F(dive->watertemp));
+ break;
+ case KELVIN:
+ snprintf(buffer, sizeof(buffer),
+ "%d K",
+ to_K(dive->watertemp));
+ break;
+ }
+ }
gtk_label_set_text(GTK_LABEL(temperature), buffer);
text = dive->location ? : "";
- gtk_text_buffer_set_text(location, text, -1);
+ gtk_entry_set_text(location, text);
gtk_label_set_text(GTK_LABEL(locationnote), text);
text = dive->notes ? : "";
frame = gtk_frame_new("Dive info");
gtk_widget_show(frame);
- vbox = gtk_vbox_new(TRUE, 5);
+ vbox = gtk_vbox_new(TRUE, 6);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 3);
gtk_container_add(GTK_CONTAINER(frame), vbox);
- hbox = gtk_hbox_new(TRUE, 5);
+ hbox = gtk_hbox_new(TRUE, 6);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
- hbox2 = gtk_hbox_new(FALSE, 0);
+ hbox2 = gtk_hbox_new(FALSE, 6);
gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3);
gtk_container_add(GTK_CONTAINER(vbox), hbox2);
return frame;
}
-static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand)
+static GtkEntry *text_entry(GtkWidget *box, const char *label)
+{
+ GtkWidget *entry;
+
+ GtkWidget *frame = gtk_frame_new(label);
+
+ gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
+
+ entry = gtk_entry_new ();
+ gtk_container_add(GTK_CONTAINER(frame), entry);
+
+ return GTK_ENTRY(entry);
+}
+
+static GtkTextBuffer *text_view(GtkWidget *box, const char *label, gboolean expand)
{
GtkWidget *view;
GtkTextBuffer *buffer;
gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
+ GtkWidget* scrolled_window = gtk_scrolled_window_new (0, 0);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
+ gtk_widget_show(scrolled_window);
+
view = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
+ gtk_container_add(GTK_CONTAINER(scrolled_window), view);
+
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
- gtk_container_add(GTK_CONTAINER(frame), view);
+ gtk_container_add(GTK_CONTAINER(frame), scrolled_window);
return buffer;
}
-GtkWidget *extended_dive_info_frame(void)
+GtkWidget *extended_dive_info_widget(void)
{
- GtkWidget *frame;
GtkWidget *vbox;
- frame = gtk_frame_new("Extended dive info");
- gtk_widget_show(frame);
+ vbox = gtk_vbox_new(FALSE, 6);
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
-
- location = text_entry(vbox, "Location", FALSE);
- notes = text_entry(vbox, "Notes", TRUE);
+ location = text_entry(vbox, "Location");
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ notes = text_view(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */
update_dive_info(current_dive);
- return frame;
+ return vbox;
}