mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Added data folder selection ability on first run. Show data folder location in About window
This commit is contained in:
Mark Watkins
parent
a1a52b8625
commit
f031081521
@ -16,6 +16,7 @@ License: GPL
|
||||
#include <QDir>
|
||||
#include <QDesktopServices>
|
||||
#include <QDebug>
|
||||
#include <QSettings>
|
||||
#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;
|
||||
}
|
||||
|
||||
@ -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<QString,QVariant> 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<int,QString> p_codes;
|
||||
QString p_comment;
|
||||
|
||||
@ -1456,12 +1456,12 @@ void MainWindow::on_action_About_triggered()
|
||||
QString gitrev=QString(GIT_REVISION);
|
||||
if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev;
|
||||
|
||||
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3-%4 (%8)</h2>Build Date: %5 %6<br/>%7<hr>"
|
||||
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3-%4 (%8)</h2>Build Date: %5 %6<br/>%7<br/>Data Folder: %9<hr>"
|
||||
"Copyright ©2011 Mark Watkins (jedimark) <br> \n"
|
||||
"<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>"
|
||||
"This software is released under the GNU Public License <br>"
|
||||
"<i>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."
|
||||
"</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus);
|
||||
"</div></body></html>").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);
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QCryptographicHash>
|
||||
#include <QFileDialog>
|
||||
#include <QSettings>
|
||||
#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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -48,6 +48,8 @@ private slots:
|
||||
|
||||
void on_heightCombo_currentIndexChanged(int index);
|
||||
|
||||
void on_dataFolderButton_clicked();
|
||||
|
||||
private:
|
||||
Ui::NewProfile *ui;
|
||||
bool m_editMode;
|
||||
|
||||
@ -36,8 +36,11 @@
|
||||
<number>5</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<property name="spacing">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_28">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
@ -53,7 +56,7 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<item row="0" column="1" colspan="2">
|
||||
<widget class="QComboBox" name="languageCombo">
|
||||
<item>
|
||||
<property name="text">
|
||||
@ -62,6 +65,30 @@
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Data Folder</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="dataFolderPath">
|
||||
<property name="toolTip">
|
||||
<string>Shows the directory where SleepyHead data will be stored. </string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QToolButton" name="dataFolderButton">
|
||||
<property name="toolTip">
|
||||
<string>Click here to choose where to store SleepyHead data.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user