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

Merge pull request #1502 from Joern-R/Upgrade

Browse Source 
Indicate the Path to Athlete Directory to backup during Upgrade
This commit is contained in:
Mark Liversedge
2015-08-08 15:19:21 +01:00
parent ea18e6718d 30ca55787d
commit 09cc67f431
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/GcUpgrade.cpp
View File

@@ -56,7 +56,7 @@ GcUpgrade::upgradeConfirmedByUser(const QDir &home)
if (!folderUpgradeSuccess) {
GcUpgradeExecuteDialog msgBox(home.dirName());
GcUpgradeExecuteDialog msgBox(home);
if (msgBox.exec() == QDialog::Accepted) return true;
// if not accepted
@@ -770,9 +770,11 @@ GcUpgrade::removeIndex(QFile &index)
}
GcUpgradeExecuteDialog::GcUpgradeExecuteDialog(QString athlete) : QDialog(NULL, Qt::Dialog)
GcUpgradeExecuteDialog::GcUpgradeExecuteDialog(QDir athleteHomeDir) : QDialog(NULL, Qt::Dialog)
{
const QString athlete = athleteHomeDir.dirName();
setWindowTitle(QString(tr("Athlete %1").arg(athlete)));
this->setMinimumWidth(550);
@@ -831,10 +833,24 @@ GcUpgradeExecuteDialog::GcUpgradeExecuteDialog(QString athlete) : QDialog(NULL,
scrollText = new QScrollArea();
scrollText->setWidget(text);
QLabel *footer1 = new QLabel(this);
footer1->setWordWrap(true);
footer1->setTextFormat(Qt::RichText);
footer1->setText(QString(tr("<center>Please backup the athlete directory:</center>")));
QLabel *footer2 = new QLabel(this);
footer2->setWordWrap(true);
footer2->setTextFormat(Qt::RichText);
footer2->setTextInteractionFlags(Qt::TextSelectableByMouse);
footer2->setText(QString("<center><b>%1</b></center>").arg(athleteHomeDir.absolutePath()));
toprow->addWidget(critical);
toprow->addWidget(header);
layout->addLayout(toprow);
layout->addWidget(scrollText);
layout->addWidget(footer1);
layout->addWidget(footer2);
QHBoxLayout *lastRow = new QHBoxLayout;

2
src/GcUpgrade.h
View File

@@ -126,7 +126,7 @@ class GcUpgradeExecuteDialog : public QDialog
Q_OBJECT
public:
GcUpgradeExecuteDialog(QString);
GcUpgradeExecuteDialog(QDir);
private:
QScrollArea *scrollText;