From 4ced2ca51d666bb445eeb90bcb1aa131943ed720 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 12 Jan 2014 13:06:00 +0000 Subject: [PATCH] What's in a name ? The 4 views have been shown to be confusing -- it is not clear to new users what their purpose is, and hence how or why they are different. So in an effort to reduce the confusion I've renamed a few things to be much more explicit and specific. .. We embrace the fact we are a cycling program and use the term RIDES not ACTIVITIES for all files .. HOME is confusing, renamed to TRENDS .. the ANALYSIS view name is confusing, its all about ANALYSIS to renamed to RIDES There will no doubt be areas that are not renamed properly we can fix those when the arise. --- src/AboutDialog.cpp | 2 +- src/AddIntervalDialog.cpp | 2 +- src/AnalysisSidebar.cpp | 18 +++++------ src/BatchExportDialog.cpp | 4 +-- src/Colors.cpp | 2 +- src/ConfigDialog.cpp | 2 +- src/GcScopeBar.cpp | 4 +-- src/GcWindowRegistry.cpp | 2 +- src/HomeWindow.cpp | 2 +- src/MainWindow.cpp | 42 +++++++++++++------------- src/ManualRideDialog.cpp | 4 +-- src/MergeActivityWizard.cpp | 12 ++++---- src/PowerHist.cpp | 4 +-- src/RideFile.cpp | 2 +- src/RideMetadata.cpp | 2 +- src/RideSummaryWindow.cpp | 4 +-- src/SplitActivityWizard.cpp | 60 ++++++++++++++++++------------------- 17 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index e4992dac8..d364d6beb 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -69,7 +69,7 @@ AboutPage::AboutPage(Context *context, QDir home) : context(context), home(home) "

Source code can be obtained from
" "" "http://goldencheetah.org/." - "

Activity files and other data are stored in
" + "

Ride files and other data are stored in
" "%2" "

Trademarks used with permission
" "TSS, NP, IF courtesy of " diff --git a/src/AddIntervalDialog.cpp b/src/AddIntervalDialog.cpp index 59d80ce71..11106ad82 100644 --- a/src/AddIntervalDialog.cpp +++ b/src/AddIntervalDialog.cpp @@ -237,7 +237,7 @@ AddIntervalDialog::AddIntervalDialog(Context *context) : QHBoxLayout *buttonLayout = new QHBoxLayout; buttonLayout->addStretch(); - addButton = new QPushButton(tr("&Add to Activity")); + addButton = new QPushButton(tr("&Add to Ride")); buttonLayout->addWidget(addButton); buttonLayout->addStretch(); mainLayout->addLayout(buttonLayout); diff --git a/src/AnalysisSidebar.cpp b/src/AnalysisSidebar.cpp index 7b7f10970..07e8b909b 100644 --- a/src/AnalysisSidebar.cpp +++ b/src/AnalysisSidebar.cpp @@ -72,7 +72,7 @@ AnalysisSidebar::AnalysisSidebar(Context *context) : QWidget(context->mainWindow activityLayout->setContentsMargins(0,0,0,0); activityLayout->addWidget(rideNavigator); - activityItem = new GcSplitterItem(tr("Activities"), iconFromPNG(":images/sidebar/folder.png"), this); + activityItem = new GcSplitterItem(tr("Rides"), iconFromPNG(":images/sidebar/folder.png"), this); QAction *activityAction = new QAction(iconFromPNG(":images/sidebar/extra.png"), tr("Menu"), this); activityItem->addAction(activityAction); connect(activityAction, SIGNAL(triggered(void)), this, SLOT(analysisPopup())); @@ -171,7 +171,7 @@ AnalysisSidebar::showActivityMenu(const QPoint &pos) if (context->athlete->treeWidget->selectedItems().size() == 0) return; //none selected! RideItem *rideItem = (RideItem *)context->athlete->treeWidget->selectedItems().first(); - if (rideItem != NULL && rideItem->text(0) != tr("All Activities")) { + if (rideItem != NULL && rideItem->text(0) != tr("All Rides")) { QMenu menu(context->athlete->treeWidget); @@ -181,10 +181,10 @@ AnalysisSidebar::showActivityMenu(const QPoint &pos) QAction *revertRide = new QAction(tr("Revert to Saved version"), context->athlete->treeWidget); connect(revertRide, SIGNAL(triggered(void)), context->mainWindow, SLOT(revertRide())); - QAction *actDeleteRide = new QAction(tr("Delete Activity"), context->athlete->treeWidget); + QAction *actDeleteRide = new QAction(tr("Delete Ride"), context->athlete->treeWidget); connect(actDeleteRide, SIGNAL(triggered(void)), context->mainWindow, SLOT(deleteRide())); - QAction *actSplitRide = new QAction(tr("Split Activity"), context->athlete->treeWidget); + QAction *actSplitRide = new QAction(tr("Split Ride"), context->athlete->treeWidget); connect(actSplitRide, SIGNAL(triggered(void)), context->mainWindow, SLOT(splitRide())); if (rideItem->isDirty() == true) { @@ -195,7 +195,7 @@ AnalysisSidebar::showActivityMenu(const QPoint &pos) menu.addAction(actDeleteRide); menu.addAction(actSplitRide); #ifdef GC_HAVE_ICAL - QAction *actUploadCalendar = new QAction(tr("Upload Activity to Calendar"), context->athlete->treeWidget); + QAction *actUploadCalendar = new QAction(tr("Upload Ride to Calendar"), context->athlete->treeWidget); connect(actUploadCalendar, SIGNAL(triggered(void)), context->mainWindow, SLOT(uploadCalendar())); menu.addAction(actUploadCalendar); #endif @@ -353,9 +353,9 @@ AnalysisSidebar::addIntervals() } else { if (!context->ride || !context->ride->ride()) - QMessageBox::critical(this, tr("Find Intervals"), tr("No activity selected")); + QMessageBox::critical(this, tr("Find Intervals"), tr("No ride selected")); else - QMessageBox::critical(this, tr("Find Intervals"), tr("Current activity contains no data")); + QMessageBox::critical(this, tr("Find Intervals"), tr("Current ride contains no data")); } } @@ -406,9 +406,9 @@ AnalysisSidebar::findPowerPeaks() } else { if (!context->ride || !context->ride->ride()) - QMessageBox::critical(this, tr("Find Power Peaks"), tr("No activity selected")); + QMessageBox::critical(this, tr("Find Power Peaks"), tr("No ride selected")); else - QMessageBox::critical(this, tr("Find Power Peaks"), tr("Current activity contains no data")); + QMessageBox::critical(this, tr("Find Power Peaks"), tr("Current ride contains no data")); } } diff --git a/src/BatchExportDialog.cpp b/src/BatchExportDialog.cpp index ac5f3424d..cc704b4c5 100644 --- a/src/BatchExportDialog.cpp +++ b/src/BatchExportDialog.cpp @@ -26,7 +26,7 @@ BatchExportDialog::BatchExportDialog(Context *context) : QDialog(context->mainWi { setAttribute(Qt::WA_DeleteOnClose); //setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); // must stop using this flag! - setWindowTitle(tr("Activity Batch Export")); + setWindowTitle(tr("Ride Batch Export")); // make the dialog a resonable size setMinimumWidth(550); @@ -171,7 +171,7 @@ BatchExportDialog::okClicked() appsettings->setValue(GC_BE_LASTDIR, dirName->text()); appsettings->setValue(GC_BE_LASTFMT, format->currentIndex()); exportFiles(); - status->setText(QString(tr("%1 activities exported, %2 failed or skipped.")).arg(exports).arg(fails)); + status->setText(QString(tr("%1 rides exported, %2 failed or skipped.")).arg(exports).arg(fails)); ok->setText(tr("Finish")); } else if (ok->text() == "Abort" || ok->text() == tr("Abort")) { diff --git a/src/Colors.cpp b/src/Colors.cpp index 78ba4dfd0..b1caa904e 100644 --- a/src/Colors.cpp +++ b/src/Colors.cpp @@ -105,7 +105,7 @@ void GCColor::setupColors() { tr("Chart Bar Unselected"), "CTILEBAR", Qt::gray }, { tr("Chart Bar Selected"), "CTILEBARSELECT", Qt::yellow }, { tr("ToolBar Background"), "CTOOLBAR", Qt::white }, - { tr("Activity History Group"), "CRIDEGROUP", QColor(236,246,255) }, + { tr("Ride History Group"), "CRIDEGROUP", QColor(236,246,255) }, { tr("SpinScan Left"), "CSPINSCANLEFT", Qt::gray }, { tr("SpinScan Right"), "CSPINSCANRIGHT", Qt::cyan }, { tr("Temperature"), "COLORTEMPERATURE", Qt::yellow }, diff --git a/src/ConfigDialog.cpp b/src/ConfigDialog.cpp index dc9728fc6..5b31d7016 100644 --- a/src/ConfigDialog.cpp +++ b/src/ConfigDialog.cpp @@ -188,7 +188,7 @@ void ConfigDialog::saveClicked() // if so we will restart, if not I'll revert to current directory QMessageBox msgBox; msgBox.setText("You changed the location of the athlete library"); - msgBox.setInformativeText("This is where all new athletes and their activity files " + msgBox.setInformativeText("This is where all new athletes and their ride files " "will now be stored.\n\nCurrent athlete data will no longer be " "available and GoldenCheetah will need to restart for the change to take effect." "\n\nDo you want to apply and restart GoldenCheetah?"); diff --git a/src/GcScopeBar.cpp b/src/GcScopeBar.cpp index 6de2eaac6..f3eac88ad 100644 --- a/src/GcScopeBar.cpp +++ b/src/GcScopeBar.cpp @@ -76,7 +76,7 @@ GcScopeBar::GcScopeBar(Context *context) : QWidget(context->mainWindow), context #endif // now set the text for each one - home->setText(tr("Home")); + home->setText(tr("Trends")); layout->addWidget(home); connect(home, SIGNAL(clicked(bool)), this, SLOT(clickedHome())); @@ -86,7 +86,7 @@ GcScopeBar::GcScopeBar(Context *context) : QWidget(context->mainWindow), context connect(diary, SIGNAL(clicked(bool)), this, SLOT(clickedDiary())); #endif - anal->setText(tr("Analysis")); + anal->setText(tr("Rides")); anal->setWidth(70); anal->setChecked(true); layout->addWidget(anal); diff --git a/src/GcWindowRegistry.cpp b/src/GcWindowRegistry.cpp index 7138085bc..22f8d27e5 100644 --- a/src/GcWindowRegistry.cpp +++ b/src/GcWindowRegistry.cpp @@ -74,7 +74,7 @@ GcWindowRegistry::initialize() { VIEW_HOME|VIEW_DIARY, tr("Collection TreeMap"),GcWindowTypes::TreeMap }, //{ VIEW_HOME, tr("Weekly Summary"),GcWindowTypes::WeeklySummary },// DEPRECATED { VIEW_HOME|VIEW_DIARY, tr("Critical Mean Maximal"),GcWindowTypes::CriticalPowerSummary }, - { VIEW_ANALYSIS, tr("Activity Summary"),GcWindowTypes::RideSummary }, + { VIEW_ANALYSIS, tr("Ride Summary"),GcWindowTypes::RideSummary }, { VIEW_ANALYSIS, tr("Details"),GcWindowTypes::MetadataWindow }, { VIEW_ANALYSIS, tr("Summary and Details"),GcWindowTypes::Summary }, { VIEW_ANALYSIS, tr("Editor"),GcWindowTypes::RideEditor }, diff --git a/src/HomeWindow.cpp b/src/HomeWindow.cpp index 3363f2309..2c4f6a770 100644 --- a/src/HomeWindow.cpp +++ b/src/HomeWindow.cpp @@ -1321,7 +1321,7 @@ void HomeWindow::translateChartTitles(QList charts) // Map default (english) title to external (Localized) name, new default // charts in *layout.xml need to be added to this list to be translated QMap titleMap; - titleMap.insert("Activity Log", tr("Activity Log")); + titleMap.insert("Ride Log", tr("Ride Log")); titleMap.insert("Aerobic Power", tr("Aerobic Power")); titleMap.insert("Anaerobic Power", tr("Anaerobic Power")); titleMap.insert("Cadence", tr("Cadence")); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 0aa286291..4296ae60d 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -402,7 +402,7 @@ MainWindow::MainWindow(const QDir &home) compose->setIconSize(isize); compose->setFixedHeight(25); compose->setStyle(toolStyle); - compose->setToolTip(tr("Create Manual Activity")); + compose->setToolTip(tr("Create Manual Ride")); compose->setPalette(metal); connect(compose, SIGNAL(clicked(bool)), this, SLOT(manualRide())); @@ -434,8 +434,8 @@ MainWindow::MainWindow(const QDir &home) actbuttons->setSelectionBehavior(QtSegmentControl::SelectNone); //wince. spelling. ugh actbuttons->setFixedHeight(25); actbuttons->setSegmentToolTip(0, tr("Find Intervals...")); - actbuttons->setSegmentToolTip(1, tr("Split Activity...")); - actbuttons->setSegmentToolTip(2, tr("Delete Activity")); + actbuttons->setSegmentToolTip(1, tr("Split Ride...")); + actbuttons->setSegmentToolTip(2, tr("Delete Ride")); actbuttons->setPalette(metal); connect(actbuttons, SIGNAL(segmentSelected(int)), this, SLOT(actionClicked(int))); @@ -561,7 +561,7 @@ MainWindow::MainWindow(const QDir &home) QMenu *rideMenu = menuBar()->addMenu(tr("A&ctivity")); rideMenu->addAction(tr("&Download from device..."), this, SLOT(downloadRide()), tr("Ctrl+D")); rideMenu->addAction(tr("&Import from file..."), this, SLOT (importFile()), tr ("Ctrl+I")); - rideMenu->addAction(tr("&Manual activity entry..."), this, SLOT(manualRide()), tr("Ctrl+M")); + rideMenu->addAction(tr("&Manual ride entry..."), this, SLOT(manualRide()), tr("Ctrl+M")); rideMenu->addSeparator (); rideMenu->addAction(tr("&Export..."), this, SLOT(exportRide()), tr("Ctrl+E")); rideMenu->addAction(tr("&Batch export..."), this, SLOT(exportBatch()), tr("Ctrl+B")); @@ -573,7 +573,7 @@ MainWindow::MainWindow(const QDir &home) #endif #ifdef GC_HAVE_LIBOAUTH - tweetAction = new QAction(tr("Tweet Activity"), this); + tweetAction = new QAction(tr("Tweet Ride"), this); connect(tweetAction, SIGNAL(triggered(bool)), this, SLOT(tweetRide())); rideMenu->addAction(tweetAction); @@ -587,10 +587,10 @@ MainWindow::MainWindow(const QDir &home) rideMenu->addAction(ttbAction); rideMenu->addSeparator (); - rideMenu->addAction(tr("&Save activity"), this, SLOT(saveRide()), tr("Ctrl+S")); - rideMenu->addAction(tr("D&elete activity..."), this, SLOT(deleteRide())); - rideMenu->addAction(tr("Split &activity..."), this, SLOT(splitRide())); - rideMenu->addAction(tr("Merge activities..."), this, SLOT(mergeRide())); + rideMenu->addAction(tr("&Save ride"), this, SLOT(saveRide()), tr("Ctrl+S")); + rideMenu->addAction(tr("D&elete ride..."), this, SLOT(deleteRide())); + rideMenu->addAction(tr("Split &ride..."), this, SLOT(splitRide())); + rideMenu->addAction(tr("Merge rides..."), this, SLOT(mergeRide())); rideMenu->addSeparator (); // TOOLS MENU @@ -612,7 +612,7 @@ MainWindow::MainWindow(const QDir &home) #ifdef GC_HAVE_ICAL optionsMenu->addSeparator(); - optionsMenu->addAction(tr("Upload Activity to Calendar"), this, SLOT(uploadCalendar()), tr ("")); + optionsMenu->addAction(tr("Upload Ride to Calendar"), this, SLOT(uploadCalendar()), tr ("")); //optionsMenu->addAction(tr("Import Calendar..."), this, SLOT(importCalendar()), tr ("")); // planned for v3.1 //optionsMenu->addAction(tr("Export Calendar..."), this, SLOT(exportCalendar()), tr ("")); // planned for v3.1 optionsMenu->addAction(tr("Refresh Calendar"), this, SLOT(refreshCalendar()), tr ("")); @@ -664,8 +664,8 @@ MainWindow::MainWindow(const QDir &home) //connect(showhideSidebar, SIGNAL(triggered(bool)), this, SLOT(showSidebar(bool))); viewMenu->addSeparator(); - viewMenu->addAction(tr("Analysis"), this, SLOT(selectAnalysis())); - viewMenu->addAction(tr("Home"), this, SLOT(selectHome())); + viewMenu->addAction(tr("Rides"), this, SLOT(selectAnalysis())); + viewMenu->addAction(tr("Trends"), this, SLOT(selectHome())); viewMenu->addAction(tr("Train"), this, SLOT(selectTrain())); #ifdef GC_HAVE_ICAL viewMenu->addAction(tr("Diary"), this, SLOT(selectDiary())); @@ -1161,7 +1161,7 @@ MainWindow::exportRide() { if ((currentTab->context->athlete->treeWidget->selectedItems().size() != 1) || (currentTab->context->athlete->treeWidget->selectedItems().first()->type() != RIDE_TYPE)) { - QMessageBox::critical(this, tr("Select Activity"), tr("No activity selected!")); + QMessageBox::critical(this, tr("Select Ride"), tr("No ride selected!")); return; } @@ -1172,7 +1172,7 @@ MainWindow::exportRide() allFormats << QString("%1 (*.%2)").arg(rff.description(suffix)).arg(suffix); QString suffix; // what was selected? - QString fileName = QFileDialog::getSaveFileName(this, tr("Export Activity"), QDir::homePath(), allFormats.join(";;"), &suffix); + QString fileName = QFileDialog::getSaveFileName(this, tr("Export Ride"), QDir::homePath(), allFormats.join(";;"), &suffix); if (fileName.length() == 0) return; @@ -1223,7 +1223,7 @@ MainWindow::saveRide() if (currentTab->context->ride) saveRideSingleDialog(currentTab->context, currentTab->context->ride); // will signal save to everyone else { - QMessageBox oops(QMessageBox::Critical, tr("No Activity To Save"), + QMessageBox oops(QMessageBox::Critical, tr("No Ride To Save"), tr("There is no currently selected ride to save.")); oops.exec(); return; @@ -1247,9 +1247,9 @@ MainWindow::splitRide() if (currentTab->context->ride && currentTab->context->ride->ride() && currentTab->context->ride->ride()->dataPoints().count()) (new SplitActivityWizard(currentTab->context))->exec(); else { if (!currentTab->context->ride || !currentTab->context->ride->ride()) - QMessageBox::critical(this, tr("Split Activity"), tr("No activity selected")); + QMessageBox::critical(this, tr("Split Ride"), tr("No ride selected")); else - QMessageBox::critical(this, tr("Split Activity"), tr("Current activity contains no data to split")); + QMessageBox::critical(this, tr("Split Ride"), tr("Current ride contains no data to split")); } } @@ -1259,9 +1259,9 @@ MainWindow::mergeRide() if (currentTab->context->ride && currentTab->context->ride->ride() && currentTab->context->ride->ride()->dataPoints().count()) (new MergeActivityWizard(currentTab->context))->exec(); else { if (!currentTab->context->ride || !currentTab->context->ride->ride()) - QMessageBox::critical(this, tr("Split Activity"), tr("No activity selected")); + QMessageBox::critical(this, tr("Split Ride"), tr("No ride selected")); else - QMessageBox::critical(this, tr("Split Activity"), tr("Current activity contains no data to merge")); + QMessageBox::critical(this, tr("Split Ride"), tr("Current ride contains no data to merge")); } } @@ -1270,12 +1270,12 @@ MainWindow::deleteRide() { QTreeWidgetItem *_item = currentTab->context->athlete->treeWidget->currentItem(); if (_item==NULL || _item->type() != RIDE_TYPE) { - QMessageBox::critical(this, tr("Delete Activity"), tr("No activity selected!")); + QMessageBox::critical(this, tr("Delete Ride"), tr("No ride selected!")); return; } RideItem *item = static_cast(_item); QMessageBox msgBox; - msgBox.setText(tr("Are you sure you want to delete the activity:")); + msgBox.setText(tr("Are you sure you want to delete the ride:")); msgBox.setInformativeText(item->fileName); QPushButton *deleteButton = msgBox.addButton(tr("Delete"),QMessageBox::YesRole); msgBox.setStandardButtons(QMessageBox::Cancel); diff --git a/src/ManualRideDialog.cpp b/src/ManualRideDialog.cpp index e9da86fec..adbf2af8a 100644 --- a/src/ManualRideDialog.cpp +++ b/src/ManualRideDialog.cpp @@ -117,7 +117,7 @@ ManualRideDialog::deriveFactors() ManualRideDialog::ManualRideDialog(Context *context) : context(context) { setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(tr("Manual Activity Entry")); + setWindowTitle(tr("Manual Ride Entry")); #ifdef Q_OS_MAC setFixedSize(610,415); #else @@ -500,7 +500,7 @@ ManualRideDialog::okClicked() // work it out -- they may actually want to keep an existing ride, so we shouldn't // rename it silently. QMessageBox oops(QMessageBox::Critical, tr("Unable to save"), - tr("There is already an activity with the same start time or you do not have permissions to save a file.")); + tr("There is already an ride with the same start time or you do not have permissions to save a file.")); oops.exec(); } } diff --git a/src/MergeActivityWizard.cpp b/src/MergeActivityWizard.cpp index 2f460e704..db28f2319 100644 --- a/src/MergeActivityWizard.cpp +++ b/src/MergeActivityWizard.cpp @@ -57,14 +57,14 @@ MergeActivityWizard::MergeActivityWizard(Context *context) : QWizard(context->ma // welcome MergeWelcome::MergeWelcome(MergeActivityWizard *parent) : QWizardPage(parent), wizard(parent) { - setTitle(tr("Merge Activity")); + setTitle(tr("Merge Ride")); setSubTitle(tr("Lets get started")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); QLabel *label = new QLabel("This wizard will help you to merge 2 different files\n" - "from the same activity into a single file."); + "from the same ride into a single file."); label->setWordWrap(true); layout->addWidget(label); @@ -80,12 +80,12 @@ MergeUpload::MergeUpload(MergeActivityWizard *parent) : QWizardPage(parent), wiz QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *ride1Label = new QLabel(tr("Current activity")+" "+parent->ride1->dateTime.toString("MMM d, yyyy - hh:mm:ss")); + QLabel *ride1Label = new QLabel(tr("Current ride")+" "+parent->ride1->dateTime.toString("MMM d, yyyy - hh:mm:ss")); layout->addWidget(ride1Label); QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum,QSizePolicy::Expanding ); layout->addItem( spacer ); - QLabel *label = new QLabel("Select the file to merge to this activity."); + QLabel *label = new QLabel("Select the file to merge to this ride."); label->setWordWrap(true); layout->addWidget(label); @@ -156,7 +156,7 @@ MergeUpload::importFile(QList files) if (ride) { //wizard->addRideFile(ride); labelSuccess->setText("File uploaded"); - ride2Label->setText(tr("Second activity")+" "+ride->startTime().toString("MMM d, yyyy - hh:mm:ss")); + ride2Label->setText(tr("Second ride")+" "+ride->startTime().toString("MMM d, yyyy - hh:mm:ss")); wizard->ride2 = ride; } @@ -174,7 +174,7 @@ MergeUpload::importFile(QList files) MergeSync::MergeSync(MergeActivityWizard *parent) : QWizardPage(parent), wizard(parent) { setTitle(tr("Synchronise")); - setSubTitle(tr("Start of activities")); + setSubTitle(tr("Start of rides")); // Plot files QVBoxLayout *layout = new QVBoxLayout; diff --git a/src/PowerHist.cpp b/src/PowerHist.cpp index d111cb77e..5ca28ca69 100644 --- a/src/PowerHist.cpp +++ b/src/PowerHist.cpp @@ -770,9 +770,9 @@ PowerHist::setData(QList&results, QString totalMetric, QString d setAxisTitle(yLeft, QString(tr("Total %1")).arg(tm->name())); if (m->units(context->athlete->useMetricUnits) != "") - setAxisTitle(xBottom, QString(tr("%1 of Activity (%2)")).arg(m->name()).arg(xunits)); + setAxisTitle(xBottom, QString(tr("%1 of Ride (%2)")).arg(m->name()).arg(xunits)); else - setAxisTitle(xBottom, QString(tr("%1 of Activity")).arg(m->name())); + setAxisTitle(xBottom, QString(tr("%1 of Ride")).arg(m->name())); } void diff --git a/src/RideFile.cpp b/src/RideFile.cpp index fd89470e4..fb817363b 100644 --- a/src/RideFile.cpp +++ b/src/RideFile.cpp @@ -922,7 +922,7 @@ RideFile::parseRideFileName(const QString &name, QDateTime *dt) QTime time(rx.cap(5).toInt(), rx.cap(6).toInt(),rx.cap(7).toInt()); if ((! date.isValid()) || (! time.isValid())) { QMessageBox::warning(NULL, - tr("Invalid Activity File Name"), + tr("Invalid Ride File Name"), tr("Invalid date/time in filename:\n%1\nSkipping file...").arg(name) ); return false; diff --git a/src/RideMetadata.cpp b/src/RideMetadata.cpp index 537d5b37e..11ff9ab80 100644 --- a/src/RideMetadata.cpp +++ b/src/RideMetadata.cpp @@ -119,7 +119,7 @@ RideMetadata::warnDateTime(QDateTime datetime) QString conflict = context->athlete->home.absolutePath() + "/" + targetnosuffix + "." + suffix; if (QFile(conflict).exists() && QFileInfo(conflict).fileName() != rideItem()->fileName) { - QMessageBox::warning(this, "Date/Time Entry", "An activity already exists with that date/time, if you do not change it then you will overwrite and lose existing data"); + QMessageBox::warning(this, "Date/Time Entry", "A ride already exists with that date/time, if you do not change it then you will overwrite and lose existing data"); return; // only warn on the first conflict! } } diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index fb2b3e3a1..09abd00e5 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -769,13 +769,13 @@ RideSummaryWindow::htmlSummary() const // "n of x activities" shown in header of list when filtered summary += ("

" + QString("%1 of %2").arg(activities).arg(data.count()) - + (data.count() == 1 ? tr(" activity") : tr(" activities")) + + + (data.count() == 1 ? tr(" ride") : tr(" rides")) + "

"); } else { // just "n activities" shown in header of list when not filtered summary += ("

" + - QString("%1").arg(activities) + (activities == 1 ? tr(" activity") : tr(" activities")) + + QString("%1").arg(activities) + (activities == 1 ? tr(" ride") : tr(" rides")) + "

"); } diff --git a/src/SplitActivityWizard.cpp b/src/SplitActivityWizard.cpp index ff6efa200..4fe6dc73f 100644 --- a/src/SplitActivityWizard.cpp +++ b/src/SplitActivityWizard.cpp @@ -24,7 +24,7 @@ // Minimum gap in recording to find a natural break to split static const double defaultMinimumGap = 1; // 1 minute -// Minimum size of segment to identify as a new activity +// Minimum size of segment to identify as a new ride static const double defaultMinimumSegmentSize = 5; // 5 minutes // Main wizard @@ -42,7 +42,7 @@ SplitActivityWizard::SplitActivityWizard(Context *context) : QWizard(context->ma setMinimumWidth(600); // title - setWindowTitle(tr("Split Activity")); + setWindowTitle(tr("Split Ride")); // set ride - unconst since we will wipe it away eventually rideItem = const_cast(context->currentRideItem()); @@ -154,7 +154,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) // we have a candidate segments.append(RideFileInterval(segmentStart, segmentEnd, - QString(tr("Activity Segment #%1")).arg(++counter))); + QString(tr("Ride Segment #%1")).arg(++counter))); } segmentEnd = segmentStart = p->secs; @@ -173,7 +173,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) // we have a candidate segments.append(RideFileInterval(segmentStart, segmentEnd, - QString(tr("Activity Segment #%1")).arg(++counter))); + QString(tr("Ride Segment #%1")).arg(++counter))); } @@ -186,21 +186,21 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) double lastsecs = rideItem->ride()->dataPoints().first()->secs; int gapnum = 0; - foreach(RideFileInterval activity, segments) { - if (activity.start > lastsecs) { + foreach(RideFileInterval ride, segments) { + if (ride.start > lastsecs) { // we have a gap gapnum++; // add to gap list RideFileInterval *gap = new RideFileInterval(lastsecs, - activity.start, + ride.start, QString(tr("Gap in recording #%1")).arg(gapnum)); gaps.append(gap); // add to interval list segments.append(RideFileInterval(*gap)); } - lastsecs = activity.stop; + lastsecs = ride.stop; } if (lastsecs < rideItem->ride()->dataPoints().last()->secs) { // gap at the end @@ -220,7 +220,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) // so we can mark the start and stop for splitting segments.insert(0, RideFileInterval(rideItem->ride()->dataPoints().first()->secs, rideItem->ride()->dataPoints().last()->secs, - tr("Entire Activity"))); + tr("Entire Ride"))); // now fold in the ride intervals segments.append(rideItem->ride()->intervals()); @@ -241,7 +241,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) // we set these intervals as checked by default bool checkit = (interval.name.startsWith(tr("Gap in recording")) || - interval.name == tr("Entire Activity")); + interval.name == tr("Entire Ride")); // disable checkbox editing (i.e. mandatory split) at gaps in recording // we have turned this off from user requests, may reinstate or choose @@ -445,22 +445,22 @@ SplitActivityWizard::conflicts(QDateTime datetime) // welcome SplitWelcome::SplitWelcome(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { - setTitle(tr("Split Activity")); + setTitle(tr("Split Ride")); setSubTitle(tr("Lets get started")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("This wizard will help you split the current activity " - "into multiple activities\n\n" + QLabel *label = new QLabel(tr("This wizard will help you split the current ride " + "into multiple rides\n\n" "The wizard will identify segments of uninterrupted " - "activity and allow you to select which ones to " - "save as new activities. You will also be able to " + "ride and allow you to select which ones to " + "save as new rides. You will also be able to " "select any currently defined intervals too.\n\n" - "If the newly created activity clashes with an existing " - "activity (same date and time) then the wizard will adjust " + "If the newly created ride clashes with an existing " + "ride (same date and time) then the wizard will adjust " "the start time by one or more seconds to avoid losing or " - "overwriting any existing activities.")); + "overwriting any existing rides.")); label->setWordWrap(true); layout->addWidget(label); @@ -471,20 +471,20 @@ SplitWelcome::SplitWelcome(SplitActivityWizard *parent) : QWizardPage(parent), w SplitKeep::SplitKeep(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { setTitle(tr("Keep original")); - setSubTitle(tr("Do you want to keep the original activity?")); + setSubTitle(tr("Do you want to keep the original ride?")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("If you want to keep the current activity then you " + QLabel *label = new QLabel(tr("If you want to keep the current ride then you " "should ensure you have clicked on the \"Keep original " - "activity\" check box below.\n\n" - "If you do not choose to keep the original activity " + "ride\" check box below.\n\n" + "If you do not choose to keep the original ride " "it will be backed up before removing it from the " - "activity history.\n\n")); + "ride history.\n\n")); label->setWordWrap(true); - keepOriginal = new QCheckBox(tr("Keep original activity"), this); + keepOriginal = new QCheckBox(tr("Keep original ride"), this); keepOriginal->setChecked(wizard->keepOriginal); warning = new QLabel(this); @@ -512,7 +512,7 @@ SplitParameters::SplitParameters(SplitActivityWizard *parent) : QWizardPage(pare QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("This wizard will find segments of activity to save " + QLabel *label = new QLabel(tr("This wizard will find segments of ride to save " "by looking for gaps in recording. \n\n" "You can define the minimum length, in time, a gap " "in recording should be in order to mark the end of " @@ -583,7 +583,7 @@ SplitKeep::setWarning() SplitSelect::SplitSelect(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { setTitle(tr("Select Split Markers")); - setSubTitle(tr("Activity will be split between marker points selected")); + setSubTitle(tr("Ride will be split between marker points selected")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); @@ -658,7 +658,7 @@ SplitSelect::refreshMarkers() SplitConfirm::SplitConfirm(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { setTitle(tr("Confirm")); - setSubTitle(tr("Split Activity cannot be undone")); + setSubTitle(tr("Split ride cannot be undone")); setCommitPage(true); setButtonText(QWizard::CommitButton, tr("Confirm")); @@ -686,7 +686,7 @@ SplitConfirm::initializePage() foreach(long mark, wizard->marks) points.append(mark); // marks are indexes to ensure absolute accuracy qSort(points.begin(), points.end()); - // Create a new activity for each marked segment + // Create a new ride for each marked segment long lastmark = -1; foreach(long mark, points) { @@ -812,7 +812,7 @@ SplitConfirm::validatePage() current->setText(5, tr("Removed")); } - // whizz through and create each new activity + // whizz through and create each new ride int off = wizard->keepOriginal ? 0 : 1; // skip first line to remove or not? for(int i=0; iactivities.count(); i++) { @@ -830,7 +830,7 @@ SplitConfirm::validatePage() // now make this page the last (so we can see what was done) setTitle(tr("Completed")); - setSubTitle(tr("Split Activity Completed")); + setSubTitle(tr("Split Ride Completed")); wizard->done = true;