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

Merge branch 'release_3.0.0dev' of github.com:/srhea/GoldenCheetah into release_3.0.0dev

Browse Source
This commit is contained in:
Mark Liversedge
2011-04-09 11:42:55 +01:00
parent 0d307e0c5b 6af6b347bf
commit ea02242558
11 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/MainWindow.cpp
View File

@@ -1054,8 +1054,10 @@ MainWindow::exportKML()
void
MainWindow::uploadTP()
{
TPUploadDialog uploader(cyclist, currentRide(), this);
uploader.exec();
if (ride) {
TPUploadDialog uploader(cyclist, currentRide(), this);
uploader.exec();
}
}
void
@@ -1158,6 +1160,9 @@ MainWindow::addIntervalForPowerPeaksForSecs(RideFile *ride, int windowSizeSecs,
void
MainWindow::findPowerPeaks()
{
if (!ride) return;
QTreeWidgetItem *which = treeWidget->selectedItems().first();
if (which->type() != RIDE_TYPE) {
return;
@@ -1644,7 +1649,14 @@ void MainWindow::showWorkoutWizard()
void
MainWindow::saveRide()
{
saveRideSingleDialog(ride); // will signal save to everyone
if (ride)
saveRideSingleDialog(ride); // will signal save to everyone
else {
QMessageBox oops(QMessageBox::Critical, tr("No Ride To Save"),
tr("There is no currently selected ride to save."));
oops.exec();
return;
}
}
void
@@ -1661,7 +1673,7 @@ MainWindow::revertRide()
void
MainWindow::splitRide()
{
(new SplitRideDialog(this))->exec();
if (ride) (new SplitRideDialog(this))->exec();
}
void