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

Show tank / nitrox / air consumption information in the info_frame

Browse source 
Even though we go down to an 8pt font the info_frame changes size when the
air info is added. I don't like this but want to see how Linus would like
this resolved before going overboard.

Minor tweaks to the formating (we don't need two decimals when printing
the liters of air consumed).

This patch does NOT remove the plot of the air information in the profile
graph. I think we want to remove that once we like the text where it is,
but I wanted to do one thing at a time.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-09-16 15:45:14 -07:00
parent ff0a601cc3
commit 89fe2c723f
3 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
info.c
View file

@ -8,7 +8,7 @@
#include "divelist.h"
static GtkWidget *info_frame;
static GtkWidget *depth, *duration, *temperature;
static GtkWidget *depth, *duration, *temperature, *airconsumption;
static GtkEntry *location, *buddy, *divemaster;
static GtkTextBuffer *notes;
static int location_changed = 1, notes_changed = 1;
@ -67,6 +67,7 @@ void show_dive_info(struct dive *dive)
if (!dive) {
gtk_label_set_text(GTK_LABEL(depth), "");
gtk_label_set_text(GTK_LABEL(duration), "");
gtk_label_set_text(GTK_LABEL(airconsumption), "");
return;
}
/* dive number and location (or lacking that, the date) go in the window title */
@ -181,10 +182,19 @@ GtkWidget *dive_info_frame(void)
depth = info_label(hbox, "depth", GTK_JUSTIFY_RIGHT);
duration = info_label(hbox, "duration", GTK_JUSTIFY_RIGHT);
temperature = info_label(hbox, "temperature", GTK_JUSTIFY_RIGHT);
airconsumption = info_label(hbox, "air", GTK_JUSTIFY_RIGHT);
return frame;
}
void update_air_info(char *buffer)
{
char markup[120];
snprintf(markup, sizeof(markup), "<span font=\"8\">%s</span>",buffer);
gtk_label_set_markup(GTK_LABEL(airconsumption), markup);
}
static GtkEntry *text_entry(GtkWidget *box, const char *label)
{
GtkWidget *entry;