diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 1e3caf7293..38b0446efc 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -240,23 +240,35 @@ void Launcher::GraphicsPage::slotFullScreenChanged(int mode) void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode) { - if (mode == Settings::WindowMode::Fullscreen) + 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) { - standardRadioButton->toggle(); - customRadioButton->setEnabled(false); - customWidthSpinBox->setEnabled(false); - customHeightSpinBox->setEnabled(false); - windowBorderCheckBox->setEnabled(false); + 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); @@ -268,6 +280,12 @@ void Launcher::GraphicsPage::handleWindowModeChange(Settings::WindowMode mode) customHeightSpinBox->setEnabled(true); windowBorderCheckBox->setEnabled(true); resolutionComboBox->setEnabled(true); + resolutionComboBox->setToolTip(""); + standardRadioButton->setToolTip(""); + windowBorderCheckBox->setToolTip(""); + customWidthSpinBox->setToolTip(""); + customHeightSpinBox->setToolTip(""); + customRadioButton->setToolTip(""); } } diff --git a/files/data/l10n/OMWEngine/ru.yaml b/files/data/l10n/OMWEngine/ru.yaml index c50fbac38e..753d1fa219 100644 --- a/files/data/l10n/OMWEngine/ru.yaml +++ b/files/data/l10n/OMWEngine/ru.yaml @@ -208,7 +208,7 @@ WaterShaderTextureQuality: "Качество текстуры воды" WindowBorder: "Рамка окна" WindowMode: "Режим окна" WindowModeFullscreen: "Полный экран" -WindowModeHint: "Подсказка: режим Оконный без полей\nвсегда использует родное разрешение экрана." +WindowModeHint: "Подсказка: режим \"Оконный без полей\"\nвсегда использует родное разрешение экрана." WindowModeWindowed: "Оконный" WindowModeWindowedFullscreen: "Оконный без полей" WobblyShores: "Колеблющиеся берега" diff --git a/files/lang/launcher_de.ts b/files/lang/launcher_de.ts index 86773e5a54..94437fb822 100644 --- a/files/lang/launcher_de.ts +++ b/files/lang/launcher_de.ts @@ -425,6 +425,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov <br><b>SDL_GetDisplayMode failed:</b><br><br> + + Custom window size is available only in Windowed mode. + + + + Window border is available only in Windowed mode. + + + + Windowed Fullscreen mode always uses the native display resolution. + + Launcher::ImportPage diff --git a/files/lang/launcher_en.ts b/files/lang/launcher_en.ts index a0319318e8..25717d1454 100644 --- a/files/lang/launcher_en.ts +++ b/files/lang/launcher_en.ts @@ -425,6 +425,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov <br><b>SDL_GetDisplayMode failed:</b><br><br> + + Custom window size is available only in Windowed mode. + + + + Window border is available only in Windowed mode. + + + + Windowed Fullscreen mode always uses the native display resolution. + + Launcher::ImportPage diff --git a/files/lang/launcher_fr.ts b/files/lang/launcher_fr.ts index 569a460cd0..5f8f020981 100644 --- a/files/lang/launcher_fr.ts +++ b/files/lang/launcher_fr.ts @@ -425,6 +425,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov <br><b>SDL_GetDisplayMode failed:</b><br><br> <br><b>SDL_GetDisplayMode failed:</b><br><br> + + Custom window size is available only in Windowed mode. + La taille personalisée de fenêtre n'est disponible qu'en mode fenêtré. + + + Window border is available only in Windowed mode. + Les bordures de fenêtres ne sont disponibles qu'en mode fenêtré. + + + Windowed Fullscreen mode always uses the native display resolution. + Le mode "Fenêtré plein écran" utilise toujours la résolution native de l'écran. + Launcher::ImportPage diff --git a/files/lang/launcher_ru.ts b/files/lang/launcher_ru.ts index 879f24dc76..bf0ea467b2 100644 --- a/files/lang/launcher_ru.ts +++ b/files/lang/launcher_ru.ts @@ -427,6 +427,18 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov <br><b>SDL_GetDisplayMode failed:</b><br><br> <br><b>Вызов SDL_GetDisplayMode завершился с ошибкой:</b><br><br> + + Custom window size is available only in Windowed mode. + Особый размер окна доступен только в оконном режиме. + + + Window border is available only in Windowed mode. + Рамка окна доступна только в оконном режиме. + + + Windowed Fullscreen mode always uses the native display resolution. + Режим "Оконный без полей" всегда использует родное разрешение экрана. + Launcher::ImportPage diff --git a/files/lang/launcher_sv.ts b/files/lang/launcher_sv.ts index f2cca2346c..97de9603d7 100644 --- a/files/lang/launcher_sv.ts +++ b/files/lang/launcher_sv.ts @@ -428,6 +428,18 @@ de ordinarie fonterna i Morrowind. Bocka denna ruta om du ändå föredrar ordin <br><b>SDL_GetDisplayMode failed:</b><br><br> <br><b>SDL_GetDisplayMode misslyckades:</b><br><br> + + Custom window size is available only in Windowed mode. + Anpassad fönsterstorlek finns endast tillgänglig i fönsterläge. + + + Window border is available only in Windowed mode. + Fönsterram finns endast tillgänglig i fönsterläge + + + Windowed Fullscreen mode always uses the native display resolution. + Helskärm i fönsterläge använder alltid skärmens nativa upplösning. + Launcher::ImportPage