From f0310815210104f84d660ee172d33b6cc747e44a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 17 May 2012 06:28:09 +1000 Subject: [PATCH] Added data folder selection ability on first run. Show data folder location in About window --- SleepLib/preferences.cpp | 14 ++++++++++---- SleepLib/preferences.h | 7 ++++++- mainwindow.cpp | 4 ++-- newprofile.cpp | 31 +++++++++++++++++++++++++++++++ newprofile.h | 2 ++ newprofile.ui | 33 ++++++++++++++++++++++++++++++--- version.h | 2 +- 7 files changed, 82 insertions(+), 11 deletions(-) diff --git a/SleepLib/preferences.cpp b/SleepLib/preferences.cpp index 750c4389..f809f7f0 100644 --- a/SleepLib/preferences.cpp +++ b/SleepLib/preferences.cpp @@ -16,6 +16,7 @@ License: GPL #include #include #include +#include #ifdef Q_WS_WIN32 #include "windows.h" #include "lmcons.h" @@ -52,11 +53,16 @@ const QString & getUserName() return userName; } -const QString & GetAppRoot() -{ - // Should it go here: QDesktopServices::DataLocation ??? - static QString HomeAppRoot=QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)+"/"+AppRoot; +QString GetAppRoot() +{ + QSettings settings("Jedimark", "SleepyHead"); + + QString HomeAppRoot=settings.value("Settings/AppRoot").toString(); + + // Should it go here: QDesktopServices::DataLocation ??? + if (HomeAppRoot.isEmpty()) + HomeAppRoot=QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)+"/"+AppRoot; return HomeAppRoot; } diff --git a/SleepLib/preferences.h b/SleepLib/preferences.h index 774b6b1e..f685d919 100644 --- a/SleepLib/preferences.h +++ b/SleepLib/preferences.h @@ -21,7 +21,7 @@ License: GPL const QString AppName="SleepyHead"; // Outer tag of XML files const QString AppRoot="SleepyHeadData"; // The Folder Name -extern const QString & GetAppRoot(); //returns app root path plus trailing path separator. +extern QString GetAppRoot(); //returns app root path plus trailing path separator. inline QString PrefMacro(QString s) { @@ -113,6 +113,11 @@ public: //! \brief Stores all the variants indexed by a QString name for this Preferences object QHash p_preferences; + void setPath(const QString & path) { p_path=path; } + void setFilename(const QString & filename) { p_filename=filename; } + + const QString name() { return p_name; } + protected: //QHash p_codes; QString p_comment; diff --git a/mainwindow.cpp b/mainwindow.cpp index 339bbda3..4c9344e0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1456,12 +1456,12 @@ void MainWindow::on_action_About_triggered() QString gitrev=QString(GIT_REVISION); if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev; - QString msg=tr("

SleepyHead v%1.%2.%3-%4 (%8)

Build Date: %5 %6
%7
" + QString msg=tr("

SleepyHead v%1.%2.%3-%4 (%8)

Build Date: %5 %6
%7
Data Folder: %9
" "Copyright ©2011 Mark Watkins (jedimark)
\n" "http://sleepyhead.sourceforge.net
" "This software is released under the GNU Public License
" "This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays." - "
").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus); + "
").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus).arg(GetAppRoot()); QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this); msgbox.setTextFormat(Qt::RichText); msgbox.setText(msg); diff --git a/newprofile.cpp b/newprofile.cpp index a2b0120d..a9c84c0d 100644 --- a/newprofile.cpp +++ b/newprofile.cpp @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "SleepLib/profiles.h" #include "newprofile.h" @@ -74,6 +76,9 @@ NewProfile::NewProfile(QWidget *parent) : ui->AppTitle->setText("SleepyHead v"+VersionString); ui->releaseStatus->setText(ReleaseStatus); + ui->dataFolderPath->setReadOnly(true); + ui->dataFolderPath->setText(GetAppRoot()); + } @@ -84,11 +89,22 @@ NewProfile::~NewProfile() void NewProfile::on_nextButton_clicked() { + const QString xmlext=".xml"; + + QSettings settings("Jedimark", "SleepyHead"); if (!ui->agreeCheckbox->isChecked()) return; int index=ui->stackedWidget->currentIndex(); switch(index) { + case 0: + settings.setValue("Settings/AppRoot", ui->dataFolderPath->text()); + p_pref->setFilename(ui->dataFolderPath->text()+"/"+p_pref->name()+xmlext); + p_pref->setPath(ui->dataFolderPath->text()); + p_layout->setFilename(ui->dataFolderPath->text()+"/"+p_layout->name()+xmlext); + p_layout->setPath(ui->dataFolderPath->text()); + // Reload Preferences object + break; case 1: if (ui->userNameEdit->text().isEmpty()) { QMessageBox::information(this,STR_MESSAGE_ERROR,tr("Empty Username"),QMessageBox::Ok); @@ -345,3 +361,18 @@ void NewProfile::on_heightCombo_currentIndexChanged(int index) ui->heightEdit2->setValue(inches); } } + +void NewProfile::on_dataFolderButton_clicked() +{ + QFileDialog fd(this); + QString filename; + fd.setFileMode(QFileDialog::Directory); + fd.setOption(QFileDialog::ShowDirsOnly,true); + + fd.setAcceptMode(QFileDialog::AcceptSave); + if (fd.exec()==QFileDialog::Accepted) { + filename=fd.selectedFiles()[0]; + ui->dataFolderPath->setText(filename); + //ui->dataFolderPath->setEnabled(true); + } +} diff --git a/newprofile.h b/newprofile.h index 9bc30056..fc79ebc5 100644 --- a/newprofile.h +++ b/newprofile.h @@ -48,6 +48,8 @@ private slots: void on_heightCombo_currentIndexChanged(int index); + void on_dataFolderButton_clicked(); + private: Ui::NewProfile *ui; bool m_editMode; diff --git a/newprofile.ui b/newprofile.ui index 041a5b9e..54e628a8 100644 --- a/newprofile.ui +++ b/newprofile.ui @@ -36,8 +36,11 @@ 5 - - + + + 4 + + @@ -53,7 +56,7 @@ - + @@ -62,6 +65,30 @@ + + + + Data Folder + + + + + + + Shows the directory where SleepyHead data will be stored. + + + + + + + Click here to choose where to store SleepyHead data. + + + ... + + + diff --git a/version.h b/version.h index 6bbd5821..01a665fb 100644 --- a/version.h +++ b/version.h @@ -6,7 +6,7 @@ const int major_version=0; const int minor_version=9; const int revision_number=2; -const int release_number=2; +const int release_number=3; const QString VersionString=QString().sprintf("%i.%i.%i",major_version,minor_version,revision_number); const QString FullVersionString=QString().sprintf("%i.%i.%i-%i",major_version,minor_version,revision_number,release_number);