diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-31 17:59:01 +1000 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-31 17:59:01 +1000 |
| commit | 9a65798daf3dc0e7991305ce759d42d40d2dc98c (patch) | |
| tree | 07bd8a275f3e02832e8277bcba9849f1330d965e | |
| parent | 5c2a2691fdccb9d355fe7f71c19aa104b9d570f4 (diff) | |
| download | subsurface-9a65798daf3dc0e7991305ce759d42d40d2dc98c.tar.gz | |
Use a slightly shorter date string for Info tab
This way the spacing of the elements looks nicer.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | divelist.c | 22 | ||||
| -rw-r--r-- | divelist.h | 1 | ||||
| -rw-r--r-- | qt-ui/maintab.cpp | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/divelist.c b/divelist.c index 68e9cf4e6..7abad667b 100644 --- a/divelist.c +++ b/divelist.c @@ -566,7 +566,8 @@ void get_suit(struct dive *dive, char **str) #define MAX_DATE_STRING 256 /* caller needs to free the string */ -char *get_dive_date_string(timestamp_t when) { +char *get_dive_date_string(timestamp_t when) +{ char *buffer = malloc(MAX_DATE_STRING); if (buffer) { struct tm tm; @@ -582,8 +583,25 @@ char *get_dive_date_string(timestamp_t when) { return buffer; } +char *get_short_dive_date_string(timestamp_t when) +{ + char *buffer = malloc(MAX_DATE_STRING); + if (buffer) { + struct tm tm; + utc_mkdate(when, &tm); + snprintf(buffer, MAX_DATE_STRING, + /*++GETTEXT 40 char buffer monthname, day of month, year, hour:min */ + _("%1$s %2$d, %3$d\n%4$02d:%5$02d"), + monthname(tm.tm_mon), + tm.tm_mday, tm.tm_year +1900, + tm.tm_hour, tm.tm_min); + } + return buffer; +} + /* caller needs to free the string */ -char *get_trip_date_string(timestamp_t when, int nr) { +char *get_trip_date_string(timestamp_t when, int nr) +{ char *buffer = malloc(MAX_DATE_STRING); if (buffer) { struct tm tm; diff --git a/divelist.h b/divelist.h index 7a9d07967..ef90c4283 100644 --- a/divelist.h +++ b/divelist.h @@ -26,6 +26,7 @@ extern void upload_all_dives_divelogs_cb(); /* divelist core logic functions */ extern void process_dives(bool imported, bool prefer_imported); extern char *get_dive_date_string(timestamp_t when); +extern char *get_short_dive_date_string(timestamp_t when); extern char *get_trip_date_string(timestamp_t when, int nr); extern char *get_nitrox_string(struct dive *dive); extern void clear_trip_indexes(void); diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 1de80271e..e810dd6ee 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -203,7 +203,7 @@ void MainTab::updateDiveInfo(int dive) ui->airTemperatureText->setText(get_temperature_string(d->airtemp, TRUE)); ui->gasUsedText->setText(get_volume_string(get_gas_used(d), TRUE)); ui->oxygenHeliumText->setText(get_gaslist(d)); - ui->dateText->setText(get_dive_date_string(d->when)); + ui->dateText->setText(get_short_dive_date_string(d->when)); ui->diveTimeText->setText(QString::number((int)((d->duration.seconds + 30) / 60))); if (prevd) ui->surfaceIntervalText->setText(get_time_string(d->when - (prevd->when + prevd->duration.seconds), 4)); |