diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index cb15eaf15..49f90d1a0 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -27,7 +27,6 @@ BirthDialog::BirthDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
- backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onBackClicked);
MyGUI::ButtonPtr okButton;
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index e654f7c90..3e41fa6b1 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -28,7 +28,6 @@ GenerateClassResultDialog::GenerateClassResultDialog(WindowManager& parWindowMan
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
- backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &GenerateClassResultDialog::onBackClicked);
MyGUI::ButtonPtr okButton;
@@ -111,7 +110,6 @@ PickClassDialog::PickClassDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PickClassDialog::onBackClicked);
- backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton");
@@ -432,7 +430,6 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onBackClicked);
- backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton");
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 275759c9f..f18bdb41f 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -71,7 +71,6 @@ RaceDialog::RaceDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
- backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onBackClicked);
MyGUI::ButtonPtr okButton;
diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp
index 81a87b07b..5059efb34 100644
--- a/apps/openmw/mwgui/review.cpp
+++ b/apps/openmw/mwgui/review.cpp
@@ -27,25 +27,21 @@ ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
ButtonPtr button;
getWidget(nameWidget, "NameText");
getWidget(button, "NameButton");
- button->setCaption(mWindowManager.getGameSettingString("sName", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onNameClicked);;
getWidget(raceWidget, "RaceText");
getWidget(button, "RaceButton");
- button->setCaption(mWindowManager.getGameSettingString("sRace", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onRaceClicked);;
getWidget(classWidget, "ClassText");
getWidget(button, "ClassButton");
- button->setCaption(mWindowManager.getGameSettingString("sClass", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onClassClicked);;
getWidget(birthSignWidget, "SignText");
getWidget(button, "SignButton");
- button->setCaption(mWindowManager.getGameSettingString("sBirthSign", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBirthSignClicked);;
@@ -92,7 +88,6 @@ ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
- backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBackClicked);
MyGUI::ButtonPtr okButton;
diff --git a/apps/openmw/mwgui/stats_window.cpp b/apps/openmw/mwgui/stats_window.cpp
index 30d63033b..06576b42b 100644
--- a/apps/openmw/mwgui/stats_window.cpp
+++ b/apps/openmw/mwgui/stats_window.cpp
@@ -49,12 +49,6 @@ StatsWindow::StatsWindow (WindowManager& parWindowManager)
{ "Attrib6", "sAttributeEndurance" },
{ "Attrib7", "sAttributePersonality" },
{ "Attrib8", "sAttributeLuck" },
- { "Health_str", "sHealth" },
- { "Magicka_str", "sMagic" },
- { "Fatigue_str", "sFatigue" },
- { "Level_str", "sLevel" },
- { "Race_str", "sRace" },
- { "Class_str", "sClass" },
{ 0, 0 }
};
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 2dcf7c7f8..3570ea6a3 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -41,12 +41,6 @@ namespace MWGui
getWidget(mTotalBalanceLabel, "TotalBalanceLabel");
getWidget(mBottomPane, "BottomPane");
- // this GMST doesn't seem to get retrieved - even though i can clearly see it in the CS !??!?
- mMaxSaleButton->setCaption(mWindowManager.getGameSettingString("sMaxSale", "Max. Sale"));
-
- mCancelButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sCancel")->str);
- mOfferButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sBarterDialog8")->str);
-
// adjust size of buttons to fit text
int curX = 0;
mFilterAll->setSize( mFilterAll->getTextSize().width + 24, mFilterAll->getSize().height );
diff --git a/files/mygui/openmw_chargen_birth_layout.xml b/files/mygui/openmw_chargen_birth_layout.xml
index bce3f585d..0599ab863 100644
--- a/files/mygui/openmw_chargen_birth_layout.xml
+++ b/files/mygui/openmw_chargen_birth_layout.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/files/mygui/openmw_chargen_class_layout.xml b/files/mygui/openmw_chargen_class_layout.xml
index bf49810c8..38fa606ab 100644
--- a/files/mygui/openmw_chargen_class_layout.xml
+++ b/files/mygui/openmw_chargen_class_layout.xml
@@ -55,7 +55,7 @@
-
+
diff --git a/files/mygui/openmw_chargen_create_class_layout.xml b/files/mygui/openmw_chargen_create_class_layout.xml
index 3b7d91b00..be6a10e0c 100644
--- a/files/mygui/openmw_chargen_create_class_layout.xml
+++ b/files/mygui/openmw_chargen_create_class_layout.xml
@@ -56,7 +56,7 @@
-
+
diff --git a/files/mygui/openmw_chargen_generate_class_result_layout.xml b/files/mygui/openmw_chargen_generate_class_result_layout.xml
index 26ebe17e1..9a6ed4f2e 100644
--- a/files/mygui/openmw_chargen_generate_class_result_layout.xml
+++ b/files/mygui/openmw_chargen_generate_class_result_layout.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/files/mygui/openmw_chargen_race_layout.xml b/files/mygui/openmw_chargen_race_layout.xml
index 6887b12c5..a9b072f5e 100644
--- a/files/mygui/openmw_chargen_race_layout.xml
+++ b/files/mygui/openmw_chargen_race_layout.xml
@@ -61,7 +61,7 @@
-
+
diff --git a/files/mygui/openmw_chargen_review_layout.xml b/files/mygui/openmw_chargen_review_layout.xml
index c713eb477..57bb3b124 100644
--- a/files/mygui/openmw_chargen_review_layout.xml
+++ b/files/mygui/openmw_chargen_review_layout.xml
@@ -5,10 +5,18 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,9 +25,15 @@
-
-
-
+
+
+
+
+
+
+
+
+
@@ -42,7 +56,7 @@
-
+
diff --git a/files/mygui/openmw_inventory_window_layout.xml b/files/mygui/openmw_inventory_window_layout.xml
index 86ef65324..b38e15fc7 100644
--- a/files/mygui/openmw_inventory_window_layout.xml
+++ b/files/mygui/openmw_inventory_window_layout.xml
@@ -7,11 +7,7 @@
-
-
-
-
-
+
diff --git a/files/mygui/openmw_stats_window_layout.xml b/files/mygui/openmw_stats_window_layout.xml
index 9406fe6bd..8b6080227 100644
--- a/files/mygui/openmw_stats_window_layout.xml
+++ b/files/mygui/openmw_stats_window_layout.xml
@@ -7,9 +7,15 @@
-
-
-
+
+
+
+
+
+
+
+
+
@@ -20,9 +26,15 @@
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/files/mygui/openmw_trade_window_layout.xml b/files/mygui/openmw_trade_window_layout.xml
index 8a4e00433..83d7557d9 100644
--- a/files/mygui/openmw_trade_window_layout.xml
+++ b/files/mygui/openmw_trade_window_layout.xml
@@ -51,9 +51,15 @@
-
-
-
+
+
+
+
+
+
+
+
+