nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-16 17:39:58 +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

13
src/BatchExportDialog.cpp
View File

@@ -18,8 +18,11 @@
*/
#include "BatchExportDialog.h"
#include "MainWindow.h"
#include "Context.h"
#include "Athlete.h"
BatchExportDialog::BatchExportDialog(MainWindow *main) : QDialog(main), main(main)
BatchExportDialog::BatchExportDialog(Context *context) : QDialog(context->mainWindow), context(context)
{
setAttribute(Qt::WA_DeleteOnClose);
//setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); // must stop using this flag!
@@ -50,7 +53,7 @@ BatchExportDialog::BatchExportDialog(MainWindow *main) : QDialog(main), main(mai
files->setIndentation(0);
// populate with each ride in the ridelist
const QTreeWidgetItem *allRides = main->allRideItems();
const QTreeWidgetItem *allRides = context->mainWindow->allRideItems();
for (int i=0; i<allRides->childCount(); i++) {
@@ -221,8 +224,8 @@ BatchExportDialog::exportFiles()
// open it..
QStringList errors;
QList<RideFile*> rides;
QFile thisfile(QString(main->athlete->home.absolutePath()+"/"+current->text(1)));
RideFile *ride = RideFileFactory::instance().openRideFile(main, thisfile, errors, &rides);
QFile thisfile(QString(context->athlete->home.absolutePath()+"/"+current->text(1)));
RideFile *ride = RideFileFactory::instance().openRideFile(context, thisfile, errors, &rides);
// open success?
if (ride) {
@@ -230,7 +233,7 @@ BatchExportDialog::exportFiles()
current->setText(4, tr("Writing...")); QApplication::processEvents();
QFile out(filename);
bool success = RideFileFactory::instance().writeRideFile(main, ride, out, type);
bool success = RideFileFactory::instance().writeRideFile(context, ride, out, type);
if (success) {
exports++;