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

Refactor MainWindow Part 2 of 5

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

27
src/TtbDialog.cpp
View File

@@ -17,13 +17,9 @@
*/
#include "TtbDialog.h"
#include "MainWindow.h"
#include "Athlete.h"
#include "Settings.h"
#include <QHttp>
#include <QUrl>
#include <QHttpMultiPart>
#include <QXmlInputSource>
#include <QXmlSimpleReader>
#include <QXmlDefaultHandler>
#include "TimeUtils.h"
#include "Units.h"
@@ -85,14 +81,11 @@ protected:
};
TtbDialog::TtbDialog(MainWindow *mainWindow, RideItem *item) :
mainWindow(mainWindow),
TtbDialog::TtbDialog(Context *context, RideItem *item) :
context(context),
ride( item ),
proMember( false )
{
assert(mainWindow);
assert(ride);
exerciseId = ride->ride()->getTag("TtbExercise", "");
setWindowTitle("Trainingstagebuch");
@@ -146,8 +139,8 @@ TtbDialog::requestSettings()
currentRequest = reqSettings;
QString username = appsettings->cvalue(mainWindow->athlete->cyclist, GC_TTBUSER).toString();
QString password = appsettings->cvalue(mainWindow->athlete->cyclist, GC_TTBPASS).toString();
QString username = appsettings->cvalue(context->athlete->cyclist, GC_TTBUSER).toString();
QString password = appsettings->cvalue(context->athlete->cyclist, GC_TTBPASS).toString();
QUrl url( TTB_URL + "/settings/list" );
url.addQueryItem( "view", "xml" );
@@ -170,8 +163,8 @@ TtbDialog::requestSession()
currentRequest = reqSession;
QString username = appsettings->cvalue(mainWindow->athlete->cyclist, GC_TTBUSER).toString();
QString password = appsettings->cvalue(mainWindow->athlete->cyclist, GC_TTBPASS).toString();
QString username = appsettings->cvalue(context->athlete->cyclist, GC_TTBUSER).toString();
QString password = appsettings->cvalue(context->athlete->cyclist, GC_TTBPASS).toString();
QUrl url( TTB_URL + "/login/sso" );
url.addQueryItem( "view", "xml" );
@@ -203,12 +196,12 @@ TtbDialog::requestUpload()
body->append( textPart );
QString fname = mainWindow->athlete->home.absoluteFilePath(".ttbupload.tcx" );
QString fname = context->athlete->home.absoluteFilePath(".ttbupload.tcx" );
QFile *uploadFile = new QFile( fname );
uploadFile->setParent(body);
TcxFileReader reader;
reader.writeRideFile( mainWindow, ride->ride(), *uploadFile );
reader.writeRideFile(context, ride->ride(), *uploadFile );
progressBar->setValue(12);
int limit = proMember