rename layout files to .layout to get them recognized by layout editor

apps/openmw/mwgui/alchemywindow.cpp

@@ -27,7 +27,7 @@ namespace
 namespace MWGui
 {
     AlchemyWindow::AlchemyWindow(WindowManager& parWindowManager)
-        : WindowBase("openmw_alchemy_window_layout.xml", parWindowManager)
+        : WindowBase("openmw_alchemy_window.layout", parWindowManager)
         , ContainerBase(0)
     {
         getWidget(mCreateButton, "CreateButton");

apps/openmw/mwgui/birth.cpp

@@ -10,7 +10,7 @@ using namespace MWGui;
 using namespace Widgets;
 
 BirthDialog::BirthDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_birth_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_birth.layout", parWindowManager)
 {
     // Centre dialog
     center();

apps/openmw/mwgui/birth.hpp

@@ -5,7 +5,7 @@
 
 /*
   This file contains the dialog for choosing a birth sign.
-  Layout is defined by resources/mygui/openmw_chargen_race_layout.xml.
+  Layout is defined by resources/mygui/openmw_chargen_race.layout.
  */
 
 namespace MWGui

apps/openmw/mwgui/bookwindow.cpp

@@ -13,7 +13,7 @@
 using namespace MWGui;
 
 BookWindow::BookWindow (WindowManager& parWindowManager) :
-    WindowBase("openmw_book_layout.xml", parWindowManager)
+    WindowBase("openmw_book.layout", parWindowManager)
 {
     getWidget(mCloseButton, "CloseButton");
     mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BookWindow::onCloseButtonClicked);

apps/openmw/mwgui/class.cpp

@@ -19,7 +19,7 @@ using namespace MWGui;
 /* GenerateClassResultDialog */
 
 GenerateClassResultDialog::GenerateClassResultDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_generate_class_result_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_generate_class_result.layout", parWindowManager)
 {
     // Centre dialog
     center();
@@ -77,7 +77,7 @@ void GenerateClassResultDialog::onBackClicked(MyGUI::Widget* _sender)
 /* PickClassDialog */
 
 PickClassDialog::PickClassDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_class_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_class.layout", parWindowManager)
 {
     // Centre dialog
     center();
@@ -283,7 +283,7 @@ void InfoBoxDialog::layoutVertically(MyGUI::WidgetPtr widget, int margin)
 }
 
 InfoBoxDialog::InfoBoxDialog(WindowManager& parWindowManager)
-    : WindowBase("openmw_infobox_layout.xml", parWindowManager)
+    : WindowBase("openmw_infobox.layout", parWindowManager)
     , currentButton(-1)
 {
     getWidget(textBox, "TextBox");
@@ -381,7 +381,7 @@ ClassChoiceDialog::ClassChoiceDialog(WindowManager& parWindowManager)
 /* CreateClassDialog */
 
 CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_create_class_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_create_class.layout", parWindowManager)
   , specDialog(nullptr)
   , attribDialog(nullptr)
   , skillDialog(nullptr)
@@ -703,7 +703,7 @@ void CreateClassDialog::onBackClicked(MyGUI::Widget* _sender)
 /* SelectSpecializationDialog */
 
 SelectSpecializationDialog::SelectSpecializationDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_select_specialization_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_select_specialization.layout", parWindowManager)
 {
     // Centre dialog
     center();
@@ -768,7 +768,7 @@ void SelectSpecializationDialog::onCancelClicked(MyGUI::Widget* _sender)
 /* SelectAttributeDialog */
 
 SelectAttributeDialog::SelectAttributeDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_select_attribute_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_select_attribute.layout", parWindowManager)
 {
     // Centre dialog
     center();
@@ -820,7 +820,7 @@ void SelectAttributeDialog::onCancelClicked(MyGUI::Widget* _sender)
 /* SelectSkillDialog */
 
 SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_select_skill_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_select_skill.layout", parWindowManager)
 {
     // Centre dialog
     center();
@@ -916,7 +916,7 @@ void SelectSkillDialog::onCancelClicked(MyGUI::Widget* _sender)
 /* DescriptionDialog */
 
 DescriptionDialog::DescriptionDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_class_description_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_class_description.layout", parWindowManager)
 {
     // Centre dialog
     center();

apps/openmw/mwgui/class.hpp

@@ -7,7 +7,7 @@
 
 /*
   This file contains the dialogs for choosing a class.
-  Layout is defined by resources/mygui/openmw_chargen_class_layout.xml.
+  Layout is defined by resources/mygui/openmw_chargen_class.layout.
  */
 
 namespace MWGui

apps/openmw/mwgui/confirmationdialog.cpp

@@ -8,7 +8,7 @@
 namespace MWGui
 {
     ConfirmationDialog::ConfirmationDialog(WindowManager& parWindowManager) :
-        WindowBase("openmw_confirmation_dialog_layout.xml", parWindowManager)
+        WindowBase("openmw_confirmation_dialog.layout", parWindowManager)
     {
         getWidget(mMessage, "Message");
         getWidget(mOkButton, "OkButton");

apps/openmw/mwgui/console.cpp

@@ -103,7 +103,7 @@ namespace MWGui
     }
 
     Console::Console(int w, int h, const Compiler::Extensions& extensions)
-      : Layout("openmw_console_layout.xml"),
+      : Layout("openmw_console.layout"),
         mCompilerContext (MWScript::CompilerContext::Type_Console)
     {
         setCoord(10,10, w-10, h/2);

apps/openmw/mwgui/container.cpp

@@ -592,7 +592,7 @@ MWWorld::ContainerStore& ContainerBase::getContainerStore()
 
 ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop)
     : ContainerBase(dragAndDrop)
-    , WindowBase("openmw_container_window_layout.xml", parWindowManager)
+    , WindowBase("openmw_container_window.layout", parWindowManager)
 {
     getWidget(mTakeButton, "TakeButton");
     getWidget(mCloseButton, "CloseButton");

apps/openmw/mwgui/countdialog.cpp

@@ -8,7 +8,7 @@
 namespace MWGui
 {
     CountDialog::CountDialog(WindowManager& parWindowManager) :
-        WindowBase("openmw_count_window_layout.xml", parWindowManager)
+        WindowBase("openmw_count_window.layout", parWindowManager)
     {
         getWidget(mSlider, "CountSlider");
         getWidget(mItemEdit, "ItemEdit");

apps/openmw/mwgui/dialogue.cpp

@@ -43,7 +43,7 @@ std::string::size_type find_str_ci(const std::string& str, const std::string& su
 
 
 DialogueWindow::DialogueWindow(WindowManager& parWindowManager)
-    : WindowBase("openmw_dialogue_window_layout.xml", parWindowManager)
+    : WindowBase("openmw_dialogue_window.layout", parWindowManager)
     , mEnabled(true)
     , mShowTrade(false)
 {

apps/openmw/mwgui/dialogue.hpp

@@ -19,7 +19,7 @@ namespace MWGui
 
 /*
   This file contains the dialouge window
-  Layout is defined by resources/mygui/openmw_dialogue_window_layout.xml.
+  Layout is defined by resources/mygui/openmw_dialogue_window.layout.
  */
 
 namespace MWGui

apps/openmw/mwgui/hud.cpp

@@ -20,7 +20,7 @@
 using namespace MWGui;
 
 HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
-    : Layout("openmw_hud_layout.xml")
+    : Layout("openmw_hud.layout")
     , health(NULL)
     , magicka(NULL)
     , stamina(NULL)

apps/openmw/mwgui/inventorywindow.cpp

@@ -42,7 +42,7 @@ namespace MWGui
 
     InventoryWindow::InventoryWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop)
         : ContainerBase(dragAndDrop)
-        , WindowPinnableBase("openmw_inventory_window_layout.xml", parWindowManager)
+        , WindowPinnableBase("openmw_inventory_window.layout", parWindowManager)
         , mTrading(false)
     {
         static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);

apps/openmw/mwgui/journalwindow.cpp

@@ -80,7 +80,7 @@ book formatText(std::string text,book mBook,int maxLine, int lineSize)
 
 
 MWGui::JournalWindow::JournalWindow (WindowManager& parWindowManager)
-    : WindowBase("openmw_journal_layout.xml", parWindowManager)
+    : WindowBase("openmw_journal.layout", parWindowManager)
     , lastPos(0)
     , mVisible(false)
 {

apps/openmw/mwgui/mainmenu.hpp

@@ -7,7 +7,7 @@ namespace MWGui
     {
     public:
         MainMenu(int w, int h)
-        : Layout("openmw_mainmenu_layout.xml")
+        : Layout("openmw_mainmenu.layout")
         {
             setCoord(0,0,w,h);
         }

apps/openmw/mwgui/map_window.cpp

@@ -155,7 +155,7 @@ void LocalMapBase::setPlayerDir(const float x, const float y)
 // ------------------------------------------------------------------------------------------
 
 MapWindow::MapWindow(WindowManager& parWindowManager) : 
-    MWGui::WindowPinnableBase("openmw_map_window_layout.xml", parWindowManager),
+    MWGui::WindowPinnableBase("openmw_map_window.layout", parWindowManager),
     mGlobal(false)
 {
     setCoord(500,0,320,300);

apps/openmw/mwgui/messagebox.cpp

@@ -147,7 +147,7 @@ int MessageBoxManager::readPressedButton ()
 
 
 MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message)
-  : Layout("openmw_messagebox_layout.xml")
+  : Layout("openmw_messagebox.layout")
   , mMessageBoxManager(parMessageBoxManager)
   , cMessage(message)
 {
@@ -177,7 +177,7 @@ MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, const std::strin
     size.height = mHeight = textSize.height + 20; // this is the padding between the text and the box
 
     mMainWidget->setSize(size);
-    size.width -= 15; // this is to center the text (see messagebox_layout.xml, Widget type="Edit" position="-2 -3 0 0")
+    size.width -= 15; // this is to center the text (see messagebox.layout, Widget type="Edit" position="-2 -3 0 0")
     mMessageWidget->setSize(size);
 }
 
@@ -205,7 +205,7 @@ int MessageBox::getHeight ()
 
 
 InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
-  : Layout("openmw_interactive_messagebox_layout.xml")
+  : Layout("openmw_interactive_messagebox.layout")
   , mMessageBoxManager(parMessageBoxManager)
   , mButtonPressed(-1)
 {

apps/openmw/mwgui/race.cpp

@@ -17,7 +17,7 @@ using namespace MWGui;
 using namespace Widgets;
 
 RaceDialog::RaceDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_race_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_race.layout", parWindowManager)
   , genderIndex(0)
   , faceIndex(0)
   , hairIndex(0)

apps/openmw/mwgui/race.hpp

@@ -14,7 +14,7 @@ namespace MWGui
 
 /*
   This file contains the dialog for choosing a race.
-  Layout is defined by resources/mygui/openmw_chargen_race_layout.xml.
+  Layout is defined by resources/mygui/openmw_chargen_race.layout.
  */
 
 namespace MWGui

apps/openmw/mwgui/review.cpp

@@ -20,7 +20,7 @@ using namespace Widgets;
 const int ReviewDialog::lineHeight = 18;
 
 ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
-    : WindowBase("openmw_chargen_review_layout.xml", parWindowManager)
+    : WindowBase("openmw_chargen_review.layout", parWindowManager)
     , lastPos(0)
 {
     // Centre dialog

apps/openmw/mwgui/review.hpp

@@ -12,7 +12,7 @@ namespace MWGui
 
 /*
 This file contains the dialog for reviewing the generated character.
-Layout is defined by resources/mygui/openmw_chargen_review_layout.xml.
+Layout is defined by resources/mygui/openmw_chargen_review.layout.
 */
 
 namespace MWGui

apps/openmw/mwgui/scrollwindow.cpp

@@ -11,7 +11,7 @@
 using namespace MWGui;
 
 ScrollWindow::ScrollWindow (WindowManager& parWindowManager) :
-    WindowBase("openmw_scroll_layout.xml", parWindowManager)
+    WindowBase("openmw_scroll.layout", parWindowManager)
 {
     getWidget(mTextView, "TextView");
 

apps/openmw/mwgui/settingswindow.cpp

@@ -75,7 +75,7 @@ namespace
 namespace MWGui
 {
     SettingsWindow::SettingsWindow(WindowManager& parWindowManager) :
-        WindowBase("openmw_settings_window_layout.xml", parWindowManager)
+        WindowBase("openmw_settings_window.layout", parWindowManager)
     {
         getWidget(mOkButton, "OkButton");
         getWidget(mResolutionList, "ResolutionList");

apps/openmw/mwgui/spellwindow.cpp

@@ -39,7 +39,7 @@ namespace
 namespace MWGui
 {
     SpellWindow::SpellWindow(WindowManager& parWindowManager)
-        : WindowPinnableBase("openmw_spell_window_layout.xml", parWindowManager)
+        : WindowPinnableBase("openmw_spell_window.layout", parWindowManager)
         , mHeight(0)
         , mWidth(0)
     {

apps/openmw/mwgui/stats_window.cpp

@@ -19,7 +19,7 @@ using namespace MWGui;
 const int StatsWindow::lineHeight = 18;
 
 StatsWindow::StatsWindow (WindowManager& parWindowManager)
-  : WindowPinnableBase("openmw_stats_window_layout.xml", parWindowManager)
+  : WindowPinnableBase("openmw_stats_window.layout", parWindowManager)
   , skillAreaWidget(NULL)
   , skillClientWidget(NULL)
   , skillScrollerWidget(NULL)

apps/openmw/mwgui/text_input.cpp

@@ -4,7 +4,7 @@
 using namespace MWGui;
 
 TextInputDialog::TextInputDialog(WindowManager& parWindowManager)
-  : WindowBase("openmw_text_input_layout.xml", parWindowManager)
+  : WindowBase("openmw_text_input.layout", parWindowManager)
 {
     // Centre dialog
     center();

apps/openmw/mwgui/tooltips.cpp

@@ -14,7 +14,7 @@ using namespace MWGui;
 using namespace MyGUI;
 
 ToolTips::ToolTips(WindowManager* windowManager) :
-    Layout("openmw_tooltips.xml")
+    Layout("openmw_tooltips.layout")
     , mGameMode(true)
     , mWindowManager(windowManager)
     , mFullHelp(false)
@@ -564,8 +564,6 @@ void ToolTips::createAttributeToolTip(MyGUI::Widget* widget, int attributeId)
     if (attributeId == -1)
         return;
 
-    const ESM::Attribute* attr = MWBase::Environment::get().getWorld()->getStore().attributes.search(attributeId);
-    assert(attr);
     std::string icon = ESM::Attribute::attributeIcons[attributeId];
     std::string name = ESM::Attribute::gmstAttributeIds[attributeId];
     std::string desc = ESM::Attribute::gmstAttributeDescIds[attributeId];

apps/openmw/mwgui/tradewindow.cpp

@@ -14,7 +14,7 @@
 namespace MWGui
 {
     TradeWindow::TradeWindow(WindowManager& parWindowManager) :
-        WindowBase("openmw_trade_window_layout.xml", parWindowManager)
+        WindowBase("openmw_trade_window.layout", parWindowManager)
         , ContainerBase(NULL) // no drag&drop
         , mCurrentBalance(0)
     {

files/mygui/CMakeLists.txt

@@ -15,52 +15,52 @@ configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYO
 configure_file("${SDIR}/openmw_button.skin.xml" "${DDIR}/openmw_button.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_list.skin.xml" "${DDIR}/openmw_list.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_edit.skin.xml" "${DDIR}/openmw_edit.skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_console_layout.xml" "${DDIR}/openmw_console_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_console.layout" "${DDIR}/openmw_console.layout" COPYONLY)
 configure_file("${SDIR}/openmw_console.skin.xml" "${DDIR}/openmw_console.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw.font.xml" "${DDIR}/openmw.font.xml" COPYONLY)
 configure_file("${SDIR}/openmw_hud_box.skin.xml" "${DDIR}/openmw_hud_box.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_hud_energybar.skin.xml" "${DDIR}/openmw_hud_energybar.skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_hud_layout.xml" "${DDIR}/openmw_hud_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_text_input_layout.xml" "${DDIR}/openmw_text_input_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_infobox_layout.xml" "${DDIR}/openmw_infobox_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_race_layout.xml" "${DDIR}/openmw_chargen_race_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_class_layout.xml" "${DDIR}/openmw_chargen_class_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_generate_class_result_layout.xml" "${DDIR}/openmw_chargen_generate_class_result_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_create_class_layout.xml" "${DDIR}/openmw_chargen_create_class_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_select_specialization_layout.xml" "${DDIR}/openmw_chargen_select_specialization_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_select_attribute_layout.xml" "${DDIR}/openmw_chargen_select_attribute_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_select_skill_layout.xml" "${DDIR}/openmw_chargen_select_skill_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_class_description_layout.xml" "${DDIR}/openmw_chargen_class_description_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_birth_layout.xml" "${DDIR}/openmw_chargen_birth_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_chargen_review_layout.xml" "${DDIR}/openmw_chargen_review_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_dialogue_window_layout.xml" "${DDIR}/openmw_dialogue_window_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_hud.layout" "${DDIR}/openmw_hud.layout" COPYONLY)
+configure_file("${SDIR}/openmw_text_input.layout" "${DDIR}/openmw_text_input.layout" COPYONLY)
+configure_file("${SDIR}/openmw_infobox.layout" "${DDIR}/openmw_infobox.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_race.layout" "${DDIR}/openmw_chargen_race.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_class.layout" "${DDIR}/openmw_chargen_class.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_generate_class_result.layout" "${DDIR}/openmw_chargen_generate_class_result.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_create_class.layout" "${DDIR}/openmw_chargen_create_class.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_select_specialization.layout" "${DDIR}/openmw_chargen_select_specialization.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_select_attribute.layout" "${DDIR}/openmw_chargen_select_attribute.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_select_skill.layout" "${DDIR}/openmw_chargen_select_skill.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_class_description.layout" "${DDIR}/openmw_chargen_class_description.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_birth.layout" "${DDIR}/openmw_chargen_birth.layout" COPYONLY)
+configure_file("${SDIR}/openmw_chargen_review.layout" "${DDIR}/openmw_chargen_review.layout" COPYONLY)
+configure_file("${SDIR}/openmw_dialogue_window.layout" "${DDIR}/openmw_dialogue_window.layout" COPYONLY)
 configure_file("${SDIR}/openmw_dialogue_window_skin.xml" "${DDIR}/openmw_dialogue_window_skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_inventory_window_layout.xml" "${DDIR}/openmw_inventory_window_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_container_window_layout.xml" "${DDIR}/openmw_container_window_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_inventory_window.layout" "${DDIR}/openmw_inventory_window.layout" COPYONLY)
+configure_file("${SDIR}/openmw_container_window.layout" "${DDIR}/openmw_container_window.layout" COPYONLY)
 configure_file("${SDIR}/openmw_layers.xml" "${DDIR}/openmw_layers.xml" COPYONLY)
-configure_file("${SDIR}/openmw_mainmenu_layout.xml" "${DDIR}/openmw_mainmenu_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_mainmenu.layout" "${DDIR}/openmw_mainmenu.layout" COPYONLY)
 configure_file("${SDIR}/openmw_mainmenu_skin.xml" "${DDIR}/openmw_mainmenu_skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_map_window_layout.xml" "${DDIR}/openmw_map_window_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_map_window.layout" "${DDIR}/openmw_map_window.layout" COPYONLY)
 configure_file("${SDIR}/openmw_map_window_skin.xml" "${DDIR}/openmw_map_window_skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw.pointer.xml" "${DDIR}/openmw.pointer.xml" COPYONLY)
 configure_file("${SDIR}/openmw_progress.skin.xml" "${DDIR}/openmw_progress.skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_stats_window_layout.xml" "${DDIR}/openmw_stats_window_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_stats_window.layout" "${DDIR}/openmw_stats_window.layout" COPYONLY)
 configure_file("${SDIR}/openmw_text.skin.xml" "${DDIR}/openmw_text.skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_windows.skin.xml" "${DDIR}/openmw_windows.skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_messagebox_layout.xml" "${DDIR}/openmw_messagebox_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_interactive_messagebox_layout.xml" "${DDIR}/openmw_interactive_messagebox_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_journal_layout.xml" "${DDIR}/openmw_journal_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_messagebox.layout" "${DDIR}/openmw_messagebox.layout" COPYONLY)
+configure_file("${SDIR}/openmw_interactive_messagebox.layout" "${DDIR}/openmw_interactive_messagebox.layout" COPYONLY)
+configure_file("${SDIR}/openmw_journal.layout" "${DDIR}/openmw_journal.layout" COPYONLY)
 configure_file("${SDIR}/openmw_journal_skin.xml" "${DDIR}/openmw_journal_skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_tooltips.xml" "${DDIR}/openmw_tooltips.xml" COPYONLY)
-configure_file("${SDIR}/openmw_scroll_layout.xml" "${DDIR}/openmw_scroll_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_tooltips.layout" "${DDIR}/openmw_tooltips.layout" COPYONLY)
+configure_file("${SDIR}/openmw_scroll.layout" "${DDIR}/openmw_scroll.layout" COPYONLY)
 configure_file("${SDIR}/openmw_scroll_skin.xml" "${DDIR}/openmw_scroll_skin.xml" COPYONLY)
-configure_file("${SDIR}/openmw_book_layout.xml" "${DDIR}/openmw_book_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_count_window_layout.xml" "${DDIR}/openmw_count_window_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_trade_window_layout.xml" "${DDIR}/openmw_trade_window_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_settings_window_layout.xml" "${DDIR}/openmw_settings_window_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_confirmation_dialog_layout.xml" "${DDIR}/openmw_confirmation_dialog_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_alchemy_window_layout.xml" "${DDIR}/openmw_alchemy_window_layout.xml" COPYONLY)
-configure_file("${SDIR}/openmw_spell_window_layout.xml" "${DDIR}/openmw_spell_window_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_book.layout" "${DDIR}/openmw_book.layout" COPYONLY)
+configure_file("${SDIR}/openmw_count_window.layout" "${DDIR}/openmw_count_window.layout" COPYONLY)
+configure_file("${SDIR}/openmw_trade_window.layout" "${DDIR}/openmw_trade_window.layout" COPYONLY)
+configure_file("${SDIR}/openmw_settings_window.layout" "${DDIR}/openmw_settings_window.layout" COPYONLY)
+configure_file("${SDIR}/openmw_confirmation_dialog.layout" "${DDIR}/openmw_confirmation_dialog.layout" COPYONLY)
+configure_file("${SDIR}/openmw_alchemy_window.layout" "${DDIR}/openmw_alchemy_window.layout" COPYONLY)
+configure_file("${SDIR}/openmw_spell_window.layout" "${DDIR}/openmw_spell_window.layout" COPYONLY)
 configure_file("${SDIR}/atlas1.cfg" "${DDIR}/atlas1.cfg" COPYONLY)
 configure_file("${SDIR}/smallbars.png" "${DDIR}/smallbars.png" COPYONLY)
 configure_file("${SDIR}/EBGaramond-Regular.ttf" "${DDIR}/EBGaramond-Regular.ttf" COPYONLY)