nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 08:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #954 from Joern-R/pull2

Browse Source 
Some more AM/PM adjustments
This commit is contained in:
Mark Liversedge
2014-06-30 13:20:05 +01:00
parent d3cef756aa 8a3a9ae5df
commit fd34285fa4
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CPPlot.cpp
View File

@@ -982,7 +982,7 @@ CPPlot::plotRide(RideItem *rideItem)
if (maxNonZero == 1) return;
// Right, lets actually plot the ride
rideCurve = new QwtPlotCurve(rideItem->dateTime.toString(tr("ddd MMM d, yyyy h:mm AP")));
rideCurve = new QwtPlotCurve(rideItem->dateTime.toString(tr("ddd MMM d, yyyy hh:mm")));
rideCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
rideCurve->setBrush(QBrush(Qt::NoBrush)); // never filled

6
src/RideItem.cpp
View File

@@ -159,9 +159,9 @@ void
RideItem::setStartTime(QDateTime newDateTime)
{
dateTime = newDateTime;
setText(0, dateTime.toString("ddd"));
setText(1, dateTime.toString("MMM d, yyyy"));
setText(2, dateTime.toString("h:mm AP"));
setText(0, dateTime.toString(tr("ddd")));
setText(1, dateTime.toString(tr("MMM d, yyyy")));
setText(2, dateTime.toString("hh:mm"));
ride()->setStartTime(newDateTime);
context->notifyRideSelected(this);

2
src/RideNavigator.cpp
View File

@@ -1004,7 +1004,7 @@ void NavigatorCellDelegate::paint(QPainter *painter, const QStyleOptionViewItem
} else if (columnName == tr("Last updated")) {
QDateTime dateTime;
dateTime.setTime_t(index.model()->data(index, Qt::DisplayRole).toInt());
value = dateTime.toString(tr("ddd MMM d, yyyy h:mm AP")); // same format as ride list
value = dateTime.toString(tr("ddd MMM d, yyyy hh:mm")); // same format as ride list
}
}

2
src/RideSummaryWindow.cpp
View File

@@ -308,7 +308,7 @@ RideSummaryWindow::refresh()
if (ridesummary) {
RideItem *rideItem = myRideItem;
setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, h:mm AP")));
setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, hh:mm")));
} else {
if (myDateRange.name != "") setSubTitle(myDateRange.name);

2
src/Settings.h
View File

@@ -46,7 +46,7 @@
#define GC_SETTINGS_BESTS_METRICS_DEFAULT "5s_critical_power,1m_critical_power,5m_critical_power,20m_critical_power,60m_critical_power"
#define GC_SETTINGS_SUMMARY_METRICS_DEFAULT "skiba_xpower,skiba_relative_intensity,skiba_bike_score,daniels_points,daniels_equivalent_power,trimp_points,aerobic_decoupling"
#define GC_SETTINGS_INTERVAL_METRICS_DEFAULT "workout_time,total_distance,total_work,average_power,skiba_xpower,max_power,average_hr,ninety_five_percent_hr,average_cad,average_speed"
#define GC_DATETIME_FORMAT "ddd MMM dd, yyyy, hh:mm AP"
#define GC_DATETIME_FORMAT "ddd MMM dd, yyyy, hh:mm"
#define GC_UNIT "unit"
#define GC_LANG "lang"
#define GC_NICKNAME "nickname"

2
src/SummaryWindow.cpp
View File

@@ -47,5 +47,5 @@ SummaryWindow::rideItemChanged()
rideMetadata->setProperty("ride", property("ride"));
RideItem *rideItem = myRideItem;
if (rideItem) setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, h:mm AP")));
if (rideItem) setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, hh:mm")));
}