games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

don't list resolutions larger than the selected screen's in the launcher

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-09-26 16:58:27 +03:00
parent 6e6bf1e77b
commit 063f80fac3
3 changed files with 57 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
launcher/settingsView/csettingsview_moc.cpp
View File

@ -11,6 +11,8 @@
#include "csettingsview_moc.h"
#include "ui_csettingsview_moc.h"
#include "../jsonutils.h"
#include "../launcherdirs.h"
#include "../updatedialog_moc.h"
#include <QFileInfo>
@ -53,22 +55,19 @@ void CSettingsView::setDisplayList()
{
ui->comboBoxDisplayIndex->hide();
ui->labelDisplayIndex->hide();
fillValidResolutionsForScreen(0);
}
else
{
int displayIndex = settings["video"]["displayIndex"].Integer();
ui->comboBoxDisplayIndex->addItems(list);
// calls fillValidResolutions() in slot
ui->comboBoxDisplayIndex->setCurrentIndex(displayIndex);
}
}
void CSettingsView::loadSettings()
{
int resX = settings["video"]["screenRes"]["width"].Float();
int resY = settings["video"]["screenRes"]["height"].Float();
int resIndex = ui->comboBoxResolution->findText(QString("%1x%2").arg(resX).arg(resY));
ui->comboBoxResolution->setCurrentIndex(resIndex);
ui->comboBoxShowIntro->setCurrentIndex(settings["video"]["showIntro"].Bool());
#ifdef Q_OS_IOS
@ -107,6 +106,54 @@ void CSettingsView::loadSettings()
ui->comboBoxAutoSave->setCurrentIndex(settings["general"]["saveFrequency"].Integer() > 0 ? 1 : 0);
}
void CSettingsView::fillValidResolutionsForScreen(int screenIndex)
{
ui->comboBoxResolution->blockSignals(true); // avoid saving wrong resolution after adding first item from the list
ui->comboBoxResolution->clear();
// TODO: read available resolutions from all mods
const QLatin1String extrasResolutionsPath{"/vcmi-extras/Mods/extraResolutions/Content/config/resolutions.json"};
const auto extrasResolutionsJson = JsonUtils::JsonFromFile(CLauncherDirs::get().modsPath() + extrasResolutionsPath);
const auto resolutions = extrasResolutionsJson.toMap().value(QLatin1String{"GUISettings"}).toList();
if(resolutions.isEmpty())
{
ui->comboBoxResolution->blockSignals(false);
ui->comboBoxResolution->addItem(resolutionToString({800, 600}));
return;
}
const auto screens = qGuiApp->screens();
const auto currentScreen = screenIndex < screens.size() ? screens[screenIndex] : qGuiApp->primaryScreen();
const auto screenSize = currentScreen->size();
for(const auto & entry : resolutions)
{
const auto resolutionMap = entry.toMap().value(QLatin1String{"resolution"}).toMap();
if(resolutionMap.isEmpty())
continue;
const auto widthValue = resolutionMap[QLatin1String{"x"}];
const auto heightValue = resolutionMap[QLatin1String{"y"}];
if(!widthValue.isValid() || !heightValue.isValid())
continue;
const QSize resolution{widthValue.toInt(), heightValue.toInt()};
if(screenSize.width() < resolution.width() || screenSize.height() < resolution.height())
continue;
ui->comboBoxResolution->addItem(resolutionToString(resolution));
}
int resX = settings["video"]["screenRes"]["width"].Integer();
int resY = settings["video"]["screenRes"]["height"].Integer();
int resIndex = ui->comboBoxResolution->findText(resolutionToString({resX, resY}));
ui->comboBoxResolution->setCurrentIndex(resIndex);
ui->comboBoxResolution->blockSignals(false);
// if selected resolution no longer exists, force update value to the first resolution
if(resIndex == -1)
ui->comboBoxResolution->setCurrentIndex(0);
}
CSettingsView::CSettingsView(QWidget * parent)
: QWidget(parent), ui(new Ui::CSettingsView)
{
@ -152,6 +199,8 @@ void CSettingsView::on_comboBoxDisplayIndex_currentIndexChanged(int index)
{
Settings node = settings.write["video"];
node["displayIndex"].Float() = index;
fillValidResolutionsForScreen(index);
}
void CSettingsView::on_comboBoxPlayerAI_currentIndexChanged(const QString & arg1)

2
launcher/settingsView/csettingsview_moc.h
View File

@ -67,4 +67,6 @@ private slots:
private:
Ui::CSettingsView * ui;
void fillValidResolutionsForScreen(int screenIndex);
};

76
launcher/settingsView/csettingsview_moc.ui
View File

@ -333,81 +333,7 @@
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBoxResolution">
<property name="maxVisibleItems">
<number>11</number>
</property>
<item>
<property name="text">
<string>800x600</string>
</property>
</item>
<item>
<property name="text">
<string>1024x600</string>
</property>
</item>
<item>
<property name="text">
<string>1024x768</string>
</property>
</item>
<item>
<property name="text">
<string>1181x664</string>
</property>
</item>
<item>
<property name="text">
<string>1280x720</string>
</property>
</item>
<item>
<property name="text">
<string>1280x768</string>
</property>
</item>
<item>
<property name="text">
<string>1280x800</string>
</property>
</item>
<item>
<property name="text">
<string>1280x960</string>
</property>
</item>
<item>
<property name="text">
<string>1280x1024</string>
</property>
</item>
<item>
<property name="text">
<string>1366x768</string>
</property>
</item>
<item>
<property name="text">
<string>1440x900</string>
</property>
</item>
<item>
<property name="text">
<string>1600x1200</string>
</property>
</item>
<item>
<property name="text">
<string>1680x1050</string>
</property>
</item>
<item>
<property name="text">
<string>1920x1080</string>
</property>
</item>
</widget>
<widget class="QComboBox" name="comboBoxResolution"/>
</item>
<item row="11" column="1">
<widget class="QLabel" name="labelNeutralAI">