Merge branch 'release_3.0.0dev' of github.com:/srhea/GoldenCheetah into release_3.0.0dev

This commit is contained in:
Mark Liversedge
2011-02-05 12:53:59 +00:00
17 changed files with 1220 additions and 57 deletions

View File

@@ -83,6 +83,8 @@
#include "TwitterDialog.h"
#include "WithingsDownload.h"
#include "CalendarDownload.h"
#include "WorkoutWizard.h"
#include "GcWindowTool.h"
#ifdef GC_HAVE_SOAP
#include "TPUploadDialog.h"
@@ -602,6 +604,9 @@ MainWindow::MainWindow(const QDir &home) :
SLOT(showOptions()), tr("Ctrl+O"));
optionsMenu->addAction(tr("Critical Power Calculator..."), this,
SLOT(showTools()));
optionsMenu->addAction(tr("Workout Wizard"), this,
SLOT(showWorkoutWizard()));
#ifdef GC_HAVE_ICAL
optionsMenu->addSeparator();
optionsMenu->addAction(tr("Upload Ride to Calendar"), this,
@@ -1625,6 +1630,12 @@ void MainWindow::showTools()
td->show();
}
void MainWindow::showWorkoutWizard()
{
WorkoutWizard *ww = new WorkoutWizard(this);
ww->show();
}
void
MainWindow::saveRide()
{