mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 22:40:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'post_ui' into 'master'

Browse source 
Improve postprocess HUD layout

See merge request OpenMW/openmw!2505
This commit is contained in:
psi29a 2022-11-10 22:36:04 +00:00
commit 518bd03547
8 changed files with 89 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwgui/postprocessorhud.cpp
View file

@ -42,7 +42,6 @@ namespace MWGui
PostProcessorHud::PostProcessorHud() PostProcessorHud::PostProcessorHud()
: WindowBase("openmw_postprocessor_hud.layout") : WindowBase("openmw_postprocessor_hud.layout")
{ {
getWidget(mTabConfiguration, "TabConfiguration");
getWidget(mActiveList, "ActiveList"); getWidget(mActiveList, "ActiveList");
getWidget(mInactiveList, "InactiveList"); getWidget(mInactiveList, "InactiveList");
getWidget(mConfigLayout, "ConfigLayout"); getWidget(mConfigLayout, "ConfigLayout");

2
apps/openmw/mwgui/postprocessorhud.hpp
View file

@ -80,8 +80,6 @@ namespace MWGui
void layout(); void layout();
MyGUI::TabItem* mTabConfiguration;
ListWrapper* mActiveList; ListWrapper* mActiveList;
ListWrapper* mInactiveList; ListWrapper* mInactiveList;

1
files/data/l10n/PostProcessing/de.yaml
View file

@ -1,6 +1,5 @@
Abovewater: "Überwasser" Abovewater: "Überwasser"
Author: "Autor" Author: "Autor"
Configuration: "Konfiguration"
Description: "Beschreibung" Description: "Beschreibung"
InExteriors: "Außenbereich" InExteriors: "Außenbereich"
InInteriors: "Innenbereich" InInteriors: "Innenbereich"

3
files/data/l10n/PostProcessing/en.yaml
View file

@ -1,7 +1,8 @@
Abovewater: "Abovewater" Abovewater: "Abovewater"
ActiveShaders: "Active Shaders"
Author: "Author" Author: "Author"
Configuration: "Configuration"
Description: "Description" Description: "Description"
InactiveShaders: "Inactive Shaders"
InExteriors: "Exteriors" InExteriors: "Exteriors"
InInteriors: "Interiors" InInteriors: "Interiors"
KeyboardControls: | KeyboardControls: |

1
files/data/l10n/PostProcessing/fr.yaml
View file

@ -1,6 +1,5 @@
Abovewater: "Hors de l'eau" Abovewater: "Hors de l'eau"
Author: "Auteur(e)" Author: "Auteur(e)"
Configuration: "Configuration"
Description: "Description" Description: "Description"
InExteriors: "À l'extérieur" InExteriors: "À l'extérieur"
InInteriors: "En intérieur" InInteriors: "En intérieur"

3
files/data/l10n/PostProcessing/ru.yaml
View file

@ -1,7 +1,8 @@
Abovewater: "Над водой" Abovewater: "Над водой"
ActiveShaders: "Включенные шейдеры"
Author: "Автор" Author: "Автор"
Configuration: "Настройки"
Description: "Описание" Description: "Описание"
InactiveShaders: "Выключенные шейдеры"
InExteriors: "Вне помещений" InExteriors: "Вне помещений"
InInteriors: "В помещениях" InInteriors: "В помещениях"
KeyboardControls: | KeyboardControls: |

1
files/data/l10n/PostProcessing/sv.yaml
View file

@ -1,6 +1,5 @@
Abovewater: "Ovan vatten" Abovewater: "Ovan vatten"
Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok? Author: "Skapare" # Author = Författare, but författare sounds very book-author-ish. Skapare, meaning "creator", sounds better in Swedish in this case. Ok?
Configuration: "Konfiguration"
Description: "Beskrivning" Description: "Beskrivning"
InExteriors: "Exteriörer" InExteriors: "Exteriörer"
InInteriors: "Interiörer" InInteriors: "Interiörer"

164
files/data/mygui/openmw_postprocessor_hud.layout
View file

@ -3,102 +3,108 @@
<Widget type="Window" skin="MW_Window" position="0 0 500 500" layer="Debug" name="_Main" align="Stretch"> <Widget type="Window" skin="MW_Window" position="0 0 500 500" layer="Debug" name="_Main" align="Stretch">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Property key="Caption" value="#{PostProcessing:PostProcessHUD}"/> <Property key="Caption" value="#{PostProcessing:PostProcessHUD}"/>
<Property key="MinSize" value="600 600"/> <Property key="MinSize" value="600 600"/>
<Widget type="TabControl" skin="TabControl_NoBorder" position="8 8 468 450" align="Stretch" name="TabControl"> <Widget type="TabControl" skin="TabControl_NoBorder" position="8 8 468 450" align="Stretch" name="TabControl">
<Property key="ButtonAutoWidth" value="true"/> <Property key="ButtonAutoWidth" value="true"/>
<Widget type="AutoSizedTextBox" skin="NormalText" position="440 8 50 50" align="Top Right"> <Widget type="AutoSizedTextBox" skin="NormalText" position="440 8 50 50" align="Top Right">
<Property key="Caption" value="[?]"/> <Property key="Caption" value="[?]"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
<UserString key="ToolTipLayout" value="TextToolTip"/> <UserString key="ToolTipLayout" value="TextToolTip"/>
<UserString key="Caption_Text" value="#{PostProcessing:KeyboardControls}"/> <UserString key="Caption_Text" value="#{PostProcessing:KeyboardControls}"/>
</Widget> <Property key="Depth" value="-10"/>
</Widget>
<Widget type="TabItem" skin="" position_real="0 0 1 1" name="TabConfiguration"> <Widget type="VBox" position_real="0 0.02 1 0.98" align="Stretch" name="Layout">
<Property key="Caption" value="#{PostProcessing:Configuration}"/> <Property key="Padding" value="0"/>
<Property key="Spacing" value="8"/>
<Widget type="VBox" position_real="0 0.02 1 0.98" align="Stretch" name="Layout"> <Widget type="Widget" position ="0 0 0 300">
<Property key="Padding" value="0"/> <UserString key="HStretch" value="true"/>
<Property key="Spacing" value="8"/> <UserString key="VStretch" value="false"/>
<Widget type="Widget" position ="0 0 0 300"> <Widget type="HBox" position_real="0 0 1 1" align="Stretch">
<UserString key="HStretch" value="true"/> <UserString key="VStretch" value="true"/>
<UserString key="VStretch" value="false"/> <UserString key="HStretch" value="true"/>
<Widget type="HBox" position_real="0 0 1 1" align="Stretch"> <Widget type="Widget">
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<Widget type="Widget"> <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
<UserString key="VStretch" value="true"/> <Widget type="AutoSizedTextBox" skin="NormalText" position="0 0 50 50" align="Top Right">
<UserString key="HStretch" value="true"/> <Property key="Caption" value="#{PostProcessing:InactiveShaders}"/>
</Widget>
<Widget type="VBox" position_real="0 0 1 1" align="Stretch"> <Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 28" name="Filter">
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 28" name="Filter"> <UserString key="HStretch" value="true"/>
<UserString key="HStretch" value="true"/> <UserString key="AcceptTab" value="true"/>
<UserString key="AcceptTab" value="true"/> <Property key="TextAlign" value="Left VCenter"/>
<Property key="TextAlign" value="Left VCenter"/> </Widget>
</Widget> <Widget type="ListWrapper" skin="MW_List" name="InactiveList">
<Widget type="ListWrapper" skin="MW_List" name="InactiveList"> <UserString key="VStretch" value="true"/>
<UserString key="VStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="HStretch" value="true"/> </Widget>
</Widget> </Widget>
</Widget> </Widget>
</Widget>
<Widget type="VBox" position_real="0 0 1 1"> <Widget type="VBox" position_real="0 0 1 1">
<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonActivate"> <Widget type="AutoSizedButton" skin="MW_Button" name="ButtonActivate">
<Widget type="Widget" skin="MW_ArrowRight" position="0 0 12 12" align="Center"> <Widget type="Widget" skin="MW_ArrowRight" position="0 0 12 12" align="Center">
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonDeactivate"> <Widget type="AutoSizedButton" skin="MW_Button" name="ButtonDeactivate">
<Widget type="Widget" skin="MW_ArrowLeft" position="0 0 12 12" align="Center"> <Widget type="Widget" skin="MW_ArrowLeft" position="0 0 12 12" align="Center">
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="Widget" skin="" position="0 0 15 25"/> <Widget type="Widget" skin="" position="0 0 15 25"/>
<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonUp"> <Widget type="AutoSizedButton" skin="MW_Button" name="ButtonUp">
<Widget type="Widget" skin="MW_ArrowUp" position="0 0 12 12" align="Center"> <Widget type="Widget" skin="MW_ArrowUp" position="0 0 12 12" align="Center">
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="ButtonDown"> <Widget type="AutoSizedButton" skin="MW_Button" name="ButtonDown">
<Widget type="Widget" skin="MW_ArrowDown" position="0 0 12 12" align="Center"> <Widget type="Widget" skin="MW_ArrowDown" position="0 0 12 12" align="Center">
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
</Widget> </Widget>
</Widget>
<Widget type="Widget">
<UserString key="VStretch" value="true"/>
<UserString key="HStretch" value="true"/>
</Widget> <Widget type="VBox" position_real="0 0 1 1" align="Stretch">
<Widget type="AutoSizedTextBox" skin="NormalText" position="0 0 50 50" align="Top Right">
<Property key="Caption" value="#{PostProcessing:ActiveShaders}"/>
</Widget>
<Widget type="ListWrapper" skin="MW_List" name="ActiveList"> <Widget type="ListWrapper" skin="MW_List" name="ActiveList">
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
</Widget> </Widget>
</Widget>
</Widget>
</Widget>
</Widget>
</Widget> <Widget type="Widget" skin="MW_Box">
<UserString key="VStretch" value="true"/>
</Widget> <UserString key="HStretch" value="true"/>
<Widget type="Widget" skin="MW_Box">
<UserString key="VStretch" value="true"/>
<UserString key="HStretch" value="true"/>
<Widget type="VBox" position_real="0 0 1 1" align="Stretch">
<Property key="Padding" value="14"/>
<Widget type="ScrollView" skin="MW_ScrollView" position_real="0 0 1 1" align="Stretch" name="ConfigLayout">
<Property key="CanvasAlign" value="Left Top"/>
<Property key="NeedMouse" value="true"/>
<Property key="VisibleVScroll" value="true"/>
</Widget>
</Widget>
</Widget>
</Widget>
<Widget type="VBox" position_real="0 0 1 1" align="Stretch">
<Property key="Padding" value="14"/>
<Widget type="ScrollView" skin="MW_ScrollView" position_real="0 0 1 1" align="Stretch" name="ConfigLayout">
<Property key="CanvasAlign" value="Left Top"/>
<Property key="NeedMouse" value="true"/>
<Property key="VisibleVScroll" value="true"/>
</Widget>
</Widget>
</Widget>
</Widget> </Widget>
</Widget> </Widget>