nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 17:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

What's in a name ?

Browse Source 
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.
This commit is contained in:
Mark Liversedge
2014-01-12 13:06:00 +00:00
parent 0cc28b1eb3
commit 4ced2ca51d
17 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/MergeActivityWizard.cpp
View File

@@ -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<QString> 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<QString> 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;