diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 2b9206354a..467d61bf12 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -521,7 +521,6 @@ void OMW::Engine::setDataDirs (const Files::PathContainer& dataDirs) { mDataDirs = dataDirs; mDataDirs.insert(mDataDirs.begin(), (mResDir / "vfs")); - mDataDirs.insert(mDataDirs.begin(), (mResDir / "mygui")); mFileCollections = Files::Collections (mDataDirs, !mFSStrict); } @@ -701,7 +700,7 @@ void OMW::Engine::createWindow() void OMW::Engine::setWindowIcon() { std::ifstream windowIconStream; - std::string windowIcon = (mResDir / "mygui" / "openmw.png").string(); + std::string windowIcon = (mResDir / "openmw.png").string(); windowIconStream.open(windowIcon, std::ios_base::in | std::ios_base::binary); if (windowIconStream.fail()) Log(Debug::Error) << "Error: Failed to open " << windowIcon; @@ -816,7 +815,6 @@ void OMW::Engine::prepareEngine() exts->glRenderbufferStorageMultisampleCoverageNV = nullptr; #endif - std::string myguiResources = (mResDir / "mygui").string(); osg::ref_ptr guiRoot = new osg::Group; guiRoot->setName("GUI Root"); guiRoot->setNodeMask(MWRender::Mask_GUI); @@ -824,7 +822,7 @@ void OMW::Engine::prepareEngine() rootNode->addChild(guiRoot); mWindowManager = std::make_unique(mWindow, mViewer, guiRoot, mResourceSystem.get(), mWorkQueue.get(), - mCfgMgr.getLogPath().string() + std::string("/"), myguiResources, + mCfgMgr.getLogPath().string() + std::string("/"), mScriptConsoleMode, mTranslationDataStorage, mEncoding, mExportFonts, Version::getOpenmwVersionDescription(mResDir.string()), shadersSupported); mEnvironment.setWindowManager(*mWindowManager); diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 5141736204..623c46fedc 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -128,7 +128,7 @@ namespace MWGui { WindowManager::WindowManager( SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue, - const std::string& logpath, const std::string& resourcePath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage, + const std::string& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders) : mOldUpdateMask(0) , mOldCullMask(0) @@ -195,7 +195,7 @@ namespace MWGui { mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f); mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor); - mGuiPlatform->initialise(resourceSystem->getVFS(), resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string()); + mGuiPlatform->initialise(resourceSystem->getVFS(), "mygui", (std::filesystem::path(logpath) / "MyGUI.log").generic_string()); mGui = new MyGUI::Gui; mGui->initialise(""); diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp index 083ecc6992..a48847de3f 100644 --- a/apps/openmw/mwgui/windowmanagerimp.hpp +++ b/apps/openmw/mwgui/windowmanagerimp.hpp @@ -135,7 +135,7 @@ namespace MWGui typedef std::vector FactionList; WindowManager(SDL_Window* window, osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ResourceSystem* resourceSystem, SceneUtil::WorkQueue* workQueue, - const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts, Translation::Storage& translationDataStorage, + const std::string& logpath, bool consoleOnlyScripts, Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::string& versionDescription, bool useShaders); virtual ~WindowManager(); diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp index fca8346e19..7d90002d95 100644 --- a/components/fontloader/fontloader.cpp +++ b/components/fontloader/fontloader.cpp @@ -213,11 +213,18 @@ namespace Gui return; } + std::string oldDataPath = dataManager->getDataPath(""); + dataManager->setResourcePath("fonts"); + for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/")) { + std::filesystem::path path = name; + std::cout << name << std::endl; if (Misc::getFileExtension(name) == "omwfont") - MyGUI::ResourceManager::getInstance().load(name); + MyGUI::ResourceManager::getInstance().load(path.filename()); } + + dataManager->setResourcePath(oldDataPath); } typedef struct diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp index c06532a9f4..1eefa6b81d 100644 --- a/components/myguiplatform/myguidatamanager.cpp +++ b/components/myguiplatform/myguidatamanager.cpp @@ -22,7 +22,7 @@ MyGUI::IDataStream *DataManager::getData(const std::string &name) const { // Note: MyGUI is supposed to read/free input steam itself, // so copy data from VFS stream to the string stream and pass it to MyGUI. - Files::IStreamPtr streamPtr = mVfs->get(name); + Files::IStreamPtr streamPtr = mVfs->get(mResourcePath + "\\" + name); std::istream* fileStream = streamPtr.get(); std::unique_ptr dataStream; dataStream.reset(new std::stringstream); @@ -37,7 +37,7 @@ void DataManager::freeData(MyGUI::IDataStream *data) bool DataManager::isDataExist(const std::string &name) const { - return mVfs->exists(name); + return mVfs->exists(mResourcePath + "\\" + name); } void DataManager::setVfs(const VFS::Manager* vfs) @@ -52,7 +52,17 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt const std::string &DataManager::getDataPath(const std::string &name) const { - throw std::runtime_error("DataManager::getDataPath is not implemented - VFS is used"); + static std::string result; + result.clear(); + + if (name.empty()) + return mResourcePath; + + if (!isDataExist(name)) + return result; + + result = mResourcePath + "\\" + name; + return result; } } diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt index a3d5c14e5c..b7b4b4cd23 100644 --- a/files/CMakeLists.txt +++ b/files/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(mygui) add_subdirectory(shaders) add_subdirectory(data) add_subdirectory(lua_api) diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt index 1fa40b3f54..63df2f53b5 100644 --- a/files/data/CMakeLists.txt +++ b/files/data/CMakeLists.txt @@ -69,8 +69,98 @@ set(BUILTIN_DATA_FILES shaders/main.omwfx shaders/displaydepth.omwfx + + mygui/core.skin + mygui/core.xml + mygui/core_layouteditor.xml + mygui/openmw_alchemy_window.layout + mygui/openmw_book.layout + mygui/openmw_box.skin.xml + mygui/openmw_button.skin.xml + mygui/openmw_chargen_birth.layout + mygui/openmw_chargen_class_description.layout + mygui/openmw_chargen_class.layout + mygui/openmw_chargen_create_class.layout + mygui/openmw_chargen_generate_class_result.layout + mygui/openmw_chargen_race.layout + mygui/openmw_chargen_review.layout + mygui/openmw_chargen_select_attribute.layout + mygui/openmw_chargen_select_skill.layout + mygui/openmw_chargen_select_specialization.layout + mygui/openmw_confirmation_dialog.layout + mygui/openmw_console.layout + mygui/openmw_console.skin.xml + mygui/openmw_container_window.layout + mygui/openmw_count_window.layout + mygui/openmw_dialogue_window.layout + mygui/openmw_dialogue_window.skin.xml + mygui/openmw_edit.skin.xml + mygui/openmw_hud_box.skin.xml + mygui/openmw_hud_energybar.skin.xml + mygui/openmw_hud.layout + mygui/openmw_infobox.layout + mygui/openmw_interactive_messagebox.layout + mygui/openmw_interactive_messagebox_notransp.layout + mygui/openmw_inventory_window.layout + mygui/openmw_journal.layout + mygui/openmw_journal.skin.xml + mygui/openmw_layers.xml + mygui/openmw_lua.xml + mygui/openmw_list.skin.xml + mygui/openmw_mainmenu.layout + mygui/openmw_mainmenu.skin.xml + mygui/openmw_map_window.layout + mygui/openmw_map_window.skin.xml + mygui/openmw_messagebox.layout + mygui/openmw_pointer.xml + mygui/openmw_progress.skin.xml + mygui/openmw_resources.xml + mygui/openmw_scroll.layout + mygui/openmw_scroll.skin.xml + mygui/openmw_settings_window.layout + mygui/openmw_settings.xml + mygui/openmw_spell_window.layout + mygui/openmw_stats_window.layout + mygui/openmw_text_input.layout + mygui/openmw_text.skin.xml + mygui/openmw_tooltips.layout + mygui/openmw_trade_window.layout + mygui/openmw_spell_buying_window.layout + mygui/openmw_windows.skin.xml + mygui/openmw_quickkeys_menu.layout + mygui/openmw_quickkeys_menu_assign.layout + mygui/openmw_itemselection_dialog.layout + mygui/openmw_magicselection_dialog.layout + mygui/openmw_spell_buying_window.layout + mygui/openmw_loading_screen.layout + mygui/openmw_levelup_dialog.layout + mygui/openmw_wait_dialog.layout + mygui/openmw_wait_dialog_progressbar.layout + mygui/openmw_spellcreation_dialog.layout + mygui/openmw_edit_effect.layout + mygui/openmw_enchanting_dialog.layout + mygui/openmw_trainingwindow.layout + mygui/openmw_travel_window.layout + mygui/openmw_persuasion_dialog.layout + mygui/openmw_merchantrepair.layout + mygui/openmw_repair.layout + mygui/openmw_companion_window.layout + mygui/openmw_savegame_dialog.layout + mygui/openmw_recharge_dialog.layout + mygui/openmw_screen_fader.layout + mygui/openmw_screen_fader_hit.layout + mygui/openmw_edit_note.layout + mygui/openmw_debug_window.layout + mygui/openmw_debug_window.skin.xml + mygui/openmw_postprocessor_hud.layout + mygui/openmw_postprocessor_hud.skin.xml + mygui/openmw_jail_screen.layout + mygui/OpenMWResourcePlugin.xml + mygui/skins.xml ) foreach (f ${BUILTIN_DATA_FILES}) copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}") endforeach (f) + +copy_resource_file("../launcher/images/openmw.png" "${OPENMW_RESOURCES_ROOT}" "resources/openmw.png") diff --git a/files/data/fonts/DejaVuLGCSansMono.omwfont b/files/data/fonts/DejaVuLGCSansMono.omwfont index 184c8a0d8f..8bd6f50174 100644 --- a/files/data/fonts/DejaVuLGCSansMono.omwfont +++ b/files/data/fonts/DejaVuLGCSansMono.omwfont @@ -1,7 +1,7 @@ - + diff --git a/files/data/fonts/OMWAyembedt.omwfont b/files/data/fonts/OMWAyembedt.omwfont index 9af8f655d8..25659da215 100644 --- a/files/data/fonts/OMWAyembedt.omwfont +++ b/files/data/fonts/OMWAyembedt.omwfont @@ -1,7 +1,7 @@ - + diff --git a/files/data/fonts/Pelagiad.omwfont b/files/data/fonts/Pelagiad.omwfont index 4b01a9f308..e06a233b3a 100644 --- a/files/data/fonts/Pelagiad.omwfont +++ b/files/data/fonts/Pelagiad.omwfont @@ -1,7 +1,7 @@ - + diff --git a/files/mygui/OpenMWResourcePlugin.xml b/files/data/mygui/OpenMWResourcePlugin.xml similarity index 100% rename from files/mygui/OpenMWResourcePlugin.xml rename to files/data/mygui/OpenMWResourcePlugin.xml diff --git a/files/mygui/core.skin b/files/data/mygui/core.skin similarity index 100% rename from files/mygui/core.skin rename to files/data/mygui/core.skin diff --git a/files/mygui/core.xml b/files/data/mygui/core.xml similarity index 100% rename from files/mygui/core.xml rename to files/data/mygui/core.xml diff --git a/files/mygui/core_layouteditor.xml b/files/data/mygui/core_layouteditor.xml similarity index 100% rename from files/mygui/core_layouteditor.xml rename to files/data/mygui/core_layouteditor.xml diff --git a/files/mygui/openmw_alchemy_window.layout b/files/data/mygui/openmw_alchemy_window.layout similarity index 100% rename from files/mygui/openmw_alchemy_window.layout rename to files/data/mygui/openmw_alchemy_window.layout diff --git a/files/mygui/openmw_book.layout b/files/data/mygui/openmw_book.layout similarity index 100% rename from files/mygui/openmw_book.layout rename to files/data/mygui/openmw_book.layout diff --git a/files/mygui/openmw_box.skin.xml b/files/data/mygui/openmw_box.skin.xml similarity index 100% rename from files/mygui/openmw_box.skin.xml rename to files/data/mygui/openmw_box.skin.xml diff --git a/files/mygui/openmw_button.skin.xml b/files/data/mygui/openmw_button.skin.xml similarity index 100% rename from files/mygui/openmw_button.skin.xml rename to files/data/mygui/openmw_button.skin.xml diff --git a/files/mygui/openmw_chargen_birth.layout b/files/data/mygui/openmw_chargen_birth.layout similarity index 100% rename from files/mygui/openmw_chargen_birth.layout rename to files/data/mygui/openmw_chargen_birth.layout diff --git a/files/mygui/openmw_chargen_class.layout b/files/data/mygui/openmw_chargen_class.layout similarity index 100% rename from files/mygui/openmw_chargen_class.layout rename to files/data/mygui/openmw_chargen_class.layout diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/data/mygui/openmw_chargen_class_description.layout similarity index 100% rename from files/mygui/openmw_chargen_class_description.layout rename to files/data/mygui/openmw_chargen_class_description.layout diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/data/mygui/openmw_chargen_create_class.layout similarity index 100% rename from files/mygui/openmw_chargen_create_class.layout rename to files/data/mygui/openmw_chargen_create_class.layout diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/data/mygui/openmw_chargen_generate_class_result.layout similarity index 100% rename from files/mygui/openmw_chargen_generate_class_result.layout rename to files/data/mygui/openmw_chargen_generate_class_result.layout diff --git a/files/mygui/openmw_chargen_race.layout b/files/data/mygui/openmw_chargen_race.layout similarity index 100% rename from files/mygui/openmw_chargen_race.layout rename to files/data/mygui/openmw_chargen_race.layout diff --git a/files/mygui/openmw_chargen_review.layout b/files/data/mygui/openmw_chargen_review.layout similarity index 100% rename from files/mygui/openmw_chargen_review.layout rename to files/data/mygui/openmw_chargen_review.layout diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/data/mygui/openmw_chargen_select_attribute.layout similarity index 100% rename from files/mygui/openmw_chargen_select_attribute.layout rename to files/data/mygui/openmw_chargen_select_attribute.layout diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/data/mygui/openmw_chargen_select_skill.layout similarity index 100% rename from files/mygui/openmw_chargen_select_skill.layout rename to files/data/mygui/openmw_chargen_select_skill.layout diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/data/mygui/openmw_chargen_select_specialization.layout similarity index 100% rename from files/mygui/openmw_chargen_select_specialization.layout rename to files/data/mygui/openmw_chargen_select_specialization.layout diff --git a/files/mygui/openmw_companion_window.layout b/files/data/mygui/openmw_companion_window.layout similarity index 100% rename from files/mygui/openmw_companion_window.layout rename to files/data/mygui/openmw_companion_window.layout diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/data/mygui/openmw_confirmation_dialog.layout similarity index 100% rename from files/mygui/openmw_confirmation_dialog.layout rename to files/data/mygui/openmw_confirmation_dialog.layout diff --git a/files/mygui/openmw_console.layout b/files/data/mygui/openmw_console.layout similarity index 100% rename from files/mygui/openmw_console.layout rename to files/data/mygui/openmw_console.layout diff --git a/files/mygui/openmw_console.skin.xml b/files/data/mygui/openmw_console.skin.xml similarity index 100% rename from files/mygui/openmw_console.skin.xml rename to files/data/mygui/openmw_console.skin.xml diff --git a/files/mygui/openmw_container_window.layout b/files/data/mygui/openmw_container_window.layout similarity index 100% rename from files/mygui/openmw_container_window.layout rename to files/data/mygui/openmw_container_window.layout diff --git a/files/mygui/openmw_count_window.layout b/files/data/mygui/openmw_count_window.layout similarity index 100% rename from files/mygui/openmw_count_window.layout rename to files/data/mygui/openmw_count_window.layout diff --git a/files/mygui/openmw_debug_window.layout b/files/data/mygui/openmw_debug_window.layout similarity index 100% rename from files/mygui/openmw_debug_window.layout rename to files/data/mygui/openmw_debug_window.layout diff --git a/files/mygui/openmw_debug_window.skin.xml b/files/data/mygui/openmw_debug_window.skin.xml similarity index 100% rename from files/mygui/openmw_debug_window.skin.xml rename to files/data/mygui/openmw_debug_window.skin.xml diff --git a/files/mygui/openmw_dialogue_window.layout b/files/data/mygui/openmw_dialogue_window.layout similarity index 100% rename from files/mygui/openmw_dialogue_window.layout rename to files/data/mygui/openmw_dialogue_window.layout diff --git a/files/mygui/openmw_dialogue_window.skin.xml b/files/data/mygui/openmw_dialogue_window.skin.xml similarity index 100% rename from files/mygui/openmw_dialogue_window.skin.xml rename to files/data/mygui/openmw_dialogue_window.skin.xml diff --git a/files/mygui/openmw_edit.skin.xml b/files/data/mygui/openmw_edit.skin.xml similarity index 100% rename from files/mygui/openmw_edit.skin.xml rename to files/data/mygui/openmw_edit.skin.xml diff --git a/files/mygui/openmw_edit_effect.layout b/files/data/mygui/openmw_edit_effect.layout similarity index 100% rename from files/mygui/openmw_edit_effect.layout rename to files/data/mygui/openmw_edit_effect.layout diff --git a/files/mygui/openmw_edit_note.layout b/files/data/mygui/openmw_edit_note.layout similarity index 100% rename from files/mygui/openmw_edit_note.layout rename to files/data/mygui/openmw_edit_note.layout diff --git a/files/mygui/openmw_enchanting_dialog.layout b/files/data/mygui/openmw_enchanting_dialog.layout similarity index 100% rename from files/mygui/openmw_enchanting_dialog.layout rename to files/data/mygui/openmw_enchanting_dialog.layout diff --git a/files/mygui/openmw_hud.layout b/files/data/mygui/openmw_hud.layout similarity index 100% rename from files/mygui/openmw_hud.layout rename to files/data/mygui/openmw_hud.layout diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/data/mygui/openmw_hud_box.skin.xml similarity index 100% rename from files/mygui/openmw_hud_box.skin.xml rename to files/data/mygui/openmw_hud_box.skin.xml diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/data/mygui/openmw_hud_energybar.skin.xml similarity index 100% rename from files/mygui/openmw_hud_energybar.skin.xml rename to files/data/mygui/openmw_hud_energybar.skin.xml diff --git a/files/mygui/openmw_infobox.layout b/files/data/mygui/openmw_infobox.layout similarity index 100% rename from files/mygui/openmw_infobox.layout rename to files/data/mygui/openmw_infobox.layout diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/data/mygui/openmw_interactive_messagebox.layout similarity index 100% rename from files/mygui/openmw_interactive_messagebox.layout rename to files/data/mygui/openmw_interactive_messagebox.layout diff --git a/files/mygui/openmw_interactive_messagebox_notransp.layout b/files/data/mygui/openmw_interactive_messagebox_notransp.layout similarity index 100% rename from files/mygui/openmw_interactive_messagebox_notransp.layout rename to files/data/mygui/openmw_interactive_messagebox_notransp.layout diff --git a/files/mygui/openmw_inventory_window.layout b/files/data/mygui/openmw_inventory_window.layout similarity index 100% rename from files/mygui/openmw_inventory_window.layout rename to files/data/mygui/openmw_inventory_window.layout diff --git a/files/mygui/openmw_itemselection_dialog.layout b/files/data/mygui/openmw_itemselection_dialog.layout similarity index 100% rename from files/mygui/openmw_itemselection_dialog.layout rename to files/data/mygui/openmw_itemselection_dialog.layout diff --git a/files/mygui/openmw_jail_screen.layout b/files/data/mygui/openmw_jail_screen.layout similarity index 100% rename from files/mygui/openmw_jail_screen.layout rename to files/data/mygui/openmw_jail_screen.layout diff --git a/files/mygui/openmw_journal.layout b/files/data/mygui/openmw_journal.layout similarity index 100% rename from files/mygui/openmw_journal.layout rename to files/data/mygui/openmw_journal.layout diff --git a/files/mygui/openmw_journal.skin.xml b/files/data/mygui/openmw_journal.skin.xml similarity index 100% rename from files/mygui/openmw_journal.skin.xml rename to files/data/mygui/openmw_journal.skin.xml diff --git a/files/mygui/openmw_layers.xml b/files/data/mygui/openmw_layers.xml similarity index 100% rename from files/mygui/openmw_layers.xml rename to files/data/mygui/openmw_layers.xml diff --git a/files/mygui/openmw_levelup_dialog.layout b/files/data/mygui/openmw_levelup_dialog.layout similarity index 100% rename from files/mygui/openmw_levelup_dialog.layout rename to files/data/mygui/openmw_levelup_dialog.layout diff --git a/files/mygui/openmw_list.skin.xml b/files/data/mygui/openmw_list.skin.xml similarity index 100% rename from files/mygui/openmw_list.skin.xml rename to files/data/mygui/openmw_list.skin.xml diff --git a/files/mygui/openmw_loading_screen.layout b/files/data/mygui/openmw_loading_screen.layout similarity index 100% rename from files/mygui/openmw_loading_screen.layout rename to files/data/mygui/openmw_loading_screen.layout diff --git a/files/mygui/openmw_lua.xml b/files/data/mygui/openmw_lua.xml similarity index 100% rename from files/mygui/openmw_lua.xml rename to files/data/mygui/openmw_lua.xml diff --git a/files/mygui/openmw_magicselection_dialog.layout b/files/data/mygui/openmw_magicselection_dialog.layout similarity index 100% rename from files/mygui/openmw_magicselection_dialog.layout rename to files/data/mygui/openmw_magicselection_dialog.layout diff --git a/files/mygui/openmw_mainmenu.layout b/files/data/mygui/openmw_mainmenu.layout similarity index 100% rename from files/mygui/openmw_mainmenu.layout rename to files/data/mygui/openmw_mainmenu.layout diff --git a/files/mygui/openmw_mainmenu.skin.xml b/files/data/mygui/openmw_mainmenu.skin.xml similarity index 100% rename from files/mygui/openmw_mainmenu.skin.xml rename to files/data/mygui/openmw_mainmenu.skin.xml diff --git a/files/mygui/openmw_map_window.layout b/files/data/mygui/openmw_map_window.layout similarity index 100% rename from files/mygui/openmw_map_window.layout rename to files/data/mygui/openmw_map_window.layout diff --git a/files/mygui/openmw_map_window.skin.xml b/files/data/mygui/openmw_map_window.skin.xml similarity index 100% rename from files/mygui/openmw_map_window.skin.xml rename to files/data/mygui/openmw_map_window.skin.xml diff --git a/files/mygui/openmw_merchantrepair.layout b/files/data/mygui/openmw_merchantrepair.layout similarity index 100% rename from files/mygui/openmw_merchantrepair.layout rename to files/data/mygui/openmw_merchantrepair.layout diff --git a/files/mygui/openmw_messagebox.layout b/files/data/mygui/openmw_messagebox.layout similarity index 100% rename from files/mygui/openmw_messagebox.layout rename to files/data/mygui/openmw_messagebox.layout diff --git a/files/mygui/openmw_persuasion_dialog.layout b/files/data/mygui/openmw_persuasion_dialog.layout similarity index 100% rename from files/mygui/openmw_persuasion_dialog.layout rename to files/data/mygui/openmw_persuasion_dialog.layout diff --git a/files/mygui/openmw_pointer.xml b/files/data/mygui/openmw_pointer.xml similarity index 100% rename from files/mygui/openmw_pointer.xml rename to files/data/mygui/openmw_pointer.xml diff --git a/files/mygui/openmw_postprocessor_hud.layout b/files/data/mygui/openmw_postprocessor_hud.layout similarity index 100% rename from files/mygui/openmw_postprocessor_hud.layout rename to files/data/mygui/openmw_postprocessor_hud.layout diff --git a/files/mygui/openmw_postprocessor_hud.skin.xml b/files/data/mygui/openmw_postprocessor_hud.skin.xml similarity index 100% rename from files/mygui/openmw_postprocessor_hud.skin.xml rename to files/data/mygui/openmw_postprocessor_hud.skin.xml diff --git a/files/mygui/openmw_progress.skin.xml b/files/data/mygui/openmw_progress.skin.xml similarity index 100% rename from files/mygui/openmw_progress.skin.xml rename to files/data/mygui/openmw_progress.skin.xml diff --git a/files/mygui/openmw_quickkeys_menu.layout b/files/data/mygui/openmw_quickkeys_menu.layout similarity index 100% rename from files/mygui/openmw_quickkeys_menu.layout rename to files/data/mygui/openmw_quickkeys_menu.layout diff --git a/files/mygui/openmw_quickkeys_menu_assign.layout b/files/data/mygui/openmw_quickkeys_menu_assign.layout similarity index 100% rename from files/mygui/openmw_quickkeys_menu_assign.layout rename to files/data/mygui/openmw_quickkeys_menu_assign.layout diff --git a/files/mygui/openmw_recharge_dialog.layout b/files/data/mygui/openmw_recharge_dialog.layout similarity index 100% rename from files/mygui/openmw_recharge_dialog.layout rename to files/data/mygui/openmw_recharge_dialog.layout diff --git a/files/mygui/openmw_repair.layout b/files/data/mygui/openmw_repair.layout similarity index 100% rename from files/mygui/openmw_repair.layout rename to files/data/mygui/openmw_repair.layout diff --git a/files/mygui/openmw_resources.xml b/files/data/mygui/openmw_resources.xml similarity index 100% rename from files/mygui/openmw_resources.xml rename to files/data/mygui/openmw_resources.xml diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/data/mygui/openmw_savegame_dialog.layout similarity index 100% rename from files/mygui/openmw_savegame_dialog.layout rename to files/data/mygui/openmw_savegame_dialog.layout diff --git a/files/mygui/openmw_screen_fader.layout b/files/data/mygui/openmw_screen_fader.layout similarity index 100% rename from files/mygui/openmw_screen_fader.layout rename to files/data/mygui/openmw_screen_fader.layout diff --git a/files/mygui/openmw_screen_fader_hit.layout b/files/data/mygui/openmw_screen_fader_hit.layout similarity index 100% rename from files/mygui/openmw_screen_fader_hit.layout rename to files/data/mygui/openmw_screen_fader_hit.layout diff --git a/files/mygui/openmw_scroll.layout b/files/data/mygui/openmw_scroll.layout similarity index 100% rename from files/mygui/openmw_scroll.layout rename to files/data/mygui/openmw_scroll.layout diff --git a/files/mygui/openmw_scroll.skin.xml b/files/data/mygui/openmw_scroll.skin.xml similarity index 100% rename from files/mygui/openmw_scroll.skin.xml rename to files/data/mygui/openmw_scroll.skin.xml diff --git a/files/mygui/openmw_settings.xml b/files/data/mygui/openmw_settings.xml similarity index 100% rename from files/mygui/openmw_settings.xml rename to files/data/mygui/openmw_settings.xml diff --git a/files/mygui/openmw_settings_window.layout b/files/data/mygui/openmw_settings_window.layout similarity index 100% rename from files/mygui/openmw_settings_window.layout rename to files/data/mygui/openmw_settings_window.layout diff --git a/files/mygui/openmw_spell_buying_window.layout b/files/data/mygui/openmw_spell_buying_window.layout similarity index 100% rename from files/mygui/openmw_spell_buying_window.layout rename to files/data/mygui/openmw_spell_buying_window.layout diff --git a/files/mygui/openmw_spell_window.layout b/files/data/mygui/openmw_spell_window.layout similarity index 100% rename from files/mygui/openmw_spell_window.layout rename to files/data/mygui/openmw_spell_window.layout diff --git a/files/mygui/openmw_spellcreation_dialog.layout b/files/data/mygui/openmw_spellcreation_dialog.layout similarity index 100% rename from files/mygui/openmw_spellcreation_dialog.layout rename to files/data/mygui/openmw_spellcreation_dialog.layout diff --git a/files/mygui/openmw_stats_window.layout b/files/data/mygui/openmw_stats_window.layout similarity index 100% rename from files/mygui/openmw_stats_window.layout rename to files/data/mygui/openmw_stats_window.layout diff --git a/files/mygui/openmw_text.skin.xml b/files/data/mygui/openmw_text.skin.xml similarity index 100% rename from files/mygui/openmw_text.skin.xml rename to files/data/mygui/openmw_text.skin.xml diff --git a/files/mygui/openmw_text_input.layout b/files/data/mygui/openmw_text_input.layout similarity index 100% rename from files/mygui/openmw_text_input.layout rename to files/data/mygui/openmw_text_input.layout diff --git a/files/mygui/openmw_tooltips.layout b/files/data/mygui/openmw_tooltips.layout similarity index 100% rename from files/mygui/openmw_tooltips.layout rename to files/data/mygui/openmw_tooltips.layout diff --git a/files/mygui/openmw_trade_window.layout b/files/data/mygui/openmw_trade_window.layout similarity index 100% rename from files/mygui/openmw_trade_window.layout rename to files/data/mygui/openmw_trade_window.layout diff --git a/files/mygui/openmw_trainingwindow.layout b/files/data/mygui/openmw_trainingwindow.layout similarity index 100% rename from files/mygui/openmw_trainingwindow.layout rename to files/data/mygui/openmw_trainingwindow.layout diff --git a/files/mygui/openmw_travel_window.layout b/files/data/mygui/openmw_travel_window.layout similarity index 100% rename from files/mygui/openmw_travel_window.layout rename to files/data/mygui/openmw_travel_window.layout diff --git a/files/mygui/openmw_wait_dialog.layout b/files/data/mygui/openmw_wait_dialog.layout similarity index 100% rename from files/mygui/openmw_wait_dialog.layout rename to files/data/mygui/openmw_wait_dialog.layout diff --git a/files/mygui/openmw_wait_dialog_progressbar.layout b/files/data/mygui/openmw_wait_dialog_progressbar.layout similarity index 100% rename from files/mygui/openmw_wait_dialog_progressbar.layout rename to files/data/mygui/openmw_wait_dialog_progressbar.layout diff --git a/files/mygui/openmw_windows.skin.xml b/files/data/mygui/openmw_windows.skin.xml similarity index 100% rename from files/mygui/openmw_windows.skin.xml rename to files/data/mygui/openmw_windows.skin.xml diff --git a/files/mygui/skins.xml b/files/data/mygui/skins.xml similarity index 100% rename from files/mygui/skins.xml rename to files/data/mygui/skins.xml diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt deleted file mode 100644 index 4716a7712b..0000000000 --- a/files/mygui/CMakeLists.txt +++ /dev/null @@ -1,101 +0,0 @@ -if (NOT DEFINED OPENMW_RESOURCES_ROOT) - return() -endif() - -# Copy resource files into the build directory -set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(DDIRRELATIVE resources/mygui) - -set(MYGUI_FILES - core.skin - core.xml - core_layouteditor.xml - openmw_alchemy_window.layout - openmw_book.layout - openmw_box.skin.xml - openmw_button.skin.xml - openmw_chargen_birth.layout - openmw_chargen_class_description.layout - openmw_chargen_class.layout - openmw_chargen_create_class.layout - openmw_chargen_generate_class_result.layout - openmw_chargen_race.layout - openmw_chargen_review.layout - openmw_chargen_select_attribute.layout - openmw_chargen_select_skill.layout - openmw_chargen_select_specialization.layout - openmw_confirmation_dialog.layout - openmw_console.layout - openmw_console.skin.xml - openmw_container_window.layout - openmw_count_window.layout - openmw_dialogue_window.layout - openmw_dialogue_window.skin.xml - openmw_edit.skin.xml - openmw_hud_box.skin.xml - openmw_hud_energybar.skin.xml - openmw_hud.layout - openmw_infobox.layout - openmw_interactive_messagebox.layout - openmw_interactive_messagebox_notransp.layout - openmw_inventory_window.layout - openmw_journal.layout - openmw_journal.skin.xml - openmw_layers.xml - openmw_lua.xml - openmw_list.skin.xml - openmw_mainmenu.layout - openmw_mainmenu.skin.xml - openmw_map_window.layout - openmw_map_window.skin.xml - openmw_messagebox.layout - openmw_pointer.xml - openmw_progress.skin.xml - openmw_resources.xml - openmw_scroll.layout - openmw_scroll.skin.xml - openmw_settings_window.layout - openmw_settings.xml - openmw_spell_window.layout - openmw_stats_window.layout - openmw_text_input.layout - openmw_text.skin.xml - openmw_tooltips.layout - openmw_trade_window.layout - openmw_spell_buying_window.layout - openmw_windows.skin.xml - openmw_quickkeys_menu.layout - openmw_quickkeys_menu_assign.layout - openmw_itemselection_dialog.layout - openmw_magicselection_dialog.layout - openmw_spell_buying_window.layout - openmw_loading_screen.layout - openmw_levelup_dialog.layout - openmw_wait_dialog.layout - openmw_wait_dialog_progressbar.layout - openmw_spellcreation_dialog.layout - openmw_edit_effect.layout - openmw_enchanting_dialog.layout - openmw_trainingwindow.layout - openmw_travel_window.layout - openmw_persuasion_dialog.layout - openmw_merchantrepair.layout - openmw_repair.layout - openmw_companion_window.layout - openmw_savegame_dialog.layout - openmw_recharge_dialog.layout - openmw_screen_fader.layout - openmw_screen_fader_hit.layout - openmw_edit_note.layout - openmw_debug_window.layout - openmw_debug_window.skin.xml - openmw_postprocessor_hud.layout - openmw_postprocessor_hud.skin.xml - openmw_jail_screen.layout - ../launcher/images/openmw.png - OpenMWResourcePlugin.xml - skins.xml -) - - -copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${MYGUI_FILES}") diff --git a/files/mygui/DejaVuFontLicense.txt b/files/mygui/DejaVuFontLicense.txt deleted file mode 100644 index 254e2cc42a..0000000000 --- a/files/mygui/DejaVuFontLicense.txt +++ /dev/null @@ -1,99 +0,0 @@ -Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. -Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) - -Bitstream Vera Fonts Copyright ------------------------------- - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is -a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license ("Fonts") and associated -documentation files (the "Font Software"), to reproduce and distribute the -Font Software, including without limitation the rights to use, copy, merge, -publish, distribute, and/or sell copies of the Font Software, and to permit -persons to whom the Font Software is furnished to do so, subject to the -following conditions: - -The above copyright and trademark notices and this permission notice shall -be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and -additional glyphs or characters may be added to the Fonts, only if the fonts -are renamed to names not containing either the words "Bitstream" or the word -"Vera". - -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Bitstream -Vera" names. - -The Font Software may be sold as part of a larger software package but no -copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME -FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING -ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE -FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome -Foundation, and Bitstream Inc., shall not be used in advertising or -otherwise to promote the sale, use or other dealings in this Font Software -without prior written authorization from the Gnome Foundation or Bitstream -Inc., respectively. For further information, contact: fonts at gnome dot -org. - -Arev Fonts Copyright ------------------------------- - -Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the fonts accompanying this license ("Fonts") and -associated documentation files (the "Font Software"), to reproduce -and distribute the modifications to the Bitstream Vera Font Software, -including without limitation the rights to use, copy, merge, publish, -distribute, and/or sell copies of the Font Software, and to permit -persons to whom the Font Software is furnished to do so, subject to -the following conditions: - -The above copyright and trademark notices and this permission notice -shall be included in all copies of one or more of the Font Software -typefaces. - -The Font Software may be modified, altered, or added to, and in -particular the designs of glyphs or characters in the Fonts may be -modified and additional glyphs or characters may be added to the -Fonts, only if the fonts are renamed to names not containing either -the words "Tavmjong Bah" or the word "Arev". - -This License becomes null and void to the extent applicable to Fonts -or Font Software that has been modified and is distributed under the -"Tavmjong Bah Arev" names. - -The Font Software may be sold as part of a larger software package but -no copy of one or more of the Font Software typefaces may be sold by -itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL -TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the name of Tavmjong Bah shall not -be used in advertising or otherwise to promote the sale, use or other -dealings in this Font Software without prior written authorization -from Tavmjong Bah. For further information, contact: tavmjong @ free -. fr. - -$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $