From 3801b4b52f1dacc6d82abb9ce5581e23f14319b2 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Thu, 23 Dec 2004 18:43:43 +0000
Subject: [PATCH] Established Editor framework (theoretically).

This was SVN commit r1560.
---
 .../ui/editor/editor_global_arrow_dn.png      |  3 --
 .../ui/editor/editor_global_arrow_lt.png      |  3 --
 .../ui/editor/editor_global_arrow_rt.png      |  3 --
 .../ui/editor/editor_global_arrow_up.png      |  3 --
 .../editor/editor_global_checkbox-cross.png   |  3 --
 .../ui/editor/editor_global_checkbox-tick.png |  3 --
 .../ui/editor/editor_global_checkbox.png      |  3 --
 .../ui/editor/editor_global_corner_lb.png     |  3 --
 .../ui/editor/editor_global_corner_lt.png     |  3 --
 .../ui/editor/editor_global_corner_rb.png     |  3 --
 .../ui/editor/editor_global_corner_rt.png     |  3 --
 .../editor/editor_global_radiobutton-lit.png  |  3 --
 .../ui/editor/editor_global_radiobutton.png   |  3 --
 .../editor_global_sheet_dropdownbutton.png    |  3 --
 ...tor_global_sheet_dropdownbutton_updown.png |  3 --
 .../ui/editor/editor_global_slider_bar_h.png  |  3 --
 .../ui/editor/editor_global_slider_bar_v.png  |  3 --
 .../editor/editor_global_slider_marker_h.png  |  3 --
 .../editor/editor_global_slider_marker_v.png  |  3 --
 .../ui/editor/editor_global_tab-lit.png       |  3 --
 .../textures/ui/editor/editor_global_tab.png  |  3 --
 .../ui/editor/editor_mainborder_lt_corner.png |  3 --
 .../ui/editor/editor_mainborder_rt_corner.png |  3 --
 .../ui/editor/editor_sheet_icon_12x12.png     |  3 --
 .../ui/editor/editor_sheet_icon_15x15.png     |  3 --
 .../ui/editor/editor_sheet_icon_9x9.png       |  3 --
 .../ui/editor/editor_sheet_menu_pane.png      |  3 --
 .../ui/editor/editor_sheet_tool_button.png    |  3 --
 .../ui/editor/editor_sheet_toolbar_button.png |  3 --
 .../data/mods/official/gui/test/1_init.xml    |  4 +++
 .../mods/official/gui/test/2_mainmenu.xml     | 14 ++++----
 .../data/mods/official/gui/test/5_manual.xml  |  8 ++---
 .../data/mods/official/gui/test/7_atlas.xml   |  3 ++
 .../mods/official/gui/test/functions_atlas.js | 11 ++++++-
 .../data/mods/official/gui/test/sprite1.xml   | 32 ++++++++++++-------
 35 files changed, 50 insertions(+), 109 deletions(-)
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_dn.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_lt.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_rt.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_up.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-cross.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-tick.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lb.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lt.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rb.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rt.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton-lit.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton_updown.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_h.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_v.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_h.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_v.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_tab-lit.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_global_tab.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_lt_corner.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_rt_corner.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_12x12.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_15x15.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_9x9.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_sheet_menu_pane.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_sheet_tool_button.png
 delete mode 100644 binaries/data/mods/official/art/textures/ui/editor/editor_sheet_toolbar_button.png

diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_dn.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_dn.png
deleted file mode 100644
index 2c01a77543..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_dn.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48e1f9cc67b5649a3d898562e4e898410d6fdb6181c942e8b0a4127e047aacf6
-size 204
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_lt.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_lt.png
deleted file mode 100644
index 70672c887e..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_lt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40acb478909b863c92f3fd496e0ed30c79793a7bb8da88dbb3ca85f400e49598
-size 191
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_rt.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_rt.png
deleted file mode 100644
index da5eca9a5f..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_rt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8ce36fb37be15a413cb64ccab3100676e7bfb2dde45ae90b4256184092a5f17
-size 192
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_up.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_up.png
deleted file mode 100644
index a1a46774b3..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_arrow_up.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29ee74a8d5372bad846e7950a3ebd3444cd26482e70660a0f21eda1090e91b96
-size 202
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-cross.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-cross.png
deleted file mode 100644
index 69d28f79f3..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-cross.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:beadfdbfbd596c7840379a0cc939324010750e9e001600e26254c61419b77166
-size 273
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-tick.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-tick.png
deleted file mode 100644
index 0569d115e7..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox-tick.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf082597c09e4c7ad3a794923a8261deac3004527f150f7c66eb56382642e859
-size 429
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox.png
deleted file mode 100644
index 3ec165bd30..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_checkbox.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f57627f54daa9a3d33c079cba4847b3de65103c567bbd571a9eb4db791fe6b94
-size 221
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lb.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lb.png
deleted file mode 100644
index c1b970fb75..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lb.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73711ead1b6328eddb88c00cbac17c0d0ef46a543e22f499d47ca9832055c5e8
-size 424
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lt.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lt.png
deleted file mode 100644
index 92fabd5530..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_lt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ef33d5a0f87f3c5ace12244383b5cc3d12640ebd8339d36d3f0f5ff19667241
-size 412
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rb.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rb.png
deleted file mode 100644
index b53ae9564b..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rb.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e02737b9126e11203af9b2dbacecd3e999e311ffc6a1617106aac7b55222c339
-size 417
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rt.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rt.png
deleted file mode 100644
index daf591929f..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_corner_rt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d7035f69dd18071b5d92a1baf9f7c99236845eb3959f1ba689111c540bc91c4
-size 424
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton-lit.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton-lit.png
deleted file mode 100644
index c2371b7fdd..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3899a17417748c8f651cf137da0ef29769f25f0dd0a3162dfcecb35d4b82c2e2
-size 350
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton.png
deleted file mode 100644
index 0f967273b8..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_radiobutton.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f678937fcb128c673566c1cf7f3e3aaec757153fa1baab216762ac13500f376
-size 330
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton.png
deleted file mode 100644
index 55dba01e58..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:345b1b53227db7112c03b68bf774eedede1d836b44f2c5766206cabc97ad213e
-size 350
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton_updown.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton_updown.png
deleted file mode 100644
index 40e38c71eb..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_sheet_dropdownbutton_updown.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7204d1806221c29535c46df6926652630918a93c92320313d16d0e30ad581702
-size 298
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_h.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_h.png
deleted file mode 100644
index f588e94909..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_h.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a34747d05223fe21b163f11be49dc4e00e7c8823ad6901be14266a65820d30ff
-size 578
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_v.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_v.png
deleted file mode 100644
index d37a2716df..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_bar_v.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b07b5fa7b0ec32d59a6cf8b18ff70f480bd6b581a9ee29f513957a81644d344
-size 593
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_h.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_h.png
deleted file mode 100644
index 0522495eea..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_h.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b574d4b645cc40c90466c260ec99bd04884eff8078d06d8c6bacb896cb785352
-size 247
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_v.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_v.png
deleted file mode 100644
index 191446ac87..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_slider_marker_v.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baef5f8fde9cc5a942a622147efa0fbdad03459da5cdb43daccb3d9e05de1e1d
-size 263
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_tab-lit.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_tab-lit.png
deleted file mode 100644
index f07c6263e5..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_tab-lit.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb7f7f99f0dc714fba4ee513130250fa776ec853273e64f171e3c6aa0b7d1c15
-size 572
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_global_tab.png b/binaries/data/mods/official/art/textures/ui/editor/editor_global_tab.png
deleted file mode 100644
index e0a9fb2917..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_global_tab.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbbbf1d32adb6a7ed1ad9e31c711cf8bb952ca9463251d1520afbff2b5b040b9
-size 547
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_lt_corner.png b/binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_lt_corner.png
deleted file mode 100644
index fe5ecc435b..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_lt_corner.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20228cf2747c50eaaa709f510c3140e4067c43f3f89a073bf78bed0882d8f73d
-size 1576
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_rt_corner.png b/binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_rt_corner.png
deleted file mode 100644
index da1cff0b0b..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_mainborder_rt_corner.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f9d0af894192fc5a40c740a9a252bdfa7244cd96226c2d3716b2755ed47e613
-size 1016
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_12x12.png b/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_12x12.png
deleted file mode 100644
index f7e99f281f..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_12x12.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7dd6676a6c39256b48eb00b500f543582ad8a924d520c4ace4f14ef650ad826
-size 279
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_15x15.png b/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_15x15.png
deleted file mode 100644
index d5997ce54d..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_15x15.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a937a168c3587a6dfb48309209f401d301b6b309d6964f30609bc8ff84f880db
-size 2792
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_9x9.png b/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_9x9.png
deleted file mode 100644
index d9e6e756f6..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_icon_9x9.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc8363b70721b237782f99fe3278fff80b1d213a946ce7641b8cd62968eb84c9
-size 374
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_menu_pane.png b/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_menu_pane.png
deleted file mode 100644
index 7d16876a98..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_menu_pane.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f27d4f0c354b98c8841476d1291471fd750dfc19e2eba17d004dc88c5825bf0f
-size 1085
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_tool_button.png b/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_tool_button.png
deleted file mode 100644
index e7f37f24aa..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_tool_button.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a5acb361c57faa86472427ff30b92c40456e3a5433868eaf0a5ddc25558b693
-size 4152
diff --git a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_toolbar_button.png b/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_toolbar_button.png
deleted file mode 100644
index 79e4000a3c..0000000000
--- a/binaries/data/mods/official/art/textures/ui/editor/editor_sheet_toolbar_button.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c46dcdb6a15652c77fdbc677deaa2df5d22f5b2b98fb4d5e451c822c3f11828
-size 286
diff --git a/binaries/data/mods/official/gui/test/1_init.xml b/binaries/data/mods/official/gui/test/1_init.xml
index fc42468e0d..97362b5130 100755
--- a/binaries/data/mods/official/gui/test/1_init.xml
+++ b/binaries/data/mods/official/gui/test/1_init.xml
@@ -35,6 +35,9 @@
         <script file="gui/test/functions_pregame.js"><![CDATA[
         ]]></script>
 
+        <script file="gui/test/functions_atlas.js"><![CDATA[
+        ]]></script>
+
         <script file="gui/test/functions_manual.js"><![CDATA[
         ]]></script>
 
@@ -70,6 +73,7 @@
         <script file="gui/test/functions_session.js"><![CDATA[
 		initCoord();
                 initPreGame();
+		initAtlas();
                 initSession();
         ]]></script>
 
diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index e27b005686..7a273b7ef2 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -22,8 +22,8 @@
 		<object type="button" name="pregame-mainmenu-sp-button" sprite-over="pregame-mainmenu-spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false"
 			tooltip-style="pregame-mainmenu-tooltip" tooltip="Want to move some Dudes around or test something ? Click here to start a new game on the default map.">
 			<action on="Press"><![CDATA[
-						GUIObjectUnhide("pregame_subwindow_bkg");
-						GUIObjectUnhide("pregame_sp_mapsel");
+				GUIObjectUnhide("pregame_subwindow_bkg");
+				GUIObjectUnhide("pregame_sp_mapsel");
 			]]></action>
 		</object>
 
@@ -35,9 +35,11 @@
 			]]></action>
 		</object>
 
-		<object type="button" name="pregame-mainmenu-ed-button" sprite-over="pregame-mainmenu-edbt" size="44.00% 61.50% 62.45% 83.55%" z="101" hidden="false"
+		<object type="button" name="pregame-mainmenu-ed-button" sprite-over="pregame-mainmenu-edbt" size="44.00% 61.50% 63.75% 83.55%" z="101" hidden="false"
 			tooltip-style="pregame-mainmenu-tooltip" tooltip="Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!">
 			<action on="Press"><![CDATA[
+				GUIObjectHide("pregame_gui");
+				GUIObjectUnhide("atlas_gui");
 			]]></action>
 		</object>
 
@@ -74,7 +76,7 @@
 
 	<object type="empty" name="pregame_subwindows" size="0 0 100% 100%" z="1" hidden="false">
 
-		<object type="image" name="pregame_subwindow_bkg" sprite="pregame-mainmenu-tooltip-background" size="0 0 100% 100%" z="105" hidden="true"/>
+		<object type="image" name="pregame_subwindow_bkg" sprite="translucent-background" size="0 0 100% 100%" z="105" hidden="true"/>
 
 			<object type="button" name="pregame_mp_ip" sprite="0ad_window" z="106" hidden="true">
 				<action on="Load"><![CDATA[
@@ -100,7 +102,7 @@
 
 			<object type="text" name="pregame_ip_infotext">
 				<action on="Load"><![CDATA[
-					getGUIObjectByName("pregame_ip_infotext").caption = "You can start a multiplayer game by Direct-IP connect from here. Either \n- enter a map name and click 'Host Game' to host a game or \n- enter an IP and click 'Join Game' to join a game on the IP entered.";
+					getGUIObjectByName("pregame_ip_infotext").caption = "You can start a multiplayer game by Direct-IP connect from here. Either \n- enter a map name and click 'Host Game' to host a game or \n- enter an IP and click 'Join Game' to join a game on the entered IP.";
 					setSizeCoord("pregame_ip_infotext",        crd_pregame_iphost_bkg_x, crd_pregame_iphost_bkg_y, crd_pregame_iphost_bkg_x+crd_pregame_iphost_bkg_width, crd_pregame_iphost_bkg_y+crd_pregame_iphost_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
 				]]></action>
 			</object>
@@ -184,7 +186,7 @@
                         </object>
 
                         <object type="text" name="pregame_sp_infotext" absolute="false" size="10 10 290 60">
-                                Type the name of the map you want to start the game at into the box. The name is realtive to /data/mods/official/maps/scenarios/.
+                                Type the name of the map you want to start into the box. The name is relative to /data/mods/official/maps/scenarios/.
                         </object>
 
                         <object type="text" name="pregame_sp_mapname_txt" absolute="false" textcolor="0 0 0" size="10 90 120 110">
diff --git a/binaries/data/mods/official/gui/test/5_manual.xml b/binaries/data/mods/official/gui/test/5_manual.xml
index 013cc5f67c..a86cf0ac81 100644
--- a/binaries/data/mods/official/gui/test/5_manual.xml
+++ b/binaries/data/mods/official/gui/test/5_manual.xml
@@ -20,7 +20,7 @@
 			}
 		]]></action>
 
-        	<object type="text" name="manual_bkg" sprite="tooltip-background" size="50%-200 0%+50 50%+200 100%-50" font="prospero16" textcolor="255 255 255" z="100" hidden="false" ghost="true">
+        	<object type="text" name="manual_bkg" sprite="translucent-background" size="50%-200 0%+50 50%+200 100%-50" font="prospero16" textcolor="255 255 255" z="100" hidden="false" ghost="true">
 			<action on="Tick"><![CDATA[
 				if (selection.length && !( getGUIObjectByName( "manual_gui" ).hidden ))
 				{
@@ -31,11 +31,11 @@
 
    	    	<object type="button" name="manual_portrait" style="portrait" size="50%-192 0%+80 50%-128 0%+144" z="100" ghost="true"/>
 
-		<object type="text" name="manual_name" sprite="tooltip-background" size="50%-195 0%+149 50%+195 100%-205" font="prospero14" textcolor="255 255 255" z="100" ghost="true"/>
+		<object type="text" name="manual_name" sprite="translucent-background" size="50%-195 0%+149 50%+195 100%-205" font="prospero14" textcolor="255 255 255" z="100" ghost="true"/>
 
 		<!-- Gee needs to implement text clipping, so long text doesn't get clipped to these scroll windows yet. Scroll bars also don't block world input yet. -->
-		<object type="text" name="manual_rollover" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="tooltip-background" size="50%-126 0%+80 50%+195 0%+144" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
-   	    	<object type="text" name="manual_history" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="tooltip-background" size="50%-195 100%-200 50%+195 100%-55" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
+		<object type="text" name="manual_rollover" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="translucent-background" size="50%-126 0%+80 50%+195 0%+144" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
+   	    	<object type="text" name="manual_history" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="translucent-background" size="50%-195 100%-200 50%+195 100%-55" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
 
 		<object type="button" name="manual_exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="50%+184 0%+50 50%+200 0%+66" ghost="false" z="100" hidden="false">
 			<action on="Press"><![CDATA[
diff --git a/binaries/data/mods/official/gui/test/7_atlas.xml b/binaries/data/mods/official/gui/test/7_atlas.xml
index fe129cdb46..1875adcb0f 100644
--- a/binaries/data/mods/official/gui/test/7_atlas.xml
+++ b/binaries/data/mods/official/gui/test/7_atlas.xml
@@ -10,4 +10,7 @@
 
 <objects>
 
+	<object type="empty" name="atlas_gui" size="0 0 100% 100%" z="1" hidden="true">
+	</object>
+
 </objects>
diff --git a/binaries/data/mods/official/gui/test/functions_atlas.js b/binaries/data/mods/official/gui/test/functions_atlas.js
index db3ff7c4ca..2005684a04 100755
--- a/binaries/data/mods/official/gui/test/functions_atlas.js
+++ b/binaries/data/mods/official/gui/test/functions_atlas.js
@@ -1 +1,10 @@
-// Functions for Atlas Scenario Editor
+// Main Atlas Scenario Editor JS Script file
+// Contains functions and code for the game's integrated Scenario Editor.
+
+// ====================================================================
+
+function initAtlas()
+{
+}
+
+// ====================================================================
\ No newline at end of file
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 0db03d558e..322333f073 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -185,6 +185,10 @@
                 <image texture="global/ui_gen_titlebar-right.png" real-texture-placement="0 0 64 32" size="95%-64 0%-10 100%+0 0%+22" />
 	</sprite>
 
+        <sprite name="translucent-background">
+                <image backcolor="0 0 0 85" size="0 0 100% 100%"/>
+        </sprite>
+
         <!--
         ==========================================
         GENERIC ICONS
@@ -255,7 +259,17 @@
 
         <!--
         ==========================================
-        PREGAME GUI
+        PREGAME GUI - BACKCOLOR SPRITES
+        ==========================================
+        -->
+
+        <sprite name="pregame-mainmenu-tooltip-background">
+                <image backcolor="0 0 0 85" size="0 0 100% 100%"/>
+        </sprite>
+
+        <!--
+        ==========================================
+        PREGAME GUI - TEXTURE SPRITES
         ==========================================
         -->
 
@@ -282,14 +296,6 @@
         <sprite name="pregame-mainmenu-edbt">
                 <image texture="pregame/ui_pregame_mainmenu_edbt_over.png" real-texture-placement="1 1 203 161" size="0 0 100% 100%" />
         </sprite>
-        
-        <sprite name="pregame-mainmenu-tooltip-background">
-                <image backcolor="0 0 0 85" size="0 0 100% 100%"/>
-        </sprite>
-
-        <sprite name="session-tooltip-background">
-                <image backcolor="255 255 255" size="0 0 100% 100%" border="true" bordercolor="0 0 0"/>
-        </sprite>
 
         <!--
         ==========================================
@@ -300,13 +306,17 @@
         <sprite name="black_bkg">
                 <image texture="black_bkg_16x16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
         </sprite>
-
+        
         <!--
         ==========================================
-        SESSION GUI
+        SESSION GUI - BACKCOLOR SPRITES
         ==========================================
         -->
 
+        <sprite name="session-tooltip-background">
+                <image backcolor="255 255 255" size="0 0 100% 100%" border="true" bordercolor="0 0 0"/>
+        </sprite>
+
                 <!--
                 ==========================================
                 MAP ORB