mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-12-30 11:02:39 -06:00
qt/main: Better file-existence checking within OnMenuRecentFile() and UpdateUITheme()
This commit is contained in:
parent
5e658efdb8
commit
265e875e5b
1 changed files with 6 additions and 8 deletions
|
@ -1030,9 +1030,8 @@ void GMainWindow::OnMenuRecentFile() {
|
||||||
QAction* action = qobject_cast<QAction*>(sender());
|
QAction* action = qobject_cast<QAction*>(sender());
|
||||||
assert(action);
|
assert(action);
|
||||||
|
|
||||||
QString filename = action->data().toString();
|
const QString filename = action->data().toString();
|
||||||
QFileInfo file_info(filename);
|
if (QFileInfo::exists(filename)) {
|
||||||
if (file_info.exists()) {
|
|
||||||
BootGame(filename);
|
BootGame(filename);
|
||||||
} else {
|
} else {
|
||||||
// Display an error message and remove the file from the list.
|
// Display an error message and remove the file from the list.
|
||||||
|
@ -1402,15 +1401,14 @@ void GMainWindow::UpdateUITheme() {
|
||||||
QStringList theme_paths(default_theme_paths);
|
QStringList theme_paths(default_theme_paths);
|
||||||
if (UISettings::values.theme != UISettings::themes[0].second &&
|
if (UISettings::values.theme != UISettings::themes[0].second &&
|
||||||
!UISettings::values.theme.isEmpty()) {
|
!UISettings::values.theme.isEmpty()) {
|
||||||
QString theme_uri(":" + UISettings::values.theme + "/style.qss");
|
const QString theme_uri(":" + UISettings::values.theme + "/style.qss");
|
||||||
QFile f(theme_uri);
|
QFile f(theme_uri);
|
||||||
if (!f.exists()) {
|
if (f.open(QFile::ReadOnly | QFile::Text)) {
|
||||||
LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
|
|
||||||
} else {
|
|
||||||
f.open(QFile::ReadOnly | QFile::Text);
|
|
||||||
QTextStream ts(&f);
|
QTextStream ts(&f);
|
||||||
qApp->setStyleSheet(ts.readAll());
|
qApp->setStyleSheet(ts.readAll());
|
||||||
GMainWindow::setStyleSheet(ts.readAll());
|
GMainWindow::setStyleSheet(ts.readAll());
|
||||||
|
} else {
|
||||||
|
LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
|
||||||
}
|
}
|
||||||
theme_paths.append(QStringList{":/icons/default", ":/icons/" + UISettings::values.theme});
|
theme_paths.append(QStringList{":/icons/default", ":/icons/" + UISettings::values.theme});
|
||||||
QIcon::setThemeName(":/icons/" + UISettings::values.theme);
|
QIcon::setThemeName(":/icons/" + UISettings::values.theme);
|
||||||
|
|
Loading…
Reference in a new issue