mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-07 13:20:25 +00:00
Code Issues Projects Releases Wiki Activity

Add a hint about disabled resolution list in the Windowed Fullscreen mode

Browse Source
This commit is contained in:
Andrei Kortunov 2022-12-05 22:36:37 +04:00
parent 08f7554e38
commit 9e77654ab4
5 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwgui/settingswindow.cpp
View File

@ -267,6 +267,7 @@ namespace MWGui
getWidget(mWaterRainRippleDetail, "WaterRainRippleDetail"); getWidget(mWaterRainRippleDetail, "WaterRainRippleDetail");
getWidget(mPrimaryLanguage, "PrimaryLanguage"); getWidget(mPrimaryLanguage, "PrimaryLanguage");
getWidget(mSecondaryLanguage, "SecondaryLanguage"); getWidget(mSecondaryLanguage, "SecondaryLanguage");
getWidget(mWindowModeHint, "WindowModeHint");
getWidget(mLightingMethodButton, "LightingMethodButton"); getWidget(mLightingMethodButton, "LightingMethodButton");
getWidget(mLightsResetButton, "LightsResetButton"); getWidget(mLightsResetButton, "LightsResetButton");
getWidget(mMaxLights, "MaxLights"); getWidget(mMaxLights, "MaxLights");
@ -379,6 +380,8 @@ namespace MWGui
mWindowBorderButton->setEnabled( mWindowBorderButton->setEnabled(
windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen); windowMode != Settings::WindowMode::Fullscreen && windowMode != Settings::WindowMode::WindowedFullscreen);
mWindowModeHint->setVisible(windowMode == Settings::WindowMode::WindowedFullscreen);
mKeyboardSwitch->setStateSelected(true); mKeyboardSwitch->setStateSelected(true);
mControllerSwitch->setStateSelected(false); mControllerSwitch->setStateSelected(false);
@ -566,9 +569,15 @@ namespace MWGui
int index = static_cast<int>(_sender->getIndexSelected()); int index = static_cast<int>(_sender->getIndexSelected());
if (index == static_cast<size_t>(Settings::WindowMode::WindowedFullscreen)) if (index == static_cast<size_t>(Settings::WindowMode::WindowedFullscreen))
{
mResolutionList->setEnabled(false); mResolutionList->setEnabled(false);
mWindowModeHint->setVisible(true);
}
else else
{
mResolutionList->setEnabled(true); mResolutionList->setEnabled(true);
mWindowModeHint->setVisible(false);
}
if (index == static_cast<size_t>(Settings::WindowMode::Windowed)) if (index == static_cast<size_t>(Settings::WindowMode::Windowed))
mWindowBorderButton->setEnabled(true); mWindowBorderButton->setEnabled(true);

2
apps/openmw/mwgui/settingswindow.hpp
View File

@ -43,6 +43,8 @@ namespace MWGui
MyGUI::ComboBox* mPrimaryLanguage; MyGUI::ComboBox* mPrimaryLanguage;
MyGUI::ComboBox* mSecondaryLanguage; MyGUI::ComboBox* mSecondaryLanguage;
MyGUI::Widget* mWindowModeHint;
// controls // controls
MyGUI::ScrollView* mControlsBox; MyGUI::ScrollView* mControlsBox;
MyGUI::Button* mResetControlsButton; MyGUI::Button* mResetControlsButton;

1
files/data/l10n/SettingsMenu/en.yaml
View File

@ -62,5 +62,6 @@ WaterShaderTextureQuality: "Texture quality"
WindowBorder: "Window Border" WindowBorder: "Window Border"
WindowMode: "Window Mode" WindowMode: "Window Mode"
WindowModeFullscreen: "Fullscreen" WindowModeFullscreen: "Fullscreen"
WindowModeHint: "Hint: the Windowed Fullscreen mode\nalways uses a native screen resolution."
WindowModeWindowed: "Windowed" WindowModeWindowed: "Windowed"
WindowModeWindowedFullscreen: "Windowed Fullscreen" WindowModeWindowedFullscreen: "Windowed Fullscreen"

1
files/data/l10n/SettingsMenu/ru.yaml
View File

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

23
files/data/mygui/openmw_settings_window.layout
View File

@ -275,7 +275,7 @@
<Property key="ButtonAutoWidth" value="true"/> <Property key="ButtonAutoWidth" value="true"/>
<Widget type="TabItem"> <Widget type="TabItem">
<Property key="Caption" value=" #{sVideo} "/> <Property key="Caption" value=" #{sVideo} "/>
<Widget type="ListBox" skin="MW_List" position="0 4 185 215" align="Left Top" name="ResolutionList"/> <Widget type="ListBox" skin="MW_List" position="0 4 185 225" align="Left Top" name="ResolutionList"/>
<Widget type="TextBox" skin="NormalText" position="197 4 185 18" align="Left Top"> <Widget type="TextBox" skin="NormalText" position="197 4 185 18" align="Left Top">
<Property key="Caption" value="#{SettingsMenu:WindowMode}"/> <Property key="Caption" value="#{SettingsMenu:WindowMode}"/>
</Widget> </Widget>
@ -323,10 +323,13 @@
<Widget type="AutoSizedTextBox" skin="SandText" position="197 154 300 32" align="Left Top"> <Widget type="AutoSizedTextBox" skin="SandText" position="197 154 300 32" align="Left Top">
<Property key="Caption" value="#{SettingsMenu:FrameRateHint}"/> <Property key="Caption" value="#{SettingsMenu:FrameRateHint}"/>
</Widget> </Widget>
<Widget type="AutoSizedTextBox" skin="SandText" position="197 196 300 32" align="Left Top" name="WindowModeHint">
<Widget type="TextBox" skin="NormalText" position="0 228 352 18" align="Left Top" name="FovText"> <Property key="Caption" value="#{SettingsMenu:WindowModeHint}"/>
</Widget> </Widget>
<Widget type="ScrollBar" skin="MW_HScroll" position="0 252 352 18" align="HStretch Top">
<Widget type="TextBox" skin="NormalText" position="0 238 352 18" align="Left Top" name="FovText">
</Widget>
<Widget type="ScrollBar" skin="MW_HScroll" position="0 262 352 18" align="HStretch Top">
<Property key="Range" value="81"/> <Property key="Range" value="81"/>
<Property key="Page" value="1"/> <Property key="Page" value="1"/>
<UserString key="SettingType" value="Slider"/> <UserString key="SettingType" value="Slider"/>
@ -338,18 +341,18 @@
<UserString key="SettingLabelWidget" value="FovText"/> <UserString key="SettingLabelWidget" value="FovText"/>
<UserString key="SettingLabelCaption" value="#{SettingsMenu:FieldOfView} (%s)"/> <UserString key="SettingLabelCaption" value="#{SettingsMenu:FieldOfView} (%s)"/>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="0 276 352 18" align="Left Top"> <Widget type="TextBox" skin="SandText" position="0 286 352 18" align="Left Top">
<Property key="Caption" value="#{sLow}"/> <Property key="Caption" value="#{sLow}"/>
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="0 276 352 18" align="Right Top"> <Widget type="TextBox" skin="SandText" position="0 286 352 18" align="Right Top">
<Property key="Caption" value="#{sHigh}"/> <Property key="Caption" value="#{sHigh}"/>
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
</Widget> </Widget>
<Widget type="TextBox" skin="NormalText" position="0 298 352 18" align="Left Top" name="GammaText"> <Widget type="TextBox" skin="NormalText" position="0 308 352 18" align="Left Top" name="GammaText">
<Property key="Caption" value="#{sGamma_Correction}"/> <Property key="Caption" value="#{sGamma_Correction}"/>
</Widget> </Widget>
<Widget type="ScrollBar" skin="MW_HScroll" position="0 322 352 18" align="HStretch Top" name="GammaSlider"> <Widget type="ScrollBar" skin="MW_HScroll" position="0 332 352 18" align="HStretch Top" name="GammaSlider">
<Property key="Range" value="10000"/> <Property key="Range" value="10000"/>
<Property key="Page" value="300"/> <Property key="Page" value="300"/>
<UserString key="SettingType" value="Slider"/> <UserString key="SettingType" value="Slider"/>
@ -359,11 +362,11 @@
<UserString key="SettingMin" value="0.1"/> <UserString key="SettingMin" value="0.1"/>
<UserString key="SettingMax" value="3.0"/> <UserString key="SettingMax" value="3.0"/>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="0 346 352 18" align="Left Top" name="GammaTextDark"> <Widget type="TextBox" skin="SandText" position="0 356 352 18" align="Left Top" name="GammaTextDark">
<Property key="Caption" value="#{sDark_Gamma}"/> <Property key="Caption" value="#{sDark_Gamma}"/>
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="0 346 352 18" align="Right Top" name="GammaTextLight"> <Widget type="TextBox" skin="SandText" position="0 356 352 18" align="Right Top" name="GammaTextLight">
<Property key="Caption" value="#{sLight_Gamma}"/> <Property key="Caption" value="#{sLight_Gamma}"/>
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
</Widget> </Widget>