From bdc0073b16328b96d87d2f3e5e21211ca87acfd3 Mon Sep 17 00:00:00 2001 From: Acumen Date: Sun, 2 Jan 2005 19:25:22 +0000 Subject: [PATCH] Added product/company watermark to aid in taking official screenshots. Press W to toggle it. This was SVN commit r1613. --- binaries/data/config/system.cfg | 3 +- .../ui/global/ui_gen_watermark_0ad.png | 3 ++ .../ui/global/ui_gen_watermark_wfg.png | 3 ++ .../data/mods/official/gui/test/1_init.xml | 1 + .../data/mods/official/gui/test/9_global.xml | 24 +++++++++++++++ .../official/gui/test/functions_global.js | 29 +++++++++++++++++++ .../data/mods/official/gui/test/sprite1.xml | 14 +++++++++ 7 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_0ad.png create mode 100644 binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_wfg.png diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg index 6157a4e26e..09ba8ef56d 100755 --- a/binaries/data/config/system.cfg +++ b/binaries/data/config/system.cfg @@ -94,7 +94,8 @@ font.misc = verdana16 ; > SYSTEM SETTINGS hotkey.exit = Escape, "Ctrl+F4" ; Exit to desktop. hotkey.screenshot = PrtSc ; Take PNG screenshot. -hotkey.wireframe = W ; Toggle wireframe mode. +hotkey.screenshot.watermark = "W" ; Toggle product/company watermark for official screenshots. +hotkey.wireframe = "Alt+W" ; Toggle wireframe mode. ; > CAMERA SETTINGS hotkey.camera.reset = "H" ; Reset camera rotation to default. diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_0ad.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_0ad.png new file mode 100644 index 0000000000..c4271bd51b --- /dev/null +++ b/binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_0ad.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abefa44890b093eecf73077cc9db5097f5e2a23e46dbd6cf332c4d46463bc9d7 +size 20333 diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_wfg.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_wfg.png new file mode 100644 index 0000000000..530941ef57 --- /dev/null +++ b/binaries/data/mods/official/art/textures/ui/global/ui_gen_watermark_wfg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6387284f35109833588d3872a4759ca82219808fc137bcdbe964d045544d0096 +size 4998 diff --git a/binaries/data/mods/official/gui/test/1_init.xml b/binaries/data/mods/official/gui/test/1_init.xml index 97362b5130..87e8d38ec5 100755 --- a/binaries/data/mods/official/gui/test/1_init.xml +++ b/binaries/data/mods/official/gui/test/1_init.xml @@ -72,6 +72,7 @@