nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 08:38:45 +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 e256783f73
commit 0fcbbe1b77
235 changed files with 2196 additions and 1948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/AboutDialog.cpp
View File

@@ -20,15 +20,15 @@
#include "GcUpgrade.h"
#include "GcCrashDialog.h"
AboutDialog::AboutDialog(MainWindow *mainWindow, QDir home) : mainWindow(mainWindow), home(home)
AboutDialog::AboutDialog(Context *context, QDir home) : context(context), home(home)
{
setWindowTitle(tr("About GoldenCheetah"));
aboutPage = new AboutPage(mainWindow, home);
versionPage = new VersionPage(mainWindow, home);
contributorsPage = new ContributorsPage(mainWindow, home);
aboutPage = new AboutPage(context, home);
versionPage = new VersionPage(context, home);
contributorsPage = new ContributorsPage(context, home);
#ifndef GC_VERSION
configPage = new ConfigPage(mainWindow, home);
configPage = new ConfigPage(context, home);
#endif
tabWidget = new QTabWidget;
@@ -53,7 +53,7 @@ AboutDialog::AboutDialog(MainWindow *mainWindow, QDir home) : mainWindow(mainWin
//
// About page
//
AboutPage::AboutPage(MainWindow *main, QDir home) : main(main), home(home)
AboutPage::AboutPage(Context *context, QDir home) : context(context), home(home)
{
QLabel *text;
text=new QLabel(this);
@@ -94,7 +94,7 @@ AboutPage::AboutPage(MainWindow *main, QDir home) : main(main), home(home)
//
// Version page
//
VersionPage::VersionPage(MainWindow *main, QDir home) : main(main), home(home)
VersionPage::VersionPage(Context *context, QDir home) : context(context), home(home)
{
QLabel *text;
text=new QLabel(this);
@@ -111,7 +111,7 @@ VersionPage::VersionPage(MainWindow *main, QDir home) : main(main), home(home)
//
// Contributors page
//
ContributorsPage::ContributorsPage(MainWindow *main, QDir home) : main(main), home(home)
ContributorsPage::ContributorsPage(Context *context, QDir home) : context(context), home(home)
{
QStringList contributors;
contributors.append("Alejandro Martinez");
@@ -186,7 +186,7 @@ ContributorsPage::ContributorsPage(MainWindow *main, QDir home) : main(main), ho
setLayout(mainLayout);
}
ConfigPage::ConfigPage(MainWindow *main, QDir home) : main(main), home(home)
ConfigPage::ConfigPage(Context *context, QDir home) : context(context), home(home)
{
QTextEdit *text = new QTextEdit(this);
text->setAutoFillBackground(false);