From d27863bf8eb6b46b130157ffd801e551a7348c67 Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 3 Jul 2012 11:34:20 +0200 Subject: [PATCH] rename layout files to .layout to get them recognized by layout editor --- apps/openmw/mwgui/alchemywindow.cpp | 2 +- apps/openmw/mwgui/birth.cpp | 2 +- apps/openmw/mwgui/birth.hpp | 2 +- apps/openmw/mwgui/bookwindow.cpp | 2 +- apps/openmw/mwgui/class.cpp | 16 ++--- apps/openmw/mwgui/class.hpp | 2 +- apps/openmw/mwgui/confirmationdialog.cpp | 2 +- apps/openmw/mwgui/console.cpp | 2 +- apps/openmw/mwgui/container.cpp | 2 +- apps/openmw/mwgui/countdialog.cpp | 2 +- apps/openmw/mwgui/dialogue.cpp | 2 +- apps/openmw/mwgui/dialogue.hpp | 2 +- apps/openmw/mwgui/hud.cpp | 2 +- apps/openmw/mwgui/inventorywindow.cpp | 2 +- apps/openmw/mwgui/journalwindow.cpp | 2 +- apps/openmw/mwgui/mainmenu.hpp | 2 +- apps/openmw/mwgui/map_window.cpp | 2 +- apps/openmw/mwgui/messagebox.cpp | 6 +- apps/openmw/mwgui/race.cpp | 2 +- apps/openmw/mwgui/race.hpp | 2 +- apps/openmw/mwgui/review.cpp | 2 +- apps/openmw/mwgui/review.hpp | 2 +- apps/openmw/mwgui/scrollwindow.cpp | 2 +- apps/openmw/mwgui/settingswindow.cpp | 2 +- apps/openmw/mwgui/spellwindow.cpp | 2 +- apps/openmw/mwgui/stats_window.cpp | 2 +- apps/openmw/mwgui/text_input.cpp | 2 +- apps/openmw/mwgui/tooltips.cpp | 4 +- apps/openmw/mwgui/tradewindow.cpp | 2 +- files/mygui/CMakeLists.txt | 64 +++++++++---------- ...ayout.xml => openmw_alchemy_window.layout} | 0 ...nmw_book_layout.xml => openmw_book.layout} | 0 ...layout.xml => openmw_chargen_birth.layout} | 0 ...layout.xml => openmw_chargen_class.layout} | 0 ...> openmw_chargen_class_description.layout} | 0 ...xml => openmw_chargen_create_class.layout} | 0 ...enmw_chargen_generate_class_result.layout} | 0 ..._layout.xml => openmw_chargen_race.layout} | 0 ...ayout.xml => openmw_chargen_review.layout} | 0 ...=> openmw_chargen_select_attribute.layout} | 0 ...xml => openmw_chargen_select_skill.layout} | 0 ...enmw_chargen_select_specialization.layout} | 0 ....xml => openmw_confirmation_dialog.layout} | 0 ...nsole_layout.xml => openmw_console.layout} | 0 ...out.xml => openmw_container_window.layout} | 0 ..._layout.xml => openmw_count_window.layout} | 0 ...yout.xml => openmw_dialogue_window.layout} | 0 ...penmw_hud_layout.xml => openmw_hud.layout} | 0 ...fobox_layout.xml => openmw_infobox.layout} | 0 ...l => openmw_interactive_messagebox.layout} | 0 ...out.xml => openmw_inventory_window.layout} | 0 ...urnal_layout.xml => openmw_journal.layout} | 0 ...menu_layout.xml => openmw_mainmenu.layout} | 0 ...ow_layout.xml => openmw_map_window.layout} | 0 ...ox_layout.xml => openmw_messagebox.layout} | 0 ...scroll_layout.xml => openmw_scroll.layout} | 0 ...yout.xml => openmw_settings_window.layout} | 0 ..._layout.xml => openmw_spell_window.layout} | 0 ..._layout.xml => openmw_stats_window.layout} | 0 ...ut_layout.xml => openmw_text_input.layout} | 0 ...mw_tooltips.xml => openmw_tooltips.layout} | 0 ..._layout.xml => openmw_trade_window.layout} | 0 62 files changed, 70 insertions(+), 72 deletions(-) rename files/mygui/{openmw_alchemy_window_layout.xml => openmw_alchemy_window.layout} (100%) rename files/mygui/{openmw_book_layout.xml => openmw_book.layout} (100%) rename files/mygui/{openmw_chargen_birth_layout.xml => openmw_chargen_birth.layout} (100%) rename files/mygui/{openmw_chargen_class_layout.xml => openmw_chargen_class.layout} (100%) rename files/mygui/{openmw_chargen_class_description_layout.xml => openmw_chargen_class_description.layout} (100%) rename files/mygui/{openmw_chargen_create_class_layout.xml => openmw_chargen_create_class.layout} (100%) rename files/mygui/{openmw_chargen_generate_class_result_layout.xml => openmw_chargen_generate_class_result.layout} (100%) rename files/mygui/{openmw_chargen_race_layout.xml => openmw_chargen_race.layout} (100%) rename files/mygui/{openmw_chargen_review_layout.xml => openmw_chargen_review.layout} (100%) rename files/mygui/{openmw_chargen_select_attribute_layout.xml => openmw_chargen_select_attribute.layout} (100%) rename files/mygui/{openmw_chargen_select_skill_layout.xml => openmw_chargen_select_skill.layout} (100%) rename files/mygui/{openmw_chargen_select_specialization_layout.xml => openmw_chargen_select_specialization.layout} (100%) rename files/mygui/{openmw_confirmation_dialog_layout.xml => openmw_confirmation_dialog.layout} (100%) rename files/mygui/{openmw_console_layout.xml => openmw_console.layout} (100%) rename files/mygui/{openmw_container_window_layout.xml => openmw_container_window.layout} (100%) rename files/mygui/{openmw_count_window_layout.xml => openmw_count_window.layout} (100%) rename files/mygui/{openmw_dialogue_window_layout.xml => openmw_dialogue_window.layout} (100%) rename files/mygui/{openmw_hud_layout.xml => openmw_hud.layout} (100%) rename files/mygui/{openmw_infobox_layout.xml => openmw_infobox.layout} (100%) rename files/mygui/{openmw_interactive_messagebox_layout.xml => openmw_interactive_messagebox.layout} (100%) rename files/mygui/{openmw_inventory_window_layout.xml => openmw_inventory_window.layout} (100%) rename files/mygui/{openmw_journal_layout.xml => openmw_journal.layout} (100%) rename files/mygui/{openmw_mainmenu_layout.xml => openmw_mainmenu.layout} (100%) rename files/mygui/{openmw_map_window_layout.xml => openmw_map_window.layout} (100%) rename files/mygui/{openmw_messagebox_layout.xml => openmw_messagebox.layout} (100%) rename files/mygui/{openmw_scroll_layout.xml => openmw_scroll.layout} (100%) rename files/mygui/{openmw_settings_window_layout.xml => openmw_settings_window.layout} (100%) rename files/mygui/{openmw_spell_window_layout.xml => openmw_spell_window.layout} (100%) rename files/mygui/{openmw_stats_window_layout.xml => openmw_stats_window.layout} (100%) rename files/mygui/{openmw_text_input_layout.xml => openmw_text_input.layout} (100%) rename files/mygui/{openmw_tooltips.xml => openmw_tooltips.layout} (100%) rename files/mygui/{openmw_trade_window_layout.xml => openmw_trade_window.layout} (100%) diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp index 423678eed0..7b24b07dee 100644 --- a/apps/openmw/mwgui/alchemywindow.cpp +++ b/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"); diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp index 49f90d1a07..69056759d0 100644 --- a/apps/openmw/mwgui/birth.cpp +++ b/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(); diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp index b5f7db7749..e61be736a9 100644 --- a/apps/openmw/mwgui/birth.hpp +++ b/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 diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp index a9dcd4555e..81f5cf9bd6 100644 --- a/apps/openmw/mwgui/bookwindow.cpp +++ b/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); diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index 0961f6327e..d0f21f9450 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/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(); diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index 868052800d..c9e7aef7b3 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/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 diff --git a/apps/openmw/mwgui/confirmationdialog.cpp b/apps/openmw/mwgui/confirmationdialog.cpp index 5e12c32964..4b41514a09 100644 --- a/apps/openmw/mwgui/confirmationdialog.cpp +++ b/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"); diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index 8115835f40..113b3dee9c 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/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); diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 36ed16b0ef..54a1bb73b4 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/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"); diff --git a/apps/openmw/mwgui/countdialog.cpp b/apps/openmw/mwgui/countdialog.cpp index e0a9bb9082..8a0d40d3e4 100644 --- a/apps/openmw/mwgui/countdialog.cpp +++ b/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"); diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 55bd49bebc..acf0bf130d 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/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) { diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index aa66cd5798..5d808b5a7b 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/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 diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp index 4ad9845f0f..c5ea2949bf 100644 --- a/apps/openmw/mwgui/hud.cpp +++ b/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) diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index a26a958bd0..c981e2b906 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/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(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize); diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index 7f9000bc75..b5468ae440 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/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) { diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp index b32f2d900b..06c59396fc 100644 --- a/apps/openmw/mwgui/mainmenu.hpp +++ b/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); } diff --git a/apps/openmw/mwgui/map_window.cpp b/apps/openmw/mwgui/map_window.cpp index a51b66e2bf..4ebeb38742 100644 --- a/apps/openmw/mwgui/map_window.cpp +++ b/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); diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index 007f966aab..68326a3c31 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/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& buttons) - : Layout("openmw_interactive_messagebox_layout.xml") + : Layout("openmw_interactive_messagebox.layout") , mMessageBoxManager(parMessageBoxManager) , mButtonPressed(-1) { diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index dea365ac23..9ae4530169 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/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) diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index bcd3b5185f..217ce15aa6 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/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 diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 97a3a6e154..f9792ea34f 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/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 diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index 6118168d57..454a6c5a5b 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/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 diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp index 92b18d953d..4644072168 100644 --- a/apps/openmw/mwgui/scrollwindow.cpp +++ b/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"); diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index 6ceed664ea..818af99427 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/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"); diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp index 909798f1ad..ef155f5637 100644 --- a/apps/openmw/mwgui/spellwindow.cpp +++ b/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) { diff --git a/apps/openmw/mwgui/stats_window.cpp b/apps/openmw/mwgui/stats_window.cpp index 3584af7c7d..0330c9093d 100644 --- a/apps/openmw/mwgui/stats_window.cpp +++ b/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) diff --git a/apps/openmw/mwgui/text_input.cpp b/apps/openmw/mwgui/text_input.cpp index 7d84a9b9fd..17852ba5ad 100644 --- a/apps/openmw/mwgui/text_input.cpp +++ b/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(); diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp index 7ec4441687..8709a9920c 100644 --- a/apps/openmw/mwgui/tooltips.cpp +++ b/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]; diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index a42da60d19..485b79a7dd 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/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) { diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt index dad4afb466..f41cdf54e8 100644 --- a/files/mygui/CMakeLists.txt +++ b/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) diff --git a/files/mygui/openmw_alchemy_window_layout.xml b/files/mygui/openmw_alchemy_window.layout similarity index 100% rename from files/mygui/openmw_alchemy_window_layout.xml rename to files/mygui/openmw_alchemy_window.layout diff --git a/files/mygui/openmw_book_layout.xml b/files/mygui/openmw_book.layout similarity index 100% rename from files/mygui/openmw_book_layout.xml rename to files/mygui/openmw_book.layout diff --git a/files/mygui/openmw_chargen_birth_layout.xml b/files/mygui/openmw_chargen_birth.layout similarity index 100% rename from files/mygui/openmw_chargen_birth_layout.xml rename to files/mygui/openmw_chargen_birth.layout diff --git a/files/mygui/openmw_chargen_class_layout.xml b/files/mygui/openmw_chargen_class.layout similarity index 100% rename from files/mygui/openmw_chargen_class_layout.xml rename to files/mygui/openmw_chargen_class.layout diff --git a/files/mygui/openmw_chargen_class_description_layout.xml b/files/mygui/openmw_chargen_class_description.layout similarity index 100% rename from files/mygui/openmw_chargen_class_description_layout.xml rename to files/mygui/openmw_chargen_class_description.layout diff --git a/files/mygui/openmw_chargen_create_class_layout.xml b/files/mygui/openmw_chargen_create_class.layout similarity index 100% rename from files/mygui/openmw_chargen_create_class_layout.xml rename to files/mygui/openmw_chargen_create_class.layout diff --git a/files/mygui/openmw_chargen_generate_class_result_layout.xml b/files/mygui/openmw_chargen_generate_class_result.layout similarity index 100% rename from files/mygui/openmw_chargen_generate_class_result_layout.xml rename to files/mygui/openmw_chargen_generate_class_result.layout diff --git a/files/mygui/openmw_chargen_race_layout.xml b/files/mygui/openmw_chargen_race.layout similarity index 100% rename from files/mygui/openmw_chargen_race_layout.xml rename to files/mygui/openmw_chargen_race.layout diff --git a/files/mygui/openmw_chargen_review_layout.xml b/files/mygui/openmw_chargen_review.layout similarity index 100% rename from files/mygui/openmw_chargen_review_layout.xml rename to files/mygui/openmw_chargen_review.layout diff --git a/files/mygui/openmw_chargen_select_attribute_layout.xml b/files/mygui/openmw_chargen_select_attribute.layout similarity index 100% rename from files/mygui/openmw_chargen_select_attribute_layout.xml rename to files/mygui/openmw_chargen_select_attribute.layout diff --git a/files/mygui/openmw_chargen_select_skill_layout.xml b/files/mygui/openmw_chargen_select_skill.layout similarity index 100% rename from files/mygui/openmw_chargen_select_skill_layout.xml rename to files/mygui/openmw_chargen_select_skill.layout diff --git a/files/mygui/openmw_chargen_select_specialization_layout.xml b/files/mygui/openmw_chargen_select_specialization.layout similarity index 100% rename from files/mygui/openmw_chargen_select_specialization_layout.xml rename to files/mygui/openmw_chargen_select_specialization.layout diff --git a/files/mygui/openmw_confirmation_dialog_layout.xml b/files/mygui/openmw_confirmation_dialog.layout similarity index 100% rename from files/mygui/openmw_confirmation_dialog_layout.xml rename to files/mygui/openmw_confirmation_dialog.layout diff --git a/files/mygui/openmw_console_layout.xml b/files/mygui/openmw_console.layout similarity index 100% rename from files/mygui/openmw_console_layout.xml rename to files/mygui/openmw_console.layout diff --git a/files/mygui/openmw_container_window_layout.xml b/files/mygui/openmw_container_window.layout similarity index 100% rename from files/mygui/openmw_container_window_layout.xml rename to files/mygui/openmw_container_window.layout diff --git a/files/mygui/openmw_count_window_layout.xml b/files/mygui/openmw_count_window.layout similarity index 100% rename from files/mygui/openmw_count_window_layout.xml rename to files/mygui/openmw_count_window.layout diff --git a/files/mygui/openmw_dialogue_window_layout.xml b/files/mygui/openmw_dialogue_window.layout similarity index 100% rename from files/mygui/openmw_dialogue_window_layout.xml rename to files/mygui/openmw_dialogue_window.layout diff --git a/files/mygui/openmw_hud_layout.xml b/files/mygui/openmw_hud.layout similarity index 100% rename from files/mygui/openmw_hud_layout.xml rename to files/mygui/openmw_hud.layout diff --git a/files/mygui/openmw_infobox_layout.xml b/files/mygui/openmw_infobox.layout similarity index 100% rename from files/mygui/openmw_infobox_layout.xml rename to files/mygui/openmw_infobox.layout diff --git a/files/mygui/openmw_interactive_messagebox_layout.xml b/files/mygui/openmw_interactive_messagebox.layout similarity index 100% rename from files/mygui/openmw_interactive_messagebox_layout.xml rename to files/mygui/openmw_interactive_messagebox.layout diff --git a/files/mygui/openmw_inventory_window_layout.xml b/files/mygui/openmw_inventory_window.layout similarity index 100% rename from files/mygui/openmw_inventory_window_layout.xml rename to files/mygui/openmw_inventory_window.layout diff --git a/files/mygui/openmw_journal_layout.xml b/files/mygui/openmw_journal.layout similarity index 100% rename from files/mygui/openmw_journal_layout.xml rename to files/mygui/openmw_journal.layout diff --git a/files/mygui/openmw_mainmenu_layout.xml b/files/mygui/openmw_mainmenu.layout similarity index 100% rename from files/mygui/openmw_mainmenu_layout.xml rename to files/mygui/openmw_mainmenu.layout diff --git a/files/mygui/openmw_map_window_layout.xml b/files/mygui/openmw_map_window.layout similarity index 100% rename from files/mygui/openmw_map_window_layout.xml rename to files/mygui/openmw_map_window.layout diff --git a/files/mygui/openmw_messagebox_layout.xml b/files/mygui/openmw_messagebox.layout similarity index 100% rename from files/mygui/openmw_messagebox_layout.xml rename to files/mygui/openmw_messagebox.layout diff --git a/files/mygui/openmw_scroll_layout.xml b/files/mygui/openmw_scroll.layout similarity index 100% rename from files/mygui/openmw_scroll_layout.xml rename to files/mygui/openmw_scroll.layout diff --git a/files/mygui/openmw_settings_window_layout.xml b/files/mygui/openmw_settings_window.layout similarity index 100% rename from files/mygui/openmw_settings_window_layout.xml rename to files/mygui/openmw_settings_window.layout diff --git a/files/mygui/openmw_spell_window_layout.xml b/files/mygui/openmw_spell_window.layout similarity index 100% rename from files/mygui/openmw_spell_window_layout.xml rename to files/mygui/openmw_spell_window.layout diff --git a/files/mygui/openmw_stats_window_layout.xml b/files/mygui/openmw_stats_window.layout similarity index 100% rename from files/mygui/openmw_stats_window_layout.xml rename to files/mygui/openmw_stats_window.layout diff --git a/files/mygui/openmw_text_input_layout.xml b/files/mygui/openmw_text_input.layout similarity index 100% rename from files/mygui/openmw_text_input_layout.xml rename to files/mygui/openmw_text_input.layout diff --git a/files/mygui/openmw_tooltips.xml b/files/mygui/openmw_tooltips.layout similarity index 100% rename from files/mygui/openmw_tooltips.xml rename to files/mygui/openmw_tooltips.layout diff --git a/files/mygui/openmw_trade_window_layout.xml b/files/mygui/openmw_trade_window.layout similarity index 100% rename from files/mygui/openmw_trade_window_layout.xml rename to files/mygui/openmw_trade_window.layout