Refactor MainWindow Part 2 of 5

Decoupled classes from MainWindow to reference Context
and Athlete (and introduced a couple of new headers).

We no longer pass around a MainWindow pointer to children
but pass a context instead.

There are still a few pieces left in MainWindow that need
to move to a better place;
    * Setting/clearing filter selection
    * Working with Intervals
    * Adding/Deleting Rides
    * Save on Exit

As mentioned previously there are lots of other parts to
this refactor left to do;
    * break MainWindow Gui elements into Toolbar and Views

    * migrate from RideItem and Ridelist to ActivityCollection
      and Activity classes that are not tied into gui elements.

    * introduce Application Context and AthleteCollection
This commit is contained in:
Mark Liversedge
2013-07-10 13:57:30 +01:00
parent cd54ce16c8
commit 05f1d577db
235 changed files with 2196 additions and 1948 deletions

View File

@@ -16,15 +16,15 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "TPUploadDialog.h"
#include "MainWindow.h"
#include "Context.h"
#include "GcRideFile.h"
#include "RideItem.h"
#include "RideFile.h"
#include "TPUpload.h"
#include "Settings.h"
TPUploadDialog::TPUploadDialog(QString cyclist, const RideFile *ride, MainWindow *main) :
main(main), cyclist(cyclist), ride(ride)
TPUploadDialog::TPUploadDialog(QString cyclist, const RideFile *ride, Context *context) :
context(context), cyclist(cyclist), ride(ride)
{
setWindowTitle(tr("Upload to TrainingPeaks.com"));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -53,7 +53,7 @@ main(main), cyclist(cyclist), ride(ride)
connect(uploader, SIGNAL(completed(QString)),this, SLOT(completed(QString)));
uploading = true;
int size = uploader->upload(main, ride);
int size = uploader->upload(context, ride);
statusLabel->setText(QString(tr("Uploading ride (%1 bytes)...")).arg(size));