From 30ca55787d51fbd1344dc1b2413a78e6cee57083 Mon Sep 17 00:00:00 2001 From: Joern Date: Sat, 8 Aug 2015 15:41:06 +0200 Subject: [PATCH] Indicate the Path to Athlete Directory to backup during Upgrade (original code by GitHub user "mtbkeith" - thanks) ..show path in Upgrade Windows (separate from the scrolling section) ..allow path to be selected and copied to clipboard via Mouse --- src/GcUpgrade.cpp | 20 ++++++++++++++++++-- src/GcUpgrade.h | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/GcUpgrade.cpp b/src/GcUpgrade.cpp index bc9b29544..64b4326a0 100644 --- a/src/GcUpgrade.cpp +++ b/src/GcUpgrade.cpp @@ -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("
Please backup the athlete directory:
"))); + + QLabel *footer2 = new QLabel(this); + footer2->setWordWrap(true); + footer2->setTextFormat(Qt::RichText); + footer2->setTextInteractionFlags(Qt::TextSelectableByMouse); + footer2->setText(QString("
%1
").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; diff --git a/src/GcUpgrade.h b/src/GcUpgrade.h index a381a76aa..86291c8f8 100644 --- a/src/GcUpgrade.h +++ b/src/GcUpgrade.h @@ -126,7 +126,7 @@ class GcUpgradeExecuteDialog : public QDialog Q_OBJECT public: - GcUpgradeExecuteDialog(QString); + GcUpgradeExecuteDialog(QDir); private: QScrollArea *scrollText;