diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-04 11:49:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-04 11:49:49 -0700 |
| commit | 230a13476d9af732cb60b2c0393feeadb5b39e67 (patch) | |
| tree | 7858e505d87025beecc97379ad08376347f195c8 /parse-xml.c | |
| parent | 550eb862fa6dbc1d07c6a3165634900421dd2ca6 (diff) | |
| parent | 31123f63af0a2b6a9756b8496f56359d1c68a645 (diff) | |
| download | subsurface-230a13476d9af732cb60b2c0393feeadb5b39e67.tar.gz | |
Merge branch 'ui-improvements' of https://github.com/nathansamson/diveclog
* 'ui-improvements' of https://github.com/nathansamson/diveclog:
Split the dive list in columns. Columns are sortable now (name = date, depth, duration)
Remove the redundant frames in the notebook. Closes #9
Use a pane so the dive list can be made wider or smaller to the users wishes
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/parse-xml.c b/parse-xml.c index 635bf56f2..a2c685ed5 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -693,11 +693,9 @@ static char *generate_name(struct dive *dive) len = snprintf(buffer, sizeof(buffer), "%04d-%02d-%02d " - "%02d:%02d:%02d " - "(%d ft, %d min)", + "%02d:%02d:%02d", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec, - to_feet(dive->maxdepth), dive->duration.seconds / 60); + tm->tm_hour, tm->tm_min, tm->tm_sec); p = malloc(len+1); if (!p) exit(1); |