From 0d100f7551d75b9bf85c1107e8334286f2c7e539 Mon Sep 17 00:00:00 2001 From: Jan Borsodi Date: Sun, 12 Sep 2010 14:05:42 +0200 Subject: [PATCH] Added new skins for VScroll, HScroll, List and MultiList. Textures for these widgets are read from mwgui.png, this is only a temporary measure until we can use the dds files properly. Also added layout for race dialog used in character creation. --- extern/mygui_3.0.1/CMakeLists.txt | 3 + extern/mygui_3.0.1/openmw_resources/core.xml | 1 + extern/mygui_3.0.1/openmw_resources/mwgui.png | Bin 0 -> 9807 bytes .../openmw_chargen_race_layout.xml | 71 +++++ .../openmw_resources/openmw_list.skin.xml | 249 ++++++++++++++++++ 5 files changed, 324 insertions(+) create mode 100644 extern/mygui_3.0.1/openmw_resources/mwgui.png create mode 100644 extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml create mode 100644 extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/extern/mygui_3.0.1/CMakeLists.txt index 6aa1f165b8..25568e6a61 100644 --- a/extern/mygui_3.0.1/CMakeLists.txt +++ b/extern/mygui_3.0.1/CMakeLists.txt @@ -30,14 +30,17 @@ configure_file("${SDIR}/Comic.TTF" "${DDIR}/Comic.TTF" COPYONLY) configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY) configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY) configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" COPYONLY) +configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY) configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYONLY) 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_console_layout.xml" "${DDIR}/openmw_console_layout.xml" 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_chargen_race_layout.xml" "${DDIR}/openmw_chargen_race_layout.xml" COPYONLY) configure_file("${SDIR}/openmw_inventory_window_layout.xml" "${DDIR}/openmw_inventory_window_layout.xml" 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) diff --git a/extern/mygui_3.0.1/openmw_resources/core.xml b/extern/mygui_3.0.1/openmw_resources/core.xml index 436616f61c..7fab9bce50 100644 --- a/extern/mygui_3.0.1/openmw_resources/core.xml +++ b/extern/mygui_3.0.1/openmw_resources/core.xml @@ -11,6 +11,7 @@ + diff --git a/extern/mygui_3.0.1/openmw_resources/mwgui.png b/extern/mygui_3.0.1/openmw_resources/mwgui.png new file mode 100644 index 0000000000000000000000000000000000000000..390aefe0363de726e787031bf55eeb1811e2e92c GIT binary patch literal 9807 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 literal 0 HcmV?d00001 diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml new file mode 100644 index 0000000000..e88f49bfa2 --- /dev/null +++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_race_layout.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml new file mode 100644 index 0000000000..09943f739d --- /dev/null +++ b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_BasisSkin type="MainSkin" offset = "0 0 0 0" align = "ALIGN_LEFT ALIGN_TOP"/> + + + + + + + + + + + + + + + + + + + + + + + +