mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge hbonse's UI tweaks, but fixing the compile warnings. Also bringing it up to date with the master (and my own UI improvements)

Browse source 
Signed-off-by: Nathan Samson <nathansamson@gmail.com>
This commit is contained in:
Nathan Samson 2011-09-04 22:15:55 +02:00
commit 6b075e0339
11 changed files with 127 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

38
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 ? : "";
@ -118,15 +119,15 @@ GtkWidget *dive_info_frame(void)
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);
@ -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));
@ -164,14 +181,15 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp
return buffer;
}
GtkWidget *extended_dive_info_box(void)
GtkWidget *extended_dive_info_widget(void)
{
GtkWidget *vbox;
vbox = gtk_vbox_new(FALSE, 6);
location = text_entry(vbox, "Location", FALSE);
location = text_entry(vbox, "Location");
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
notes = text_entry(vbox, "Notes", TRUE);
notes = text_view(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */
update_dive_info(current_dive);