nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Summary Window Title

Browse Source 
Summary window and friends now set the window title (subtitle)
to the ride date and the headings have been made slightly
smaller to reduce screen real estate. Minor cosmetic update.
This commit is contained in:
Mark Liversedge
2011-07-23 10:55:51 +01:00
parent 1924c53ed5
commit 1fc88c9909
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/RideSummaryWindow.cpp
View File

@@ -94,6 +94,8 @@ RideSummaryWindow::refresh()
rideSummary->setHtml("");
return;
}
RideItem *rideItem = myRideItem;
setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, h:mm AP")));
QString text = htmlSummary(); //debug CRASH in QTextLayout destructor.
rideSummary->setHtml(text);
rideSummary->setAlignment(Qt::AlignCenter);
@@ -117,9 +119,7 @@ RideSummaryWindow::htmlSummary() const
return summary;
}
summary = ("<p><center><h2>"
+ rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, h:mm AP"))
+ "</h2><h3>" + tr("Device Type: ") + ride->deviceType() + "</h3>");
summary = ("<center><p><h3>" + tr("Device Type: ") + ride->deviceType() + "</h3>");
QVariant unit = appsettings->value(this, GC_UNIT);
@@ -216,7 +216,7 @@ RideSummaryWindow::htmlSummary() const
summary += "<table border=0 cellspacing=10><tr>";
for (int i = 0; i < columns; ++i) {
summary += "<td align=\"center\" width=\"%1%\"><table>"
"<tr><td align=\"center\" colspan=2><h2>%2</h2></td></tr>";
"<tr><td align=\"center\" colspan=2><h3>%2</h3></td></tr>";
summary = summary.arg(90 / columns);
summary = summary.arg(columnNames[i]);
const char **metricsList;
@@ -262,7 +262,7 @@ RideSummaryWindow::htmlSummary() const
QVector<double> time_in_zone(rideItem->numZones());
for (int i = 0; i < rideItem->numZones(); ++i)
time_in_zone[i] = metrics.getForSymbol(timeInZones[i]);
summary += tr("<h2>Power Zones</h2>");
summary += tr("<h3>Power Zones</h3>");
summary += mainWindow->zones()->summarize(rideItem->zoneRange(), time_in_zone);
}
@@ -273,7 +273,7 @@ RideSummaryWindow::htmlSummary() const
QVector<double> time_in_zone(rideItem->numZones());
for (int i = 0; i < rideItem->numZones(); ++i)
time_in_zone[i] = metrics.getForSymbol(timeInZonesHR[i]);
summary += tr("<h2>Heart Rate Zones</h2>");
summary += tr("<h3>Heart Rate Zones</h3>");
summary += mainWindow->hrZones()->summarize(rideItem->hrZoneRange(), time_in_zone);
}
@@ -288,7 +288,7 @@ RideSummaryWindow::htmlSummary() const
else
s = GC_SETTINGS_INTERVAL_METRICS_DEFAULT;
QStringList intervalMetrics = s.split(",");
summary += "<p><h2>"+tr("Intervals")+"</h2>\n<p>\n";
summary += "<p><h3>"+tr("Intervals")+"</h3>\n<p>\n";
summary += "<table align=\"center\" width=\"90%\" ";
summary += "cellspacing=0 border=0>";
bool even = false;

3
src/SummaryWindow.cpp
View File

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