mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Rename 'cylinder.c' as 'equipment.c'
Make it about general equipment management, and start hooking up functions to show new equipment information when changing dives (and to flush changes to equipment information for the previously active dive). Nothing is hooked up yet, and it's now showing just one (really big) cylinder choice, so this is all broken. But it should make it possible to at least get somewhere some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
41bce9e5f4
commit
067506038a
7 changed files with 47 additions and 31 deletions
12
info.c
12
info.c
|
|
@ -11,7 +11,6 @@ static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locatio
|
|||
static GtkEntry *location;
|
||||
static GtkTextBuffer *notes;
|
||||
static int location_changed = 1, notes_changed = 1;
|
||||
static struct dive *buffered_dive;
|
||||
|
||||
static const char *weekday(int wday)
|
||||
{
|
||||
|
|
@ -31,10 +30,8 @@ static char *get_text(GtkTextBuffer *buffer)
|
|||
return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
|
||||
}
|
||||
|
||||
void flush_dive_info_changes(void)
|
||||
void flush_dive_info_changes(struct dive *dive)
|
||||
{
|
||||
struct dive *dive = buffered_dive;
|
||||
|
||||
if (!dive)
|
||||
return;
|
||||
|
||||
|
|
@ -49,15 +46,12 @@ void flush_dive_info_changes(void)
|
|||
}
|
||||
}
|
||||
|
||||
void update_dive_info(struct dive *dive)
|
||||
void show_dive_info(struct dive *dive)
|
||||
{
|
||||
struct tm *tm;
|
||||
char buffer[80];
|
||||
char *text;
|
||||
|
||||
flush_dive_info_changes();
|
||||
buffered_dive = dive;
|
||||
|
||||
if (!dive) {
|
||||
gtk_label_set_text(GTK_LABEL(divedate), "no dive");
|
||||
gtk_label_set_text(GTK_LABEL(divetime), "");
|
||||
|
|
@ -217,6 +211,6 @@ GtkWidget *extended_dive_info_widget(void)
|
|||
notes = text_view(vbox, "Notes", TRUE);
|
||||
|
||||
/* Add extended info here: name, description, yadda yadda */
|
||||
update_dive_info(current_dive);
|
||||
show_dive_info(current_dive);
|
||||
return vbox;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue