From 0d6035ea681fd7dd78bd33068563e58cd6af2b09 Mon Sep 17 00:00:00 2001 From: Acumen Date: Mon, 7 Mar 2005 18:25:13 +0000 Subject: [PATCH] Committing revised "game session" GUI coordinates (sorry, doesn't make much cosmetic difference, but it's an improvement on the code side). The command buttons and build lists still need to be revised (hence they're upside down -- the coordinate system has flipped), so please note that's a known problem. This was SVN commit r1966. --- binaries/data/config/system.cfg | 8 +- .../data/mods/official/gui/test/4_session.xml | 1268 ++++------------- .../official/gui/test/functions_session.js | 56 +- .../gui/test/functions_session_group_pane.js | 17 +- .../gui/test/functions_session_map_orb.js | 186 ++- .../test/functions_session_resource_pool.js | 72 +- .../gui/test/functions_session_status_orb.js | 301 +++- .../gui/test/functions_session_subwindows.js | 52 +- .../gui/test/functions_session_team_tray.js | 94 +- .../gui/test/functions_utility_coord.js | 1 + .../data/mods/official/gui/test/styles.xml | 96 +- 11 files changed, 897 insertions(+), 1254 deletions(-) diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg index 64353c9644..22b234e65a 100755 --- a/binaries/data/config/system.cfg +++ b/binaries/data/config/system.cfg @@ -75,7 +75,7 @@ font.misc = verdana16 ; GENERAL PREFERENCES: -sound.mastergain = 1.0 +sound.mastergain = 0.1 ; selection.outline.quality = 9; ( higher => very slightly slower, better quality) ; view.scroll.speed = 60 @@ -130,7 +130,7 @@ hotkey.camera.bookmark.save = Ctrl ; +bookmark: Save screen as bookmark. hotkey.camera.bookmark.snap = Alt ; +bookmark: "check up" on bookmark. ; > CONSOLE SETTINGS -hotkey.console.toggle = BackQuote, F10 ; Open/close console. +hotkey.console.toggle = BackQuote, F12 ; Open/close console. hotkey.console.copy = "Ctrl+C" ; Copy from console to clipboard. hotkey.console.paste = Insert, "Ctrl+V" ; Paste clipboard to console. @@ -174,11 +174,11 @@ hotkey.flipgui.toggle = "Alt+G" ; Toggle GUI to top or bottom of screen. hotkey.alwayson.toggle = "Shift+X" ; Toggle always ons (Exit Button, End Game Button). ; > SUBMENU KEYS -hotkey.menu.game = "F10" ; Toggle in-game menu. +hotkey.menu.toggle = "F10" ; Toggle in-game menu. +hotkey.menu.resign = "Alt+X" ; End current game session and return to main menu. ; > HOTKEYS ONLY hotkey.onlinehelp = "F1" ; Enable/disable online manual entry for current selection. -hotkey.endgame = "Alt+X" ; End current game session and return to main menu. hotkey.next.song = "M" ; Start another music track. hotkey.audio.toggle = "Ctrl+A" ; Enable/disable sound. diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml index a58699bcc7..ca04dbeee1 100644 --- a/binaries/data/mods/official/gui/test/4_session.xml +++ b/binaries/data/mods/official/gui/test/4_session.xml @@ -15,779 +15,186 @@ FlipGUI(); ]]> + + + + + + + + + + + + - - -