nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-17 01:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable user to configure autodiscovery

Browse Source 
.. select which kind of intervals we want

.. makes it faster and also reduces the size of
   the rideDB.json file quite dramatically which
   may be useful for some users.
This commit is contained in:
Mark Liversedge
2015-06-27 12:30:27 +01:00
parent 22dbfaee7d
commit 8a09fe0ca2
14 changed files with 223 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ConfigDialog.cpp
View File

@@ -65,6 +65,7 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, Context *context) :
static QIcon appearanceIcon(QPixmap(":/images/toolbar/color.png"));
static QIcon dataIcon(QPixmap(":/images/toolbar/data.png"));
static QIcon metricsIcon(QPixmap(":/images/toolbar/abacus.png"));
static QIcon intervalIcon(QPixmap(":/images/stopwatch.png"));
static QIcon devicesIcon(QPixmap(":/images/devices/kickr.png"));
// Setup the signal mapping so the right config
@@ -100,10 +101,15 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, Context *context) :
connect(added, SIGNAL(triggered()), iconMapper, SLOT(map()));
iconMapper->setMapping(added, 5);
added =head->addAction(devicesIcon, tr("Train Devices"));
added =head->addAction(intervalIcon, tr("Intervals"));
connect(added, SIGNAL(triggered()), iconMapper, SLOT(map()));
iconMapper->setMapping(added, 6);
added =head->addAction(devicesIcon, tr("Train Devices"));
connect(added, SIGNAL(triggered()), iconMapper, SLOT(map()));
iconMapper->setMapping(added, 7);
// more space
spacer = new QWidget(this);
spacer->setAutoFillBackground(false);
@@ -144,6 +150,11 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, Context *context) :
metric->setWhatsThis(metricHelp->getWhatsThisText(HelpWhatsThis::Preferences_Metrics));
pagesWidget->addWidget(metric);
interval = new IntervalConfig(_home, _zones, context);
//HelpWhatsThis *intervalHelp = new HelpWhatsThis(interval);
//interval->setWhatsThis(intervalHelp->getWhatsThisText(HelpWhatsThis::Preferences_Intervals));
pagesWidget->addWidget(interval);
device = new DeviceConfig(_home, _zones, context);
HelpWhatsThis *deviceHelp = new HelpWhatsThis(device);
device->setWhatsThis(deviceHelp->getWhatsThisText(HelpWhatsThis::Preferences_TrainDevices));
@@ -208,6 +219,7 @@ void ConfigDialog::saveClicked()
changed |= metric->saveClicked();
changed |= data->saveClicked();
changed |= device->saveClicked();
changed |= interval->saveClicked();
hide();
@@ -410,6 +422,30 @@ qint32 MetricConfig::saveClicked()
return state;
}
IntervalConfig::IntervalConfig(QDir home, Zones *zones, Context *context) :
home(home), zones(zones), context(context)
{
// the widgets
intervalsPage = new IntervalsPage(context);
setContentsMargins(0,0,0,0);
QHBoxLayout *mainLayout = new QHBoxLayout(this);
mainLayout->setSpacing(0);
mainLayout->setContentsMargins(0,0,0,0);
mainLayout->addWidget(intervalsPage);
mainLayout->addStretch();
}
qint32 IntervalConfig::saveClicked()
{
qint32 state = 0;
state |= intervalsPage->saveClicked();
return state;
}
// GENERAL CONFIG
DeviceConfig::DeviceConfig(QDir home, Zones *zones, Context *context) :
home(home), zones(zones), context(context)