mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
Make double-clicking on the dive list bring up the dive editor
Now that the dive info window is read-only, we need to edit the dives some other way. We bring up a dive info edit dialog when you double-click on the dive list entry for that dive. I do want to have an "edit" button or keyboard shortcut or something too, though. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds
parent
842b05415f
commit
1efcf4538b
5 changed files with 128 additions and 71 deletions
3
dive.h
3
dive.h
|
|
@ -259,10 +259,8 @@ extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
|
|||
#endif
|
||||
|
||||
extern void show_dive_info(struct dive *);
|
||||
extern void flush_dive_info_changes(struct dive *);
|
||||
|
||||
extern void show_dive_equipment(struct dive *);
|
||||
extern void flush_dive_equipment_changes(struct dive *);
|
||||
|
||||
extern void show_dive_stats(struct dive *);
|
||||
|
||||
|
|
@ -304,6 +302,7 @@ extern void add_location(const char *string);
|
|||
extern void remember_event(const char *eventname);
|
||||
extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data);
|
||||
|
||||
extern int edit_dive_info(struct dive *dive);
|
||||
extern void dive_list_update_dives(void);
|
||||
extern void flush_divelist(struct dive *dive);
|
||||
|
||||
|
|
|
|||
15
divelist.c
15
divelist.c
|
|
@ -506,6 +506,20 @@ static void realize_cb(GtkWidget *tree_view, gpointer userdata)
|
|||
gtk_widget_grab_focus(tree_view);
|
||||
}
|
||||
|
||||
static void row_activated_cb(GtkTreeView *tree_view,
|
||||
GtkTreePath *path,
|
||||
GtkTreeViewColumn *column,
|
||||
GtkTreeModel *model)
|
||||
{
|
||||
int index;
|
||||
GtkTreeIter iter;
|
||||
|
||||
if (!gtk_tree_model_get_iter(model, &iter, path))
|
||||
return;
|
||||
gtk_tree_model_get(model, &iter, DIVE_INDEX, &index, -1);
|
||||
edit_dive_info(get_dive(index));
|
||||
}
|
||||
|
||||
GtkWidget *dive_list_create(void)
|
||||
{
|
||||
GtkTreeSelection *selection;
|
||||
|
|
@ -551,6 +565,7 @@ GtkWidget *dive_list_create(void)
|
|||
NULL);
|
||||
|
||||
g_signal_connect_after(dive_list.tree_view, "realize", G_CALLBACK(realize_cb), NULL);
|
||||
g_signal_connect(dive_list.tree_view, "row-activated", G_CALLBACK(row_activated_cb), dive_list.model);
|
||||
g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), dive_list.model);
|
||||
|
||||
dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
* controlled through the following interfaces:
|
||||
*
|
||||
* void show_dive_equipment(struct dive *dive)
|
||||
* void flush_dive_equipment_changes(struct dive *dive)
|
||||
*
|
||||
* called from gtk-ui:
|
||||
* GtkWidget *equipment_widget(void)
|
||||
|
|
@ -429,11 +428,6 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl
|
|||
fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2);
|
||||
}
|
||||
|
||||
void flush_dive_equipment_changes(struct dive *dive)
|
||||
{
|
||||
/* We do nothing: we require the "Ok" button press */
|
||||
}
|
||||
|
||||
/*
|
||||
* We hardcode the most common standard cylinders,
|
||||
* we should pick up any other names from the dive
|
||||
|
|
|
|||
173
info.c
173
info.c
|
|
@ -2,7 +2,6 @@
|
|||
/* 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:
|
||||
|
|
@ -20,15 +19,16 @@
|
|||
#include "divelist.h"
|
||||
|
||||
static GtkEntry *location, *buddy, *divemaster;
|
||||
static GtkTextBuffer *notes;
|
||||
static GtkTextView *notes;
|
||||
static GtkListStore *location_list, *people_list;
|
||||
|
||||
#define unused /**/
|
||||
|
||||
unused 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);
|
||||
|
|
@ -42,7 +42,7 @@ static int text_changed(const char *old, const char *new)
|
|||
(!old && strcmp("",new)));
|
||||
}
|
||||
|
||||
unused char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
|
||||
static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
|
||||
{
|
||||
char *old = *textp;
|
||||
const gchar *new;
|
||||
|
|
@ -59,46 +59,6 @@ unused char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
|
|||
return *textp;
|
||||
}
|
||||
|
||||
|
||||
void flush_dive_info_changes(struct dive *dive)
|
||||
{
|
||||
#if 0
|
||||
char *old_text, *new_text;
|
||||
int changed = 0;
|
||||
|
||||
if (!dive)
|
||||
return;
|
||||
|
||||
new_text = get_combo_box_entry_text(location, &dive->location);
|
||||
if (new_text) {
|
||||
add_location(new_text);
|
||||
changed = 1;
|
||||
}
|
||||
|
||||
new_text = get_combo_box_entry_text(divemaster, &dive->divemaster);
|
||||
if (new_text) {
|
||||
add_people(new_text);
|
||||
changed = 1;
|
||||
}
|
||||
|
||||
new_text = get_combo_box_entry_text(buddy, &dive->buddy);
|
||||
if (new_text) {
|
||||
add_people(new_text);
|
||||
changed = 1;
|
||||
}
|
||||
|
||||
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);
|
||||
#endif
|
||||
}
|
||||
|
||||
#define SET_TEXT_VALUE(x) \
|
||||
gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
|
||||
|
||||
|
|
@ -131,7 +91,8 @@ void show_dive_info(struct dive *dive)
|
|||
SET_TEXT_VALUE(divemaster);
|
||||
SET_TEXT_VALUE(buddy);
|
||||
SET_TEXT_VALUE(location);
|
||||
gtk_text_buffer_set_text(notes, dive && dive->notes ? dive->notes : "", -1);
|
||||
gtk_text_buffer_set_text(gtk_text_view_get_buffer(notes),
|
||||
dive && dive->notes ? dive->notes : "", -1);
|
||||
}
|
||||
|
||||
static GtkEntry *text_value(GtkWidget *box, const char *label)
|
||||
|
|
@ -147,7 +108,7 @@ static GtkEntry *text_value(GtkWidget *box, const char *label)
|
|||
return GTK_ENTRY(widget);
|
||||
}
|
||||
|
||||
unused GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions)
|
||||
static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text)
|
||||
{
|
||||
GtkEntry *entry;
|
||||
GtkWidget *combo_box;
|
||||
|
|
@ -159,7 +120,9 @@ unused GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListSt
|
|||
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);
|
||||
|
|
@ -172,10 +135,14 @@ unused GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListSt
|
|||
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);
|
||||
|
|
@ -189,16 +156,15 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
|
|||
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
|
||||
|
||||
view = gtk_text_view_new();
|
||||
gtk_widget_set_can_focus(view, FALSE);
|
||||
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);
|
||||
}
|
||||
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
|
||||
gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
|
||||
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
|
||||
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 {
|
||||
|
|
@ -239,8 +205,6 @@ static int match_list(GtkListStore *list, const char *string)
|
|||
return found_string_entry;
|
||||
}
|
||||
|
||||
static GtkListStore *location_list, *people_list;
|
||||
|
||||
static void add_string_list_entry(const char *string, GtkListStore *list)
|
||||
{
|
||||
GtkTreeIter *iter, loc;
|
||||
|
|
@ -272,6 +236,93 @@ void add_location(const char *string)
|
|||
add_string_list_entry(string, location_list);
|
||||
}
|
||||
|
||||
struct dive_info {
|
||||
GtkComboBoxEntry *location, *divemaster, *buddy;
|
||||
GtkTextView *notes;
|
||||
};
|
||||
|
||||
static void save_dive_info_changes(struct dive *dive, struct dive_info *info)
|
||||
{
|
||||
char *old_text, *new_text;
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
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);
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
@ -289,6 +340,6 @@ GtkWidget *extended_dive_info_widget(void)
|
|||
divemaster = text_value(hbox, "Divemaster");
|
||||
buddy = text_value(hbox, "Buddy");
|
||||
|
||||
notes = text_view(vbox, "Notes");
|
||||
notes = text_view(vbox, "Notes", READ_ONLY);
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
|||
2
main.c
2
main.c
|
|
@ -186,8 +186,6 @@ void update_dive(struct dive *new_dive)
|
|||
struct dive *old_dive = buffered_dive;
|
||||
|
||||
if (old_dive) {
|
||||
flush_dive_info_changes(old_dive);
|
||||
flush_dive_equipment_changes(old_dive);
|
||||
flush_divelist(old_dive);
|
||||
}
|
||||
if (new_dive) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue