mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-14 08:38:45 +00:00
Inital V3 Branch
This commit is contained in:
@@ -27,6 +27,7 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) :
|
||||
mainWindow(mainWindow), zones(_zones)
|
||||
{
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
|
||||
|
||||
home = _home;
|
||||
|
||||
@@ -44,14 +45,11 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) :
|
||||
|
||||
configPage = new ConfigurationPage(mainWindow);
|
||||
devicePage = new DevicePage(this);
|
||||
|
||||
pagesWidget = new QStackedWidget;
|
||||
pagesWidget->addWidget(configPage);
|
||||
pagesWidget->addWidget(cyclistPage);
|
||||
pagesWidget->addWidget(devicePage);
|
||||
#ifdef GC_HAVE_LIBOAUTH
|
||||
twitterPage = new TwitterPage(this);
|
||||
pagesWidget->addWidget(twitterPage);
|
||||
#endif
|
||||
|
||||
closeButton = new QPushButton(tr("Close"));
|
||||
saveButton = new QPushButton(tr("Save"));
|
||||
@@ -59,16 +57,6 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) :
|
||||
createIcons();
|
||||
contentsWidget->setCurrentItem(contentsWidget->item(0));
|
||||
|
||||
// connect(closeButton, SIGNAL(clicked()), this, SLOT(reject()));
|
||||
// connect(saveButton, SIGNAL(clicked()), this, SLOT(accept()));
|
||||
connect(closeButton, SIGNAL(clicked()), this, SLOT(accept()));
|
||||
|
||||
// connect the pieces...
|
||||
connect(devicePage->typeSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(changedType(int)));
|
||||
connect(devicePage->addButton, SIGNAL(clicked()), this, SLOT(devaddClicked()));
|
||||
connect(devicePage->delButton, SIGNAL(clicked()), this, SLOT(devdelClicked()));
|
||||
connect(devicePage->pairButton, SIGNAL(clicked()), this, SLOT(devpairClicked()));
|
||||
|
||||
horizontalLayout = new QHBoxLayout;
|
||||
horizontalLayout->addWidget(contentsWidget);
|
||||
horizontalLayout->addWidget(pagesWidget, 1);
|
||||
@@ -93,6 +81,15 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) :
|
||||
setWindowTitle(tr("Options"));
|
||||
#endif
|
||||
setFixedSize(QSize(800, 600));
|
||||
|
||||
connect(closeButton, SIGNAL(clicked()), this, SLOT(accept()));
|
||||
connect(devicePage->typeSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(changedType(int)));
|
||||
connect(devicePage->addButton, SIGNAL(clicked()), this, SLOT(devaddClicked()));
|
||||
connect(devicePage->delButton, SIGNAL(clicked()), this, SLOT(devdelClicked()));
|
||||
connect(devicePage->pairButton, SIGNAL(clicked()), this, SLOT(devpairClicked()));
|
||||
connect(contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
|
||||
this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*)));
|
||||
connect(saveButton, SIGNAL(clicked()), this, SLOT(save_Clicked()));
|
||||
}
|
||||
|
||||
void ConfigDialog::createIcons()
|
||||
@@ -116,14 +113,6 @@ void ConfigDialog::createIcons()
|
||||
realtimeButton->setTextAlignment(Qt::AlignHCenter);
|
||||
realtimeButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
|
||||
|
||||
#ifdef GC_HAVE_LIBOAUTH
|
||||
QListWidgetItem *twitterButton = new QListWidgetItem(contentsWidget);
|
||||
twitterButton->setIcon(QIcon(":images/twitter.png"));
|
||||
twitterButton->setText(tr("Twitter"));
|
||||
twitterButton->setTextAlignment(Qt::AlignHCenter);
|
||||
twitterButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
|
||||
#endif
|
||||
|
||||
connect(contentsWidget,
|
||||
SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
|
||||
this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*)));
|
||||
@@ -145,46 +134,42 @@ void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previou
|
||||
// ! new mode: change the CP associated with the present mode
|
||||
void ConfigDialog::save_Clicked()
|
||||
{
|
||||
boost::shared_ptr<QSettings> settings = GetApplicationSettings();
|
||||
|
||||
if (configPage->langCombo->currentIndex()==0)
|
||||
settings->setValue(GC_LANG, "en");
|
||||
appsettings->setValue(GC_LANG, "en");
|
||||
else if (configPage->langCombo->currentIndex()==1)
|
||||
settings->setValue(GC_LANG, "fr");
|
||||
appsettings->setValue(GC_LANG, "fr");
|
||||
else if (configPage->langCombo->currentIndex()==2)
|
||||
settings->setValue(GC_LANG, "ja");
|
||||
appsettings->setValue(GC_LANG, "ja");
|
||||
else if (configPage->langCombo->currentIndex()==3)
|
||||
settings->setValue(GC_LANG, "pt-br");
|
||||
appsettings->setValue(GC_LANG, "pt-br");
|
||||
else if (configPage->langCombo->currentIndex()==4)
|
||||
settings->setValue(GC_LANG, "it");
|
||||
appsettings->setValue(GC_LANG, "it");
|
||||
else if (configPage->langCombo->currentIndex()==5)
|
||||
settings->setValue(GC_LANG, "de");
|
||||
appsettings->setValue(GC_LANG, "de");
|
||||
|
||||
if (configPage->unitCombo->currentIndex()==0)
|
||||
settings->setValue(GC_UNIT, "Metric");
|
||||
appsettings->setValue(GC_UNIT, "Metric");
|
||||
else if (configPage->unitCombo->currentIndex()==1)
|
||||
settings->setValue(GC_UNIT, "Imperial");
|
||||
appsettings->setValue(GC_UNIT, "Imperial");
|
||||
|
||||
settings->setValue(GC_ALLRIDES_ASCENDING, configPage->allRidesAscending->checkState());
|
||||
settings->setValue(GC_GARMIN_SMARTRECORD, configPage->garminSmartRecord->checkState());
|
||||
settings->setValue(GC_GARMIN_HWMARK, configPage->garminHWMarkedit->text());
|
||||
settings->setValue(GC_CRANKLENGTH, configPage->crankLengthCombo->currentText());
|
||||
settings->setValue(GC_BIKESCOREDAYS, configPage->BSdaysEdit->text());
|
||||
settings->setValue(GC_BIKESCOREMODE, configPage->bsModeCombo->currentText());
|
||||
settings->setValue(GC_WORKOUTDIR, configPage->workoutDirectory->text());
|
||||
settings->setValue(GC_INITIAL_STS, cyclistPage->perfManStart->text());
|
||||
settings->setValue(GC_INITIAL_LTS, cyclistPage->perfManStart->text());
|
||||
settings->setValue(GC_STS_DAYS, cyclistPage->perfManSTSavg->text());
|
||||
settings->setValue(GC_LTS_DAYS, cyclistPage->perfManLTSavg->text());
|
||||
settings->setValue(GC_SB_TODAY, (int) cyclistPage->showSBToday->isChecked());
|
||||
appsettings->setValue(GC_ALLRIDES_ASCENDING, configPage->allRidesAscending->checkState());
|
||||
appsettings->setValue(GC_CRANKLENGTH, configPage->crankLengthCombo->currentText());
|
||||
appsettings->setValue(GC_BIKESCOREDAYS, configPage->BSdaysEdit->text());
|
||||
appsettings->setValue(GC_BIKESCOREMODE, configPage->bsModeCombo->currentText());
|
||||
appsettings->setValue(GC_WORKOUTDIR, configPage->workoutDirectory->text());
|
||||
appsettings->setCValue(mainWindow->cyclist, GC_INITIAL_STS, cyclistPage->perfManStart->text());
|
||||
appsettings->setCValue(mainWindow->cyclist, GC_INITIAL_LTS, cyclistPage->perfManStart->text());
|
||||
appsettings->setCValue(mainWindow->cyclist, GC_STS_DAYS, cyclistPage->perfManSTSavg->text());
|
||||
appsettings->setCValue(mainWindow->cyclist, GC_LTS_DAYS, cyclistPage->perfManLTSavg->text());
|
||||
appsettings->setCValue(mainWindow->cyclist, GC_SB_TODAY, (int) cyclistPage->showSBToday->isChecked());
|
||||
|
||||
// set default stress names if not set:
|
||||
settings->setValue(GC_STS_NAME, settings->value(GC_STS_NAME,tr("Short Term Stress")));
|
||||
settings->setValue(GC_STS_ACRONYM, settings->value(GC_STS_ACRONYM,tr("STS")));
|
||||
settings->setValue(GC_LTS_NAME, settings->value(GC_LTS_NAME,tr("Long Term Stress")));
|
||||
settings->setValue(GC_LTS_ACRONYM, settings->value(GC_LTS_ACRONYM,tr("LTS")));
|
||||
settings->setValue(GC_SB_NAME, settings->value(GC_SB_NAME,tr("Stress Balance")));
|
||||
settings->setValue(GC_SB_ACRONYM, settings->value(GC_SB_ACRONYM,tr("SB")));
|
||||
appsettings->setValue(GC_STS_NAME, appsettings->value(this, GC_STS_NAME,tr("Short Term Stress")));
|
||||
appsettings->setValue(GC_STS_ACRONYM, appsettings->value(this, GC_STS_ACRONYM,tr("STS")));
|
||||
appsettings->setValue(GC_LTS_NAME, appsettings->value(this, GC_LTS_NAME,tr("Long Term Stress")));
|
||||
appsettings->setValue(GC_LTS_ACRONYM, appsettings->value(this, GC_LTS_ACRONYM,tr("LTS")));
|
||||
appsettings->setValue(GC_SB_NAME, appsettings->value(this, GC_SB_NAME,tr("Stress Balance")));
|
||||
appsettings->setValue(GC_SB_ACRONYM, appsettings->value(this, GC_SB_ACRONYM,tr("SB")));
|
||||
|
||||
// Save Cyclist page stuff
|
||||
cyclistPage->saveClicked();
|
||||
@@ -192,10 +177,6 @@ void ConfigDialog::save_Clicked()
|
||||
// save interval metrics and ride data pages
|
||||
configPage->saveClicked();
|
||||
|
||||
#ifdef GC_HAVE_LIBOAUTH
|
||||
//Call Twitter Save Dialog to get Access Token
|
||||
twitterPage->saveClicked();
|
||||
#endif
|
||||
// Save the device configuration...
|
||||
DeviceConfigurations all;
|
||||
all.writeConfig(devicePage->deviceListModel->Configuration);
|
||||
|
||||
Reference in New Issue
Block a user