mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-02 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove dive number from frame label

Browse source 
It's now in the window title - no point in having it twice.
Also added a little "Dive #xx - " template. The old "##. " was a bit too
minimalistic for my liking.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-09-16 14:12:37 -07:00
parent 296642a632
commit d6f8a0ef43
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
info.c
View file

@ -63,22 +63,21 @@ void show_dive_info(struct dive *dive)
struct tm *tm; struct tm *tm;
char buffer[80]; char buffer[80];
char *text; char *text;
int len;
if (!dive) { if (!dive) {
gtk_label_set_text(GTK_LABEL(depth), ""); gtk_label_set_text(GTK_LABEL(depth), "");
gtk_label_set_text(GTK_LABEL(duration), ""); gtk_label_set_text(GTK_LABEL(duration), "");
return; return;
} }
/* dive number and location (or lacking that, the date) go in the window title */
tm = gmtime(&dive->when); tm = gmtime(&dive->when);
text = dive->location; text = dive->location;
if (!text) if (!text)
text = ""; text = "";
if (*text) { if (*text) {
snprintf(buffer, sizeof(buffer), "%d. %s", dive->number, text); snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text);
} else { } else {
snprintf(buffer, sizeof(buffer), "%d. %s %02d/%02d/%04d at %d:%02d", snprintf(buffer, sizeof(buffer), "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
dive->number, dive->number,
weekday(tm->tm_wday), weekday(tm->tm_wday),
tm->tm_mon+1, tm->tm_mday, tm->tm_mon+1, tm->tm_mday,
@ -87,19 +86,16 @@ void show_dive_info(struct dive *dive)
} }
text = buffer; text = buffer;
if (!dive->number) if (!dive->number)
text += 3; /* Skip the "0. " part */ text += 9; /* Skip the "Dive 0 - " part */
gtk_window_set_title(GTK_WINDOW(main_window), text); gtk_window_set_title(GTK_WINDOW(main_window), text);
len = 0; /* the date goes in the frame label */
if (dive->number) snprintf(buffer, sizeof(buffer), "%s %02d/%02d/%04d at %d:%02d",
len = snprintf(buffer, sizeof(buffer), "%d. ", dive->number);
snprintf(buffer, sizeof(buffer), "%d. %s %02d/%02d/%04d at %d:%02d",
dive->number,
weekday(tm->tm_wday), weekday(tm->tm_wday),
tm->tm_mon+1, tm->tm_mday, tm->tm_mon+1, tm->tm_mday,
tm->tm_year+1900, tm->tm_year+1900,
tm->tm_hour, tm->tm_min); tm->tm_hour, tm->tm_min);
gtk_frame_set_label(GTK_FRAME(info_frame), dive->number ? buffer : buffer+3); gtk_frame_set_label(GTK_FRAME(info_frame), buffer);
switch (output_units.length) { switch (output_units.length) {