--Code changes

-Fix up .pro file for building with the new examples files.
 -Rename FlameExamples folder to Examples.
This commit is contained in:
Person
2020-03-08 23:37:27 -07:00
parent 8e8c8a3e7d
commit 61dd5e6eeb
11 changed files with 1605 additions and 1580 deletions

View File

@ -897,7 +897,16 @@ QStringList Fractorium::SetupOpenXmlDialog(bool openExamples)
if (openExamples)
{
m_OpenFileDialog->selectFile("*");
m_OpenFileDialog->setDirectory(QCoreApplication::applicationDirPath() + "/FlameExamples");
#ifndef _WIN32
if (QDir("/usr/share/fractorium/examples").exists())
m_OpenFileDialog->setDirectory("/usr/share/fractorium/examples");
else
m_OpenFileDialog->setDirectory(QCoreApplication::applicationDirPath() + "/examples");
#else
m_OpenFileDialog->setDirectory(QCoreApplication::applicationDirPath() + "/examples");
#endif
m_OpenFileDialog->selectNameFilter("flame (*.flame)");
}
else
@ -923,7 +932,7 @@ QStringList Fractorium::SetupOpenXmlDialog(bool openExamples)
if (openExamples)
{
defaultFilter = "flame (*.flame)";
filenames = QFileDialog::getOpenFileNames(this, tr("Open Flame"), QCoreApplication::applicationDirPath() + "/FlameExamples", tr("flame(*.flame)"), &defaultFilter);
filenames = QFileDialog::getOpenFileNames(this, tr("Open Flame"), QCoreApplication::applicationDirPath() + "/Examples", tr("flame(*.flame)"), &defaultFilter);
}
else
{