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

Check Crostini mount points, and force name to OSCAR-test if not OSCAR

Browse Source
This commit is contained in:
Phil Olynyk 2020-08-25 21:09:53 -04:00
parent ce18739d14
commit d5778bafb6
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oscar/SleepLib/common.cpp
View File

@ -227,10 +227,13 @@ QString appResourcePath()
QStringList paths; QStringList paths;
// This one will be used if the Html and Translations folders // This one will be used if the Html and Translations folders
// are in the same folder as the OSCAR executable // are in the same folder as the OSCAR executable
paths.push_back( QCoreApplication::applicationDirPath() ); paths.append( QCoreApplication::applicationDirPath() );
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
paths.push_back( QString( "/usr/share/" ) + QCoreApplication::applicationName() ); QString appName = QCoreApplication::applicationName();
paths.push_back( QString( "/usr/local/share/" ) + QCoreApplication::applicationName() ); if (appName != QString("OSCAR"))
appName = QString("OSCAR-test");
paths.append( QString( "/usr/share/" ) + appName );
paths.append( QString( "/usr/local/share/" ) + appName );
#endif #endif
for (auto p = begin(paths); p != end(paths); ++p ) { for (auto p = begin(paths); p != end(paths); ++p ) {
QString fname = *p+QString("/Translations/oscar_qt_fr.qm"); QString fname = *p+QString("/Translations/oscar_qt_fr.qm");

14
oscar/mainwindow.cpp
View File

@ -832,10 +832,22 @@ QStringList getDriveList()
#endif #endif
if (storage.fileSystemType() == VFAT) { if (storage.fileSystemType() == VFAT) {
qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist"; qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist";
drivelist.push_back(storage.rootPath()); drivelist.append(storage.rootPath());
} }
} }
} }
#endif
#if defined(Q_OS_LINUX)
QString mntName("/mnt/chromeos/removeable");
QDir mnt(mntName);
if ( mnt.exists() ) {
qDebug() << "Checking Crostini removable folders";
QFileInfoList mntPts = mnt.entryInfoList();
foreach ( const auto dir, mntPts ) {
qDebug() << "Adding" << dir.filePath() << "to drivelist";
drivelist.append(dir.filePath() );
}
}
#endif #endif
return drivelist; return drivelist;
} }