/* creates the UI for the info frame -
* controlled through the following interfaces:
*
- * void flush_dive_info_changes(struct dive *dive)
* void show_dive_info(struct dive *dive)
*
* called from gtk-ui:
#include <string.h>
#include <stdlib.h>
#include <time.h>
+#include <ctype.h>
#include "dive.h"
#include "display.h"
#include "display-gtk.h"
#include "divelist.h"
-static GtkComboBoxEntry *location, *buddy, *divemaster;
-static GtkTextBuffer *notes;
-static int location_changed = 1, notes_changed = 1;
-static int divemaster_changed = 1, buddy_changed = 1;
+static GtkEntry *location, *buddy, *divemaster, *rating;
+static GtkTextView *notes;
+static GtkListStore *location_list, *people_list, *star_list;
-static char *get_text(GtkTextBuffer *buffer)
+static char *get_text(GtkTextView *view)
{
+ GtkTextBuffer *buffer;
GtkTextIter start;
GtkTextIter end;
+ buffer = gtk_text_view_get_buffer(view);
gtk_text_buffer_get_start_iter(buffer, &start);
gtk_text_buffer_get_end_iter(buffer, &end);
return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
/* old is NULL or a valid string, new is a valid string
* NOTW: NULL and "" need to be treated as "unchanged" */
-static int text_changed(char *old, char *new)
+static int text_changed(const char *old, const char *new)
{
- return ((old && strcmp(old,new)) ||
- (!old && strcmp("",new)));
+ return (old && strcmp(old,new)) ||
+ (!old && strcmp("",new));
}
-void flush_dive_info_changes(struct dive *dive)
+static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
{
- char *old_text;
- int changed = 0;
-
- if (!dive)
- return;
-
- if (location_changed) {
- char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(location));
- old_text = dive->location;
- dive->location = new_text;
- if (text_changed(old_text,dive->location))
- changed = 1;
- if (old_text)
- g_free(old_text);
- }
-
- if (divemaster_changed) {
- char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(divemaster));
- old_text = dive->divemaster;
- dive->divemaster = new_text;
- if (text_changed(old_text,dive->divemaster))
- changed = 1;
- if (old_text)
- g_free(old_text);
- }
-
- if (buddy_changed) {
- char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(buddy));
- old_text = dive->buddy;
- dive->buddy = new_text;
- if (text_changed(old_text,dive->buddy))
- changed = 1;
- if (old_text)
- g_free(old_text);
- }
+ char *old = *textp;
+ const gchar *new;
+ GtkEntry *entry;
- if (notes_changed) {
- old_text = dive->notes;
- dive->notes = get_text(notes);
- if (text_changed(old_text,dive->notes))
- changed = 1;
- if (old_text)
- g_free(old_text);
- }
- if (changed)
- mark_divelist_changed(TRUE);
+ entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
+ new = gtk_entry_get_text(entry);
+ while (isspace(*new))
+ new++;
+ if (!text_changed(old,new))
+ return NULL;
+ free(old);
+ *textp = strdup(new);
+ return *textp;
}
-static void set_combo_box_entry_text(GtkComboBoxEntry *combo_box, const char *text)
+#define SET_TEXT_VALUE(x) \
+ gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
+
+static int divename(char *buf, size_t size, struct dive *dive)
{
- GtkEntry *entry = GTK_ENTRY(GTK_BIN(combo_box)->child);
- gtk_entry_set_text(entry, text);
+ struct tm *tm = gmtime(&dive->when);
+ return snprintf(buf, size, "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
+ dive->number,
+ weekday(tm->tm_wday),
+ tm->tm_mon+1, tm->tm_mday,
+ tm->tm_year+1900,
+ tm->tm_hour, tm->tm_min);
}
-#define SET_TEXT_ENTRY(x) \
- set_combo_box_entry_text(x, dive && dive->x ? dive->x : "")
-
void show_dive_info(struct dive *dive)
{
- struct tm *tm;
const char *text;
char buffer[80];
/* dive number and location (or lacking that, the date) go in the window title */
- tm = gmtime(&dive->when);
text = dive->location;
if (!text)
text = "";
if (*text) {
snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text);
} else {
- snprintf(buffer, sizeof(buffer), "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
- dive->number,
- weekday(tm->tm_wday),
- tm->tm_mon+1, tm->tm_mday,
- tm->tm_year+1900,
- tm->tm_hour, tm->tm_min);
+ divename(buffer, sizeof(buffer), dive);
}
text = buffer;
if (!dive->number)
text += 10; /* Skip the "Dive #0 - " part */
gtk_window_set_title(GTK_WINDOW(main_window), text);
- SET_TEXT_ENTRY(divemaster);
- SET_TEXT_ENTRY(buddy);
- SET_TEXT_ENTRY(location);
- gtk_text_buffer_set_text(notes, dive && dive->notes ? dive->notes : "", -1);
+ SET_TEXT_VALUE(divemaster);
+ SET_TEXT_VALUE(buddy);
+ SET_TEXT_VALUE(location);
+ gtk_entry_set_text(rating, star_strings[dive->rating]);
+ gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
+ dive && dive->notes ? dive->notes : "", -1);
+}
+
+static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
+{
+ edit_dive_info(current_dive);
+}
+
+static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
+{
+ GtkWidget *item = gtk_menu_item_new_with_label("Edit");
+ g_signal_connect(item, "activate", G_CALLBACK(info_menu_edit_cb), NULL);
+ gtk_widget_show(item); /* Yes, really */
+ gtk_menu_prepend(menu, item);
}
-static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions)
+static GtkEntry *text_value(GtkWidget *box, const char *label)
+{
+ GtkWidget *widget;
+ GtkWidget *frame = gtk_frame_new(label);
+
+ gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
+ widget = gtk_entry_new();
+ gtk_widget_set_can_focus(widget, FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(widget), FALSE);
+ gtk_container_add(GTK_CONTAINER(frame), widget);
+ g_signal_connect(widget, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
+ return GTK_ENTRY(widget);
+}
+
+static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text)
{
GtkEntry *entry;
GtkWidget *combo_box;
combo_box = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(completions), 0);
gtk_container_add(GTK_CONTAINER(frame), combo_box);
- entry = GTK_ENTRY(GTK_BIN(combo_box)->child);
+ entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box)));
+ if (text && *text)
+ gtk_entry_set_text(entry, text);
completion = gtk_entry_completion_new();
gtk_entry_completion_set_text_column(completion, 0);
return GTK_COMBO_BOX_ENTRY(combo_box);
}
-static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
+enum writable {
+ READ_ONLY,
+ READ_WRITE
+};
+
+static GtkTextView *text_view(GtkWidget *box, const char *label, enum writable writable)
{
GtkWidget *view, *vbox;
- GtkTextBuffer *buffer;
GtkWidget *frame = gtk_frame_new(label);
gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
view = gtk_text_view_new();
+ if (writable == READ_ONLY) {
+ gtk_widget_set_can_focus(view, FALSE);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
+ gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
+ g_signal_connect(view, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
+ }
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_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
- return buffer;
+ return GTK_TEXT_VIEW(view);
}
static enum {
return found_string_entry;
}
-static GtkListStore *location_list, *people_list;
-
static void add_string_list_entry(const char *string, GtkListStore *list)
{
GtkTreeIter *iter, loc;
add_string_list_entry(string, location_list);
}
+static int get_rating(const char *string)
+{
+ int rating_val = 0;
+ int i;
+
+ for (i = 0; i <= 5; i++)
+ if (!strcmp(star_strings[i],string))
+ rating_val = i;
+ return rating_val;
+}
+
+struct dive_info {
+ GtkComboBoxEntry *location, *divemaster, *buddy, *rating;
+ GtkTextView *notes;
+};
+
+static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
+{
+ char *old_text, *new_text;
+ char *rating_string;
+ int changed = 0;
+
+ new_text = get_combo_box_entry_text(info->location, &dive->location);
+ if (new_text) {
+ add_location(new_text);
+ changed = 1;
+ }
+
+ new_text = get_combo_box_entry_text(info->divemaster, &dive->divemaster);
+ if (new_text) {
+ add_people(new_text);
+ changed = 1;
+ }
+
+ new_text = get_combo_box_entry_text(info->buddy, &dive->buddy);
+ if (new_text) {
+ add_people(new_text);
+ changed = 1;
+ }
+
+ rating_string = strdup(star_strings[dive->rating]);
+ new_text = get_combo_box_entry_text(info->rating, &rating_string);
+ if (new_text) {
+ dive->rating = get_rating(rating_string);
+ free(rating_string);
+ changed =1;
+ }
+
+ old_text = dive->notes;
+ dive->notes = get_text(info->notes);
+ if (text_changed(old_text,dive->notes))
+ changed = 1;
+ if (old_text)
+ g_free(old_text);
+
+ if (changed) {
+ mark_divelist_changed(TRUE);
+ flush_divelist(dive);
+ }
+}
+
+static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info)
+{
+ GtkWidget *hbox, *label, *cylinder, *frame;
+ char buffer[80];
+
+ divename(buffer, sizeof(buffer), dive);
+ label = gtk_label_new(buffer);
+ gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
+
+ info->location = text_entry(box, "Location", location_list, dive->location);
+
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
+ info->divemaster = text_entry(hbox, "Dive master", people_list, dive->divemaster);
+ info->buddy = text_entry(hbox, "Buddy", people_list, dive->buddy);
+
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
+ info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]);
+
+ info->notes = text_view(box, "Notes", READ_WRITE);
+ if (dive->notes && *dive->notes)
+ gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), dive->notes, -1);
+
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
+ frame = gtk_frame_new("Cylinder");
+ cylinder = cylinder_list_widget();
+ gtk_container_add(GTK_CONTAINER(frame), cylinder);
+ gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
+}
+
+int edit_dive_info(struct dive *dive)
+{
+ int success;
+ GtkWidget *dialog, *vbox;
+ struct dive_info info;
+
+ if (!dive)
+ return 0;
+
+ dialog = gtk_dialog_new_with_buttons("Dive Info",
+ 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));
+ dive_info_widget(vbox, dive, &info);
+
+ gtk_widget_show_all(dialog);
+ success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT;
+ if (success)
+ save_dive_info_changes(dive, &info);
+
+ gtk_widget_destroy(dialog);
+
+ return success;
+}
+
GtkWidget *extended_dive_info_widget(void)
{
GtkWidget *vbox, *hbox;
people_list = gtk_list_store_new(1, G_TYPE_STRING);
location_list = gtk_list_store_new(1, G_TYPE_STRING);
+ star_list = gtk_list_store_new(1, G_TYPE_STRING);
+ add_string_list_entry(ZERO_STARS, star_list);
+ add_string_list_entry(ONE_STARS, star_list);
+ add_string_list_entry(TWO_STARS, star_list);
+ add_string_list_entry(THREE_STARS, star_list);
+ add_string_list_entry(FOUR_STARS, star_list);
+ add_string_list_entry(FIVE_STARS, star_list);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
- location = text_entry(vbox, "Location", location_list);
+ location = text_value(vbox, "Location");
+
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
+ divemaster = text_value(hbox, "Divemaster");
+ buddy = text_value(hbox, "Buddy");
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
- divemaster = text_entry(hbox, "Divemaster", people_list);
- buddy = text_entry(hbox, "Buddy", people_list);
+ rating = text_value(hbox, "Rating");
- notes = text_view(vbox, "Notes");
+ notes = text_view(vbox, "Notes", READ_ONLY);
return vbox;
}