nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 00:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Training View Configurable

Browse Source 
The training view (aka realtime) is now configurable
allowing users to drag and drop appropriate charts
and dials onto the main view.

The controls for this view are static and comprise the
old controls with start/stop buttons, device selections etc.

I have removed deprecated code too, the following are removed
from the repository;
* ViewSelection
* RealtimeWindow
* TrainWindow
* TrainTabs

Fixes #290.
This commit is contained in:
Mark Liversedge
2011-05-10 18:21:08 +01:00
parent be86541ff5
commit 3ae81329d7
36 changed files with 907 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/MainWindow.cpp
View File

@@ -43,7 +43,6 @@
#include "ManualRideDialog.h"
#include "HistogramWindow.h"
#include "ModelWindow.h"
#include "RealtimeWindow.h"
#include "RideItem.h"
#include "IntervalItem.h"
#include "IntervalSummaryWindow.h"
@@ -79,7 +78,6 @@
#include "MetricAggregator.h"
#include "SplitRideDialog.h"
#include "PerformanceManagerWindow.h"
#include "TrainWindow.h"
#include "TreeMapWindow.h"
#include "TwitterDialog.h"
#include "WithingsDownload.h"
@@ -193,9 +191,9 @@ MainWindow::MainWindow(const QDir &home) :
toolbar->setFloatable(false);
toolbar->setIconSize(QSize(32,32));
#ifndef Q_OS_MAC
//toolbar->setAutoFillBackground(false);
//toolbar->setStyleSheet("background-image: url(\":/images/aluLight.jpg\"); border: 0px;");
toolbar->setContentsMargins(0,0,0,0);
toolbar->setAutoFillBackground(true);
#else
QIcon tickIcon(":images/toolbar/main/tick.png");
QPushButton *showControls = new QPushButton(tickIcon, "", this);
@@ -382,12 +380,13 @@ MainWindow::MainWindow(const QDir &home) :
homeControls->setContentsMargins(0,0,0,0);
masterControls->addWidget(homeControls);
homeWindow = new HomeWindow(this, "home");
homeWindow = new HomeWindow(this, "home", "Home");
homeControls->addWidget(homeWindow->controls());
homeControls->setCurrentIndex(0);
// setup trainWindow
trainWindow = new TrainWindow(this, home);
trainControls->addWidget(trainWindow->controls());
trainWindow = new HomeWindow(this, "train", "Training");
trainControls->addWidget(new TrainTool(this, this->home));
// ToolBox has one thing at the mo... will change soon
toolBox = new QToolBox(this);
@@ -754,18 +753,6 @@ MainWindow::tabViewTriggered(bool)
appsettings->setValue(GC_TABS_TO_HIDE, tabsToHide.join(","));
}
void
MainWindow::selectView(int view)
{
if (view == VIEW_ANALYSIS)
views->setCurrentIndex(0); // set stacked widget to Analysis
else if (view == VIEW_TRAIN)
views->setCurrentIndex(1); // set stacked widget to Train
// notify with a signal
viewChanged(view);
}
void
MainWindow::dragEnterEvent(QDragEnterEvent *event)
{
@@ -1509,6 +1496,7 @@ MainWindow::closeEvent(QCloseEvent* event)
// save the state of all the pages
homeWindow->saveState();
trainWindow->saveState();
// clear the clipboard if neccessary
QApplication::clipboard()->setText("");
@@ -1881,6 +1869,7 @@ MainWindow::selectTrain()
{
masterControls->setCurrentIndex(1);
views->setCurrentIndex(1);
trainWindow->selected(); // tell it!
}
void