ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Same macosx palette search logic added for palette editor window.

This commit is contained in:
mjbudd77 2021-06-26 00:24:57 -04:00
parent fa3b135a44
commit a2d08f62ec
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/drivers/Qt/PaletteEditor.cpp
View File

@ -326,15 +326,46 @@ void PaletteEditorDialog_t::openPaletteFileDialog(void)
urls << QUrl::fromLocalFile( d.absolutePath() ); urls << QUrl::fromLocalFile( d.absolutePath() );
iniPath = d.absolutePath().toStdString(); iniPath = d.absolutePath().toStdString();
} }
#ifdef __APPLE__
// Search for MacOSX DragNDrop Resources
d.setPath(QString(exePath) + "/../Resources/palettes");
//printf("Looking for: '%s'\n", d.path().toStdString().c_str());
if (d.exists())
{
urls << QUrl::fromLocalFile(d.absolutePath());
iniPath = d.absolutePath().toStdString();
}
#endif
} }
#ifdef WIN32 #ifdef WIN32
#else #else
d.setPath("/usr/share/fceux/palettes"); // Linux and MacOSX (homebrew) expect shared data folder to be relative to bin/fceux executable.
if (exePath[0] != 0)
if ( d.exists() )
{ {
urls << QUrl::fromLocalFile( d.absolutePath() ); d.setPath(QString(exePath) + "/../share/fceux/palettes");
}
else
{
d.setPath(QString("/usr/local/share/fceux/palettes"));
}
if (!d.exists())
{
d.setPath(QString("/usr/local/share/fceux/palettes"));
}
if (!d.exists())
{
d.setPath(QString("/usr/share/fceux/palettes"));
}
//printf("Looking for: '%s'\n", d.path().toStdString().c_str());
if (d.exists())
{
urls << QUrl::fromLocalFile(d.absolutePath());
iniPath = d.absolutePath().toStdString(); iniPath = d.absolutePath().toStdString();
} }
#endif #endif