From 3690e05e40028159f4c7e5771e68c52f8ef2bf37 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 24 Oct 2024 18:54:39 -0700 Subject: [PATCH 1/4] Draft to hide scaling dropdown as needed --- CMakeLists.txt | 2 +- launcher/settingsView/csettingsview_moc.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78a4a7027..6305e3b26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ endif() option(ENABLE_CLIENT "Enable compilation of game client" ON) option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF) option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF) -option(ENABLE_TRANSLATIONS "Enable generation of translations for launcher and editor" ON) +option(ENABLE_TRANSLATIONS "Enable generation of translations for launcher and editor" OFF) option(ENABLE_NULLKILLER_AI "Enable compilation of Nullkiller AI library" ON) option(ENABLE_MINIMAL_LIB "Build only core parts of vcmi library that are required for game lobby" OFF) option(ENABLE_GOLDMASTER "Build in public release mode in which some debug routines are disabled" OFF) diff --git a/launcher/settingsView/csettingsview_moc.cpp b/launcher/settingsView/csettingsview_moc.cpp index 94ca8fc6c..214879cec 100644 --- a/launcher/settingsView/csettingsview_moc.cpp +++ b/launcher/settingsView/csettingsview_moc.cpp @@ -838,6 +838,11 @@ void CSettingsView::on_sliderScalingCursor_valueChanged(int value) void CSettingsView::on_buttonScalingAuto_toggled(bool checked) { + if (checked) + ui->spinBoxInterfaceScaling->hide(); + else + ui->spinBoxInterfaceScaling->show(); + ui->spinBoxInterfaceScaling->setDisabled(checked); ui->spinBoxInterfaceScaling->setValue(100); From 9bc84b606eb387a8d31c22ce532e0ebf4658b264 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 24 Oct 2024 19:28:21 -0700 Subject: [PATCH 2/4] Cleanup --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6305e3b26..78a4a7027 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ endif() option(ENABLE_CLIENT "Enable compilation of game client" ON) option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF) option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF) -option(ENABLE_TRANSLATIONS "Enable generation of translations for launcher and editor" OFF) +option(ENABLE_TRANSLATIONS "Enable generation of translations for launcher and editor" ON) option(ENABLE_NULLKILLER_AI "Enable compilation of Nullkiller AI library" ON) option(ENABLE_MINIMAL_LIB "Build only core parts of vcmi library that are required for game lobby" OFF) option(ENABLE_GOLDMASTER "Build in public release mode in which some debug routines are disabled" OFF) From 2480c4eae7c0a34abe848bd162df43bb487006b8 Mon Sep 17 00:00:00 2001 From: Mike Date: Fri, 25 Oct 2024 09:58:57 -0700 Subject: [PATCH 3/4] Minor update --- launcher/settingsView/csettingsview_moc.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/launcher/settingsView/csettingsview_moc.cpp b/launcher/settingsView/csettingsview_moc.cpp index 214879cec..c7cc2e1e1 100644 --- a/launcher/settingsView/csettingsview_moc.cpp +++ b/launcher/settingsView/csettingsview_moc.cpp @@ -839,13 +839,16 @@ void CSettingsView::on_sliderScalingCursor_valueChanged(int value) void CSettingsView::on_buttonScalingAuto_toggled(bool checked) { if (checked) + { ui->spinBoxInterfaceScaling->hide(); + } else + { ui->spinBoxInterfaceScaling->show(); - - ui->spinBoxInterfaceScaling->setDisabled(checked); - ui->spinBoxInterfaceScaling->setValue(100); - + ui->spinBoxInterfaceScaling->setDisabled(false); + ui->spinBoxInterfaceScaling->setValue(100); + } + Settings node = settings.write["video"]["resolution"]["scaling"]; node->Integer() = checked ? 0 : 100; } From 10b411aa689c652a8907ceda8aa080b4bb51b964 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sun, 27 Oct 2024 21:17:46 +0200 Subject: [PATCH 4/4] Update launcher/settingsView/csettingsview_moc.cpp --- launcher/settingsView/csettingsview_moc.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/launcher/settingsView/csettingsview_moc.cpp b/launcher/settingsView/csettingsview_moc.cpp index c7cc2e1e1..c6c136fbb 100644 --- a/launcher/settingsView/csettingsview_moc.cpp +++ b/launcher/settingsView/csettingsview_moc.cpp @@ -845,7 +845,6 @@ void CSettingsView::on_buttonScalingAuto_toggled(bool checked) else { ui->spinBoxInterfaceScaling->show(); - ui->spinBoxInterfaceScaling->setDisabled(false); ui->spinBoxInterfaceScaling->setValue(100); }