chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change Settings/AppRoot to Settings/AppData to reduce confusion between execuable path and data folder path

Browse Source
This commit is contained in:
Phil Olynyk 2019-03-25 19:43:04 -04:00
parent 691ff40d48
commit 9c3091b1c0
7 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/SleepLib/common.cpp
View File

@ -51,19 +51,25 @@ const QString getDeveloperName()
const QString getAppName() const QString getAppName()
{ {
QString name = STR_AppName; QString name = STR_AppName;
if ((GIT_BRANCH != "master") || (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) { if ((GIT_BRANCH != "master") ||
(!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
(ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) ||
(ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
name += "-"+GIT_BRANCH; name += "-"+GIT_BRANCH;
} }
return name; return name;
} }
const QString getDefaultAppRoot() const QString getModifiedAppData()
{ {
QString approot = STR_AppRoot; QString appdata = STR_AppData;
if ((GIT_BRANCH != "master") || (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) || (ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) { if ((GIT_BRANCH != "master") ||
approot += "-"+GIT_BRANCH; (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
(ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) ||
(ReleaseStatus.compare("beta", Qt::CaseInsensitive)==0)))) {
appdata += "-"+GIT_BRANCH;
} }
return approot; return appdata;
} }
bool gfxEgnineIsSupported(GFXEngine e) bool gfxEgnineIsSupported(GFXEngine e)

4
oscar/SleepLib/common.h
View File

@ -134,7 +134,7 @@ const QString STR_TestBuild = "";
const QString getAppName(); const QString getAppName();
const QString getDeveloperName(); const QString getDeveloperName();
const QString getDefaultAppRoot(); const QString getModifiedAppData();
void initializeStrings(); void initializeStrings();
@ -166,7 +166,7 @@ const QString STR_PREF_Language = "Language";
const QString STR_AppName = "OSCAR"; const QString STR_AppName = "OSCAR";
const QString STR_DeveloperName = "NightOwl"; const QString STR_DeveloperName = "NightOwl";
const QString STR_AppRoot = "OSCAR_Data"; const QString STR_AppData = "OSCAR_Data";
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
// Commonly used translatable text strings // Commonly used translatable text strings

22
oscar/SleepLib/preferences.cpp
View File

@ -59,24 +59,24 @@ const QString &getUserName()
} }
QString GetAppRoot() QString GetAppData()
{ {
QSettings settings; QSettings settings;
QString HomeAppRoot = settings.value("Settings/AppRoot").toString(); QString HomeAppData = settings.value("Settings/AppData").toString();
if (HomeAppRoot.isEmpty()) { if (HomeAppData.isEmpty()) {
HomeAppRoot = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/"+getDefaultAppRoot(); HomeAppData = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/"+getModifiedAppData();
} }
return HomeAppRoot; return HomeAppData;
} }
Preferences::Preferences() Preferences::Preferences()
{ {
p_name = "Preferences"; p_name = "Preferences";
p_path = GetAppRoot(); p_path = GetAppData();
} }
Preferences::Preferences(QString name, QString filename) Preferences::Preferences(QString name, QString filename)
@ -88,10 +88,10 @@ Preferences::Preferences(QString name, QString filename)
} }
if (filename.isEmpty()) { if (filename.isEmpty()) {
p_filename = GetAppRoot() + "/" + p_name + STR_ext_XML; p_filename = GetAppData() + "/" + p_name + STR_ext_XML;
} else { } else {
if (!filename.contains("/")) { if (!filename.contains("/")) {
p_filename = GetAppRoot() + "/"; p_filename = GetAppData() + "/";
} else { p_filename = ""; } } else { p_filename = ""; }
p_filename += filename; p_filename += filename;
@ -147,7 +147,7 @@ const QString Preferences::Get(QString name)
ref = a.section(cbr, 0, 0); ref = a.section(cbr, 0, 0);
if (ref.toLower() == "home") { if (ref.toLower() == "home") {
temp += GetAppRoot(); temp += GetAppData();
} else if (ref.toLower() == "user") { } else if (ref.toLower() == "user") {
temp += getUserName(); temp += getUserName();
} else if (ref.toLower() == "sep") { // redundant in QT } else if (ref.toLower() == "sep") { // redundant in QT
@ -174,10 +174,10 @@ bool Preferences::Open(QString filename)
QDomDocument doc(p_name); QDomDocument doc(p_name);
QFile file(p_filename); QFile file(p_filename);
qDebug() << "Reading " << p_filename.toLocal8Bit().data(); qDebug() << "Opening " << p_filename.toLocal8Bit().data();
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qWarning() << "Could not open" << p_filename.toLocal8Bit().data(); qWarning() << "Could not open" << p_filename.toLocal8Bit().data() << " Error: " << file.error();
return false; return false;
} }

4
oscar/SleepLib/preferences.h
View File

@ -18,7 +18,7 @@
const QString STR_ext_XML = ".xml"; const QString STR_ext_XML = ".xml";
extern QString GetAppRoot(); //returns app root path plus trailing path separator. extern QString GetAppData(); //returns app data path plus trailing path separator.
inline QString PrefMacro(QString s) inline QString PrefMacro(QString s)
{ {
@ -130,7 +130,7 @@ class Preferences
}; };
//! \brief Main Preferences Object used throughout the application //! \brief Main Preferences Object used throughout the application
extern Preferences PREF; // extern Preferences PREF;
// Parent class for subclasses that manipulate the profile. // Parent class for subclasses that manipulate the profile.
class PrefSettings class PrefSettings

2
oscar/aboutdialog.cpp
View File

@ -39,7 +39,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
// +tr("Graphics Engine: %1").arg(getGraphicsEngine()); // +tr("Graphics Engine: %1").arg(getGraphicsEngine());
// } // }
QString path = GetAppRoot(); QString path = GetAppData();
QString text = /* gitrev + */ "<br/><br/><a href=\"file:///"+path+"\">"+tr("Show data folder")+"</a>"; QString text = /* gitrev + */ "<br/><br/><a href=\"file:///"+path+"\">"+tr("Show data folder")+"</a>";
ui->infoLabel->setText(text); ui->infoLabel->setText(text);

2
oscar/daily.cpp
View File

@ -1569,7 +1569,7 @@ void Daily::Load(QDate date)
//sessbar->update(); //sessbar->update();
#ifdef DEBUG_DAILY_HTML #ifdef DEBUG_DAILY_HTML
QString name = GetAppRoot()+"/test.html"; QString name = GetAppData()+"/test.html";
QFile file(name); QFile file(name);
if (file.open(QFile::WriteOnly)) { if (file.open(QFile::WriteOnly)) {
const QByteArray & b = html.toLocal8Bit(); const QByteArray & b = html.toLocal8Bit();

6
oscar/profileselect.cpp
View File

@ -99,8 +99,8 @@ ProfileSelect::ProfileSelect(QWidget *parent) :
// if (GIT_BRANCH!="master") // if (GIT_BRANCH!="master")
// ui->labelBuild->setText(GIT_BRANCH); // ui->labelBuild->setText(GIT_BRANCH);
// else ui->labelBuild->setText(QString()); // else ui->labelBuild->setText(QString());
ui->labelFolder->setText(GetAppRoot()); ui->labelFolder->setText(GetAppData());
ui->labelFolder->setToolTip("Current OSCAR data folder\n" + GetAppRoot()); ui->labelFolder->setToolTip("Current OSCAR data folder\n" + GetAppData());
ui->listView->verticalScrollBar()->setStyleSheet("QScrollBar:vertical {border: 0px solid grey; background: transparent; }" ui->listView->verticalScrollBar()->setStyleSheet("QScrollBar:vertical {border: 0px solid grey; background: transparent; }"
"QScrollBar::handle:vertical {" "QScrollBar::handle:vertical {"
@ -208,7 +208,7 @@ void ProfileSelect::deleteProfile()
// if (!profile->Load()) { // if (!profile->Load()) {
// QMessageBox::warning(this, STR_MessageBox_Error, // QMessageBox::warning(this, STR_MessageBox_Error,
// QString(tr("Could not open profile.. You will need to delete this profile directory manually")+ // QString(tr("Could not open profile.. You will need to delete this profile directory manually")+
// "\n\n"+tr("You will find it under the following location:")+"\n\n%1").arg(QDir::toNativeSeparators(GetAppRoot() + "/Profiles/" + profile->user->userName())), QMessageBox::Ok); // "\n\n"+tr("You will find it under the following location:")+"\n\n%1").arg(QDir::toNativeSeparators(GetAppData() + "/Profiles/" + profile->user->userName())), QMessageBox::Ok);
// return; // return;
// } // }
bool reallydelete = false; bool reallydelete = false;