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

@@ -17,12 +17,12 @@
*/
#include "SearchFilterBox.h"
#include "MainWindow.h"
#include "Context.h"
#include "Lucene.h"
#include "DataFilter.h"
#include "SearchBox.h"
SearchFilterBox::SearchFilterBox(QWidget *parent, MainWindow *main, bool nochooser) : QWidget(parent), main(main)
SearchFilterBox::SearchFilterBox(QWidget *parent, Context *context, bool nochooser) : QWidget(parent), context(context)
{
setContentsMargins(0,0,0,0);
@@ -31,11 +31,11 @@ SearchFilterBox::SearchFilterBox(QWidget *parent, MainWindow *main, bool nochoos
contents->setContentsMargins(0,0,0,0);
// no column chooser if my parent widget is a modal widget
searchbox = new SearchBox(main, this, nochooser);
searchbox = new SearchBox(context, this, nochooser);
contents->addWidget(searchbox);
lucene = new Lucene(this, main);
datafilter = new DataFilter(this,main);
lucene = new Lucene(this, context);
datafilter = new DataFilter(this,context);
// text searching
connect(searchbox, SIGNAL(submitQuery(QString)), lucene, SLOT(search(QString)));