From 7685de1d50845668adfe6736ea8de96f104d0dc9 Mon Sep 17 00:00:00 2001
From: Lazaroth <lazze_1983@hotmail.com>
Date: Tue, 3 Feb 2015 08:13:29 +0100
Subject: [PATCH] MyGUI tweaks

Feedback / testing is needed on this.

Some small button location tweaks and more importantly, some changes to
bring consistency between the Potion maker screen (already in openmw),
Trading screen (already in openmw), Spellmaker screen, Travel screen and
Training screen. It's mainly the top bar I'm talking about and
resizability.

It is not 1:1 towards vanilla, but looks better (IMO) and again, creates
some consistency. This can probably be expanded to the remaining screens
such as Enchanting and Spell and perhaps even the save/load screen to
have OpenMW wide consistency.
---
 files/mygui/openmw_enchanting_dialog.layout   |  2 +-
 files/mygui/openmw_merchantrepair.layout      | 21 +++++++--------
 files/mygui/openmw_spell_buying_window.layout | 25 +++++++----------
 .../mygui/openmw_spellcreation_dialog.layout  |  5 ++--
 files/mygui/openmw_trade_window.layout        |  5 ++--
 files/mygui/openmw_trainingwindow.layout      | 20 ++++++--------
 files/mygui/openmw_travel_window.layout       | 27 +++++++++----------
 7 files changed, 45 insertions(+), 60 deletions(-)

diff --git a/files/mygui/openmw_enchanting_dialog.layout b/files/mygui/openmw_enchanting_dialog.layout
index 4fdb91602..ed62c8dc6 100644
--- a/files/mygui/openmw_enchanting_dialog.layout
+++ b/files/mygui/openmw_enchanting_dialog.layout
@@ -117,7 +117,7 @@
             </Widget>
         </Widget>
 
-        <Widget type="HBox" position="0 340 560 60">
+        <Widget type="HBox" position="0 340 558 60">
             <Property key="Padding" value="16"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" name="TypeButton">
diff --git a/files/mygui/openmw_merchantrepair.layout b/files/mygui/openmw_merchantrepair.layout
index 360f5f4f0..da7f37fe7 100644
--- a/files/mygui/openmw_merchantrepair.layout
+++ b/files/mygui/openmw_merchantrepair.layout
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 418 248" name="_Main">
+    <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 458 284" name="_Main">
         <Property key="Visible" value="false"/>
+        <Property key="Caption" value="#{sServiceRepairTitle}"/>
+        <Property key="MinSize" value="280 186"/>
 
-
-        <Widget type="TextBox" skin="SandText" position="8 18 418 24" align="Right Top">
+        <Widget type="TextBox" skin="SandText" position="8 8 418 24" align="Left Top">
             <Property key="TextAlign" value="Left"/>
             <Property key="Caption" value="#{sRepairServiceTitle}"/>
         </Widget>
-        <Widget type="TextBox" skin="NormalText" position="0 0 418 24" align="Right Top">
-            <Property key="TextAlign" value="Center"/>
-            <Property key="Caption" value="#{sServiceRepairTitle}"/>
-        </Widget>
 
-        <Widget type="Widget" skin="MW_Box" position="10 46 389 156" align="Left Stretch">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 381 147" align="Left Top Stretch" name="RepairView">
-                <Property key="CanvasAlign" value="Left"/>
+        <Widget type="Widget" skin="MW_Box" position="8 31 426 177" align="Left Stretch">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 419 169" align="Left Top Stretch" name="RepairView">
+                <Property key="CanvasAlign" value="Left Top"/>
             </Widget>
         </Widget>
 
-        <Widget type="TextBox" skin="SandText" position="10 210 300 24" name="PlayerGold" align="Right Top">
+        <Widget type="TextBox" skin="SandText" position="8 212 200 24" name="PlayerGold" align="Left Bottom">
             <Property key="TextAlign" value="Left"/>
         </Widget>
-        <Widget type="AutoSizedButton" skin="MW_Button" position="343 210 60 24" name="OkButton" align="Right Top">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="373 216 60 24" name="OkButton" align="Right Bottom">
             <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="#{sOK}"/>
         </Widget>
diff --git a/files/mygui/openmw_spell_buying_window.layout b/files/mygui/openmw_spell_buying_window.layout
index b24a476c4..73820c3d4 100644
--- a/files/mygui/openmw_spell_buying_window.layout
+++ b/files/mygui/openmw_spell_buying_window.layout
@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 300" name="_Main">
+    <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 458 284" name="_Main">
         <Property key="Visible" value="false"/>
+        <Property key="Caption" value="#{sServiceSpellsTitle}"/>
+        <Property key="MinSize" value="280 186"/>
 
-
-        <Widget type="TextBox" skin="SandText" position="8 10 450 18" align="Right Top">
+        <Widget type="TextBox" skin="SandText" position="8 10 400 18" align="Left Top">
             <Property key="TextAlign" value="Left"/>
             <Property key="Caption" value="#{sSpellServiceTitle}"/>
         </Widget>
-        <Widget type="TextBox" skin="NormalText" position="0 0 450 18" align="Right Top">
-            <Property key="TextAlign" value="Center"/>
-            <Property key="Caption" value="#{sServiceSpellsTitle}"/>
-        </Widget>
-
 
-        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="SpellsView">
-                <Property key="CanvasAlign" value="Left"/>
+        <Widget type="Widget" skin="MW_Box" position="8 31 426 177" align="Left Top Stretch">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 419 169" align="Left Top Stretch" name="SpellsView">
+                <Property key="CanvasAlign" value="Left Top"/>
             </Widget>
         </Widget>
 
-
-        <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
-            <Property key="TextAlign" value="Right"/>
+        <Widget type="TextBox" skin="SandText" position="18 212 24 24" name="PlayerGold" align="Left Bottom">
+            <Property key="TextAlign" value="Left"/>
         </Widget>
-        <Widget type="AutoSizedButton" skin="MW_Button" position="375 260 60 24" name="CancelButton" align="Right Top">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="373 216 60 24" name="CancelButton" align="Right Bottom">
             <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="#{sOK}"/>
         </Widget>
diff --git a/files/mygui/openmw_spellcreation_dialog.layout b/files/mygui/openmw_spellcreation_dialog.layout
index fac0497db..90b95b2f4 100644
--- a/files/mygui/openmw_spellcreation_dialog.layout
+++ b/files/mygui/openmw_spellcreation_dialog.layout
@@ -70,7 +70,7 @@
             </Widget>
         </Widget>
 
-        <Widget type="HBox" position="0 340 560 60">
+        <Widget type="HBox" position="0 340 558 60">
             <Property key="Padding" value="16"/>
 
             <Widget type="Widget" position="0 0 0 0">
@@ -83,9 +83,8 @@
                 <UserString key="ToolTipLayout" value="TextToolTip"/>
                 <UserString key="Caption_Text" value="#{sSpellmakingHelp4}"/>
             </Widget>
-            <Widget type="AutoSizedTextBox" skin="SandText" name="PriceLabel">
-            </Widget>
 
+            <Widget type="AutoSizedTextBox" skin="SandText" name="PriceLabel"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" name="BuyButton">
                 <Property key="Caption" value="#{sBuy}"/>
diff --git a/files/mygui/openmw_trade_window.layout b/files/mygui/openmw_trade_window.layout
index b2017661b..8668243cc 100644
--- a/files/mygui/openmw_trade_window.layout
+++ b/files/mygui/openmw_trade_window.layout
@@ -29,10 +29,10 @@
         </Widget>
 
         <Widget type="Widget" skin="" position="8 231 566 92" name="BottomPane" align="Left Bottom HStretch">
-            <Widget type="TextBox" skin="SandText" position="192 0 374 24" name="PlayerGold" align="Left Top HStretch">
+            <Widget type="TextBox" skin="SandText" position="192 0 375 24" name="PlayerGold" align="Left Top HStretch">
                 <Property key="TextAlign" value="Right"/>
             </Widget>
-            <Widget type="TextBox" skin="SandText" position="192 28 374 24" name="MerchantGold" align="Left Top HStretch">
+            <Widget type="TextBox" skin="SandText" position="192 28 375 24" name="MerchantGold" align="Left Top HStretch">
                 <Property key="TextAlign" value="Right"/>
             </Widget>
 
@@ -63,6 +63,7 @@
             <Widget type="AutoSizedButton" skin="MW_Button" position="0 60 60 24" name="MaxSaleButton" align="Left Top">
                 <Property key="Caption" value="Max. Sale"/> <!-- GMST sMaxSale doesn't work -->
             </Widget>
+
         </Widget>
 
     </Widget>
diff --git a/files/mygui/openmw_trainingwindow.layout b/files/mygui/openmw_trainingwindow.layout
index c58bd0ab3..d6cea8727 100644
--- a/files/mygui/openmw_trainingwindow.layout
+++ b/files/mygui/openmw_trainingwindow.layout
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 319 200" name="_Main">
+    <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 458 284" name="_Main">
+        <Property key="Visible" value="false"/>
+        <Property key="Caption" value="#{sServiceTrainingTitle}"/>
+        <Property key="MinSize" value="280 186"/>
 
-        <Widget type="TextBox" skin="NormalText" position="0 5 319 24" name="Select" align="Right Top">
-            <Property key="TextAlign" value="Center"/>
-            <Property key="Caption" value="#{sServiceTrainingTitle}"/>
-        </Widget>
-        <Widget type="TextBox" skin="SandText" position="5 30 319 24" name="Travel" align="Right Top">
+        <Widget type="TextBox" skin="SandText" position="8 8 330 24" name="Travel" align="Right Top">
             <Property key="TextAlign" value="Left"/>
             <Property key="Caption" value="#{sTrainingServiceTitle}"/>
         </Widget>
 
+        <Widget type="Widget" skin="MW_Box" position="8 31 426 177" align="Left Top Stretch" name="TrainingOptions"/>
 
-        <Widget type="Widget" skin="MW_Box" position="6 54 299 100" align="Left Top" name="TrainingOptions">
-        </Widget>
-
-
-        <Widget type="TextBox" skin="SandText" position="8 161 200 24" name="PlayerGold" align="Right Top">
+        <Widget type="TextBox" skin="SandText" position="8 212 200 24" name="PlayerGold" align="Left Bottom">
             <Property key="TextAlign" value="Left"/>
         </Widget>
-        <Widget type="AutoSizedButton" skin="MW_Button" position="244 161 60 24" name="CancelButton" align="Right Top">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="373 216 60 24" name="CancelButton" align="Right Bottom">
             <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="#{sCancel}"/>
         </Widget>
diff --git a/files/mygui/openmw_travel_window.layout b/files/mygui/openmw_travel_window.layout
index 30b470e08..4b383ee7c 100644
--- a/files/mygui/openmw_travel_window.layout
+++ b/files/mygui/openmw_travel_window.layout
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 300" name="_Main">
+    <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 458 284" name="_Main">
         <Property key="Visible" value="false"/>
+        <Property key="Caption" value="#{sServiceTravelTitle}"/>
+        <Property key="MinSize" value="280 186"/>
 
-
-        <Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top">
-            <Property key="TextAlign" value="Right"/>
+        <Widget type="TextBox" skin="SandText" position="8 10 400 18" name="Select" align="Left Top">
+            <Property key="TextAlign" value="Left"/>
             <Property key="Caption" value="#{sTravelServiceTitle}"/>
         </Widget>
-        <Widget type="TextBox" skin="SandText" position="0 0 24 24" name="Travel" align="Right Top">
-            <Property key="TextAlign" value="Right"/>
-            <Property key="Caption" value="#D8C09A#{sServiceTravelTitle}"/>
-        </Widget>
 
+        <Widget type="TextBox" skin="SandText" position="0 0 24 24" name="Travel" align="Right Top"/>
 
-        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="DestinationsView">
-                <Property key="CanvasAlign" value="Left"/>
+        <Widget type="Widget" skin="MW_Box" position="8 31 426 177" align="Left Stretch">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 419 169" align="Left Top Stretch" name="DestinationsView">
+                <Property key="CanvasAlign" value="Left Top"/>
             </Widget>
         </Widget>
 
-
-        <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
-            <Property key="TextAlign" value="Right"/>
+        <Widget type="TextBox" skin="SandText" position="18 212 24 24" name="PlayerGold" align="Left Bottom">
+            <Property key="TextAlign" value="Left"/>
         </Widget>
-        <Widget type="AutoSizedButton" skin="MW_Button" position="375 260 60 24" name="CancelButton" align="Right Top">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="373 216 60 24" name="CancelButton" align="Right Bottom">
             <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="#{sCancel}"/>
         </Widget>