mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ui-improvements

Browse source
This commit is contained in:
Nathan Samson 2011-09-04 19:06:47 +02:00
commit bcf12edfe9
4 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,2 @@
*.o
/parse
/divelog

2
Makefile
View file

@ -4,7 +4,7 @@ CFLAGS=-Wall -Wno-pointer-sign -g
OBJS=main.o dive.o profile.o info.o divelist.o parse-xml.o save-xml.o
divelog: $(OBJS)
$(CC) $(LDLAGS) -o divelog $(OBJS) \
$(CC) $(LDFLAGS) -o divelog $(OBJS) \
`xml2-config --libs` \
`pkg-config --libs gtk+-2.0`

29
info.c
View file

@ -7,7 +7,8 @@
#include "display.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;
@ -38,7 +39,7 @@ void flush_dive_info_changes(void)
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) {
@ -94,7 +95,7 @@ void update_dive_info(struct dive *dive)
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 ? : "";
@ -142,7 +143,21 @@ GtkWidget *dive_info_frame(void)
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;
@ -152,10 +167,12 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp
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));
@ -170,8 +187,8 @@ GtkWidget *extended_dive_info_widget(void)
vbox = gtk_vbox_new(FALSE, 5);
location = text_entry(vbox, "Location", FALSE);
notes = text_entry(vbox, "Notes", TRUE);
location = text_entry(vbox, "Location");
notes = text_view(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */
update_dive_info(current_dive);

1
save-xml.c
View file

@ -193,4 +193,5 @@ void save_dives(const char *filename)
for (i = 0; i < dive_table.nr; i++)
save_dive(f, get_dive(i));
fprintf(f, "</dives>\n");
fclose(f);
}