Merge branch 'launcher_resolutions' into 'master'

Do not allow to select a screen resolution in the Windowed Fullscreen mode in the launcher

See merge request OpenMW/openmw!4765

apps/launcher/graphicspage.cpp

@@ -242,11 +242,36 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
 {
     if (mode == Settings::WindowMode::Fullscreen || mode == Settings::WindowMode::WindowedFullscreen)
     {
+        QString customSizeMessage = tr("Custom window size is available only in Windowed mode.");
+        QString windowBorderMessage = tr("Window border is available only in Windowed mode.");
+
         standardRadioButton->toggle();
         customRadioButton->setEnabled(false);
         customWidthSpinBox->setEnabled(false);
         customHeightSpinBox->setEnabled(false);
         windowBorderCheckBox->setEnabled(false);
+        windowBorderCheckBox->setToolTip(windowBorderMessage);
+        customWidthSpinBox->setToolTip(customSizeMessage);
+        customHeightSpinBox->setToolTip(customSizeMessage);
+        customRadioButton->setToolTip(customSizeMessage);
+    }
+
+    if (mode == Settings::WindowMode::Fullscreen)
+    {
+        resolutionComboBox->setEnabled(true);
+        resolutionComboBox->setToolTip("");
+        standardRadioButton->setToolTip("");
+    }
+    else if (mode == Settings::WindowMode::WindowedFullscreen)
+    {
+        QString fullScreenMessage = tr("Windowed Fullscreen mode always uses the native display resolution.");
+
+        resolutionComboBox->setEnabled(false);
+        resolutionComboBox->setToolTip(fullScreenMessage);
+        standardRadioButton->setToolTip(fullScreenMessage);
+
+        // Assume that a first item is a native screen resolution
+        resolutionComboBox->setCurrentIndex(0);
     }
     else
     {
@@ -254,6 +279,13 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode)
         customWidthSpinBox->setEnabled(true);
         customHeightSpinBox->setEnabled(true);
         windowBorderCheckBox->setEnabled(true);
+        resolutionComboBox->setEnabled(true);
+        resolutionComboBox->setToolTip("");
+        standardRadioButton->setToolTip("");
+        windowBorderCheckBox->setToolTip("");
+        customWidthSpinBox->setToolTip("");
+        customHeightSpinBox->setToolTip("");
+        customRadioButton->setToolTip("");
     }
 }
 

files/data/l10n/OMWEngine/ru.yaml

@@ -208,7 +208,7 @@ WaterShaderTextureQuality: "Качество текстуры воды"
 WindowBorder: "Рамка окна"
 WindowMode: "Режим окна"
 WindowModeFullscreen: "Полный экран"
-WindowModeHint: "Подсказка: режим Оконный без полей\nвсегда использует родное разрешение экрана."
+WindowModeHint: "Подсказка: режим \"Оконный без полей\"\nвсегда использует родное разрешение экрана."
 WindowModeWindowed: "Оконный"
 WindowModeWindowedFullscreen: "Оконный без полей"
 WobblyShores: "Колеблющиеся берега"

files/lang/launcher_de.ts

@@ -425,6 +425,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Custom window size is available only in Windowed mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Window border is available only in Windowed mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen mode always uses the native display resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Launcher::ImportPage</name>

files/lang/launcher_en.ts

@@ -425,6 +425,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Custom window size is available only in Windowed mode.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Window border is available only in Windowed mode.</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen mode always uses the native display resolution.</source>
+        <translation></translation>
+    </message>
 </context>
 <context>
     <name>Launcher::ImportPage</name>

files/lang/launcher_fr.ts

@@ -425,6 +425,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
     </message>
+    <message>
+        <source>Custom window size is available only in Windowed mode.</source>
+        <translation>La taille personalisée de fenêtre n&apos;est disponible qu&apos;en mode fenêtré.</translation>
+    </message>
+    <message>
+        <source>Window border is available only in Windowed mode.</source>
+        <translation>Les bordures de fenêtres ne sont disponibles qu&apos;en mode fenêtré.</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen mode always uses the native display resolution.</source>
+        <translation>Le mode &quot;Fenêtré plein écran&quot; utilise toujours la résolution native de l&apos;écran.</translation>
+    </message>
 </context>
 <context>
     <name>Launcher::ImportPage</name>

files/lang/launcher_ru.ts

@@ -427,6 +427,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Вызов SDL_GetDisplayMode завершился с ошибкой:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
     </message>
+    <message>
+        <source>Custom window size is available only in Windowed mode.</source>
+        <translation>Особый размер окна доступен только в оконном режиме.</translation>
+    </message>
+    <message>
+        <source>Window border is available only in Windowed mode.</source>
+        <translation>Рамка окна доступна только в оконном режиме.</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen mode always uses the native display resolution.</source>
+        <translation>Режим &quot;Оконный без полей&quot; всегда использует родное разрешение экрана.</translation>
+    </message>
 </context>
 <context>
     <name>Launcher::ImportPage</name>

files/lang/launcher_sv.ts

@@ -428,6 +428,18 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin
         <source>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode failed:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;SDL_GetDisplayMode misslyckades:&lt;/b&gt;&lt;br&gt;&lt;br&gt;</translation>
     </message>
+    <message>
+        <source>Custom window size is available only in Windowed mode.</source>
+        <translation>Anpassad fönsterstorlek finns endast tillgänglig i fönsterläge.</translation>
+    </message>
+    <message>
+        <source>Window border is available only in Windowed mode.</source>
+        <translation>Fönsterram finns endast tillgänglig i fönsterläge</translation>
+    </message>
+    <message>
+        <source>Windowed Fullscreen mode always uses the native display resolution.</source>
+        <translation>Helskärm i fönsterläge använder alltid skärmens nativa upplösning.</translation>
+    </message>
 </context>
 <context>
     <name>Launcher::ImportPage</name>