mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-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
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Fractorium/Fractorium.cpp
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
{

14
Source/apoconv/Form1.cs
View File

@ -540,16 +540,16 @@ namespace apoconv
foreach (var file in files)
{
var lines = File.ReadAllLines(file);
var lines = System.IO.File.ReadAllLines(file);
tb1lines.AddRange(lines.ToList());
final += Apo2Fractorium(lines, true);
/*
/*
var guid = Guid.NewGuid();
var fileonly = System.IO.Path.GetFileName(file);
final += "<Component Id=\"" + fileonly + "\" Guid=\"" + guid + "\">\n";
final += "\t<File Id=\"" + fileonly + "\" Source = \"$(var.SolutionDir)..\\..\\..\\Data\\" + fileonly + "\" KeyPath=\"yes\" Checksum=\"yes\" ReadOnly=\"yes\"/>\n";
final += "</Component>\n\n";
var guid = Guid.NewGuid();
var fileonly = System.IO.Path.GetFileName(file);
final += "<Component Id=\"" + fileonly + "\" Guid=\"" + guid + "\">\n";
final += "\t<File Id=\"" + fileonly + "\" Source = \"$(var.SolutionDir)..\\..\\..\\Data\\" + fileonly + "\" KeyPath=\"yes\" Checksum=\"yes\" ReadOnly=\"yes\"/>\n";
final += "</Component>\n\n";
*/
}