From 4fb30544d4b101437dc0411c57cc62afd0a9cb02 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 19 May 2012 16:00:00 +0200
Subject: [PATCH] more gui files cleanup

---
 apps/openmw/mwgui/container.cpp                |  3 ---
 apps/openmw/mwgui/dialogue.cpp                 |  1 -
 apps/openmw/mwgui/hud.cpp                      |  3 ---
 apps/openmw/mwgui/map_window.cpp               |  5 -----
 files/mygui/openmw_container_window_layout.xml |  8 ++++++--
 files/mygui/openmw_dialogue_window_layout.xml  |  2 +-
 files/mygui/openmw_hud_layout.xml              | 11 +++++++----
 files/mygui/openmw_map_window_layout.xml       |  4 +++-
 files/mygui/openmw_trade_window_layout.xml     |  2 +-
 9 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 5595825fc..be21987ef 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -603,9 +603,6 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dr
     mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onCloseButtonClicked);
     mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onTakeAllButtonClicked);
 
-    setText("CloseButton", MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sClose")->str);
-    setText("TakeButton", MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sTakeAll")->str);
-
     // adjust buttons size to fit text
     int closeButtonWidth = mCloseButton->getTextSize().width+24;
     int takeButtonWidth = mTakeButton->getTextSize().width+24;
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 9f5e252fd..53ab98aeb 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -69,7 +69,6 @@ DialogueWindow::DialogueWindow(WindowManager& parWindowManager)
     MyGUI::ButtonPtr byeButton;
     getWidget(byeButton, "ByeButton");
     byeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onByeClicked);
-    byeButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGoodbye")->str);
 
     getWidget(pDispositionBar, "Disposition");
     getWidget(pDispositionText,"DispositionText");
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 34d5ece98..4a65458df 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -77,9 +77,6 @@ HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
     getWidget(trianglecounter, "TriangleCounter");
     getWidget(batchcounter, "BatchCounter");
 
-    compass->setImageTexture("textures\\compass.dds");
-    crosshair->setImageTexture("textures\\target.dds");
-
     // These are just demo values, you should replace these with
     // real calls from outside the class later.
     setWeapIcon("icons\\w\\tx_knife_iron.dds");
diff --git a/apps/openmw/mwgui/map_window.cpp b/apps/openmw/mwgui/map_window.cpp
index 9000d2fcb..78ca70798 100644
--- a/apps/openmw/mwgui/map_window.cpp
+++ b/apps/openmw/mwgui/map_window.cpp
@@ -95,11 +95,6 @@ MapWindow::MapWindow(WindowManager& parWindowManager) :
     mGlobal(false)
 {
     setCoord(500,0,320,300);
-    setText("WorldButton", "World");
-    setImage("Compass", "textures\\compass.dds");
-
-    // Obviously you should override this later on
-    setCellName("No Cell Loaded");
 
     getWidget(mLocalMap, "LocalMap");
     getWidget(mGlobalMap, "GlobalMap");
diff --git a/files/mygui/openmw_container_window_layout.xml b/files/mygui/openmw_container_window_layout.xml
index cb66fadc1..ae9b0bfdf 100644
--- a/files/mygui/openmw_container_window_layout.xml
+++ b/files/mygui/openmw_container_window_layout.xml
@@ -12,8 +12,12 @@
         </Widget>
 
         <!-- buttons position adjusted at runtime to fit text -->
-        <Widget type="Button" skin="MW_Button" position="0 235 75 24" name="TakeButton" align="Right Bottom"/>
-        <Widget type="Button" skin="MW_Button" position="0 235 60 24" name="CloseButton" align="Right Bottom"/>
+        <Widget type="Button" skin="MW_Button" position="0 235 75 24" name="TakeButton" align="Right Bottom">
+            <Property key="Caption" value="#{sTakeAll}"/>
+        </Widget>
+        <Widget type="Button" skin="MW_Button" position="0 235 60 24" name="CloseButton" align="Right Bottom">
+            <Property key="Caption" value="#{sClose}"/>
+        </Widget>
 
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_dialogue_window_layout.xml b/files/mygui/openmw_dialogue_window_layout.xml
index d45de4bd4..1271a287b 100644
--- a/files/mygui/openmw_dialogue_window_layout.xml
+++ b/files/mygui/openmw_dialogue_window_layout.xml
@@ -24,7 +24,7 @@
 
         <!-- The Goodbye button -->
         <Widget type="Button" skin="MW_Button" position="432 366 132 23" name="ByeButton" align="Right Bottom">
-            <Property key="Caption" value="Goodbye"/>
+            <Property key="Caption" value="#{sGoodbye}"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_hud_layout.xml b/files/mygui/openmw_hud_layout.xml
index 2dafa7298..0c5ffba6a 100644
--- a/files/mygui/openmw_hud_layout.xml
+++ b/files/mygui/openmw_hud_layout.xml
@@ -62,7 +62,10 @@
 
                 <Widget type="ImageBox" skin="ImageBox" position="512 512 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1">
                     <Widget type="ImageBox" skin="ImageBox" position="0 0 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1_fog">
-                        <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="Left Bottom" name="Compass"/>
+                        <!-- Player arrow -->
+                        <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_BOTTOM ALIGN_LEFT" name="Compass">
+                            <Property key="ImageTexture" value="textures\compass.dds"/>
+                        </Widget>
                     </Widget>
                 </Widget>
 
@@ -85,9 +88,9 @@
         </Widget>
 
         <!-- Crosshair -->
-
-        <Widget type="ImageBox" skin="ImageBox" position="0 0 32
-            32" align="Center Center" name="Crosshair"/>
+        <Widget type="ImageBox" skin="ImageBox" position="0 0 32 32" align="Center Center" name="Crosshair">
+            <Property key="ImageTexture" value="textures\target.dds"/>
+        </Widget>
 
         <!-- Basic FPSCounter box -->
         <Widget type="Widget" skin="HUD_Box" position="12 12 28 21" align="Left Top"
diff --git a/files/mygui/openmw_map_window_layout.xml b/files/mygui/openmw_map_window_layout.xml
index fbba8ddf4..e0ae5bd88 100644
--- a/files/mygui/openmw_map_window_layout.xml
+++ b/files/mygui/openmw_map_window_layout.xml
@@ -31,7 +31,9 @@
             <Widget type="ImageBox" skin="ImageBox" position="512 512 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1">
                 <Widget type="ImageBox" skin="ImageBox" position="0 0 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1_fog">
                     <!-- Player arrow -->
-                    <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_TOP ALIGN_LEFT" name="Compass"/>
+                    <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_TOP ALIGN_LEFT" name="Compass">
+                        <Property key="ImageTexture" value="textures\compass.dds"/>
+                    </Widget>
                 </Widget>
             </Widget>
 
diff --git a/files/mygui/openmw_trade_window_layout.xml b/files/mygui/openmw_trade_window_layout.xml
index 83d7557d9..c8a9f2523 100644
--- a/files/mygui/openmw_trade_window_layout.xml
+++ b/files/mygui/openmw_trade_window_layout.xml
@@ -58,7 +58,7 @@
                 <Property key="Caption" value="#{sCancel}"/>
             </Widget>
             <Widget type="Button" skin="MW_Button" position="0 60 60 24" name="OfferButton" align="Right Top">
-                <Property key="Caption" value="#{sBarterDialog8"/>
+                <Property key="Caption" value="#{sBarterDialog8}"/>
             </Widget>
         </Widget>