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

switch from QToolBox to QComboBox

Browse Source 
This patch removes the QToolBox from commit e93970 and replaces it with
a QComboBox instead. A new object ViewSelection can be included in any
new views and will manage the interaction with MainWindow to switch
between views. It is essentially a QComboBox with some code to interact
with MainWindow.

A new signal viewChanged(int) has been implemented in MainWindow to
notify of a view change. The parameter will be set to VIEW_ANALYSIS
or VIEW_TRAIN depending upon which view was selected.

In addition, a new TrainWindow object has been created which implements
the Realtime code and is comprised of the TrainTool and TrainTabs
implemented in e93970. It also sets its splitters from remembered values
in the same fashion as the central splitter on the Analysis view.
This commit is contained in:
Mark Liversedge
2009-12-21 15:39:19 +00:00
committed by Sean Rhea
parent 0d96ba220d
commit d10b08e86f
12 changed files with 291 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/MainWindow.cpp
View File

@@ -57,8 +57,7 @@
#include "MetricAggregator.h"
#include "SplitRideDialog.h"
#include "PerformanceManagerWindow.h"
#include "TrainTabs.h"
#include "TrainTool.h"
#include "TrainWindow.h"
#ifndef GC_VERSION
#define GC_VERSION "(developer build)"
@@ -125,8 +124,7 @@ MainWindow::MainWindow(const QDir &home) :
else
setGeometry(geom.toRect());
splitter = new QSplitter(this);
setCentralWidget(splitter);
splitter = new QSplitter;
splitter->setContentsMargins(10, 20, 10, 10); // attempting to follow some UI guides
// Analysis toolbox contents
@@ -177,21 +175,16 @@ MainWindow::MainWindow(const QDir &home) :
intervalsplitter->setCollapsible(1, true);
leftLayout = new QSplitter;
viewSelection = new ViewSelection(this, VIEW_ANALYSIS);
leftLayout->setOrientation(Qt::Vertical);
leftLayout->addWidget(viewSelection);
leftLayout->setCollapsible(0, false);
leftLayout->addWidget(calendar);
leftLayout->setCollapsible(0, true);
leftLayout->setCollapsible(1, true);
leftLayout->addWidget(intervalsplitter);
leftLayout->setCollapsible(1, false);
leftLayout->setCollapsible(2, false);
// Train toolbox contents
TrainTool *trainTool = new TrainTool(this, home);
// Setup Toolbox
leftToolBox = new QToolBox;
leftToolBox->addItem(leftLayout, tr("Ride Analysis"));
leftToolBox->addItem(trainTool, tr("Racing and Training"));
splitter->addWidget(leftToolBox);
splitter->addWidget(leftLayout);
splitter->setCollapsible(0, true);
QVariant calendarSizes = settings->value(GC_SETTINGS_CALENDAR_SIZES);
if (calendarSizes != QVariant()) {
@@ -212,16 +205,18 @@ MainWindow::MainWindow(const QDir &home) :
}
tabWidget = new QTabWidget;
trainTabs = new TrainTabs(this, trainTool, home);
tabWidget->setUsesScrollButtons(true);
rightSide = new QStackedWidget;
rightSide->addWidget(tabWidget);
rightSide->addWidget(trainTabs);
// setup trainWindow
trainWindow = new TrainWindow(this, home);
// Start with Analysis by default
rightSide->setCurrentIndex(0);
leftToolBox->setCurrentIndex(0);
// Setup the two views
// add the two views; Analysis and Train
views = new QStackedWidget(this);
setCentralWidget(views);
views->addWidget(splitter); // Analysis stuff
views->addWidget(trainWindow); // Train Stuff
views->setCurrentIndex(0); // default to Analysis
rideSummaryWindow = new RideSummaryWindow(this);
QLabel *notesLabel = new QLabel(tr("Notes:"));
@@ -241,6 +236,7 @@ MainWindow::MainWindow(const QDir &home) :
summarySplitter->addWidget(notesWidget);
summarySplitter->setCollapsible(1, true);
// the sizes are somewhat arbitrary,
// just trying to force the smallest non-hidden notes size by default
QList<int> summarySizes;
@@ -253,7 +249,7 @@ MainWindow::MainWindow(const QDir &home) :
/////////////////////////// Ride Plot Tab ///////////////////////////
allPlotWindow = new AllPlotWindow(this);
tabWidget->addTab(allPlotWindow, tr("Ride Plot"));
splitter->addWidget(rightSide);
splitter->addWidget(tabWidget);
splitter->setCollapsible(1, true);
QVariant splitterSizes = settings->value(GC_SETTINGS_SPLITTER_SIZES);
@@ -312,8 +308,6 @@ MainWindow::MainWindow(const QDir &home) :
this, SLOT(intervalTreeWidgetSelectionChanged()));
connect(intervalWidget,SIGNAL(itemChanged(QTreeWidgetItem *,int)),
this, SLOT(intervalEdited(QTreeWidgetItem*, int)));
connect(leftToolBox, SIGNAL(currentChanged(int)),
this, SLOT(toolboxChanged(int)));
/////////////////////////////// Menus ///////////////////////////////
@@ -382,9 +376,15 @@ MainWindow::MainWindow(const QDir &home) :
}
void
MainWindow::toolboxChanged(int index)
MainWindow::selectView(int view)
{
rightSide->setCurrentIndex(index); // right stack has one page per toolbox
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