From d2639645bf177a6befb49f1404d21a56fc24be07 Mon Sep 17 00:00:00 2001 From: teinarss Date: Thu, 30 May 2019 18:10:09 +0200 Subject: [PATCH] Vertical alignment on labels in TD --- mods/cnc/chrome/assetbrowser.yaml | 9 +- mods/cnc/chrome/color-picker.yaml | 4 +- mods/cnc/chrome/connection.yaml | 19 ++-- mods/cnc/chrome/credits.yaml | 4 +- mods/cnc/chrome/dialogs.yaml | 25 ++--- mods/cnc/chrome/editor.yaml | 37 ++++---- mods/cnc/chrome/gamesave-browser.yaml | 4 +- mods/cnc/chrome/gamesave-loading.yaml | 6 +- mods/cnc/chrome/ingame-chat.yaml | 8 +- mods/cnc/chrome/ingame-debug.yaml | 4 +- mods/cnc/chrome/ingame-info.yaml | 4 +- mods/cnc/chrome/ingame-infobriefing.yaml | 2 +- mods/cnc/chrome/ingame-infochat.yaml | 8 +- mods/cnc/chrome/ingame-infoobjectives.yaml | 6 +- mods/cnc/chrome/ingame-infostats.yaml | 13 ++- mods/cnc/chrome/ingame-menu.yaml | 2 +- mods/cnc/chrome/ingame.yaml | 10 +- mods/cnc/chrome/lobby-kickdialogs.yaml | 20 ++-- mods/cnc/chrome/lobby-mappreview.yaml | 30 +++--- mods/cnc/chrome/lobby-music.yaml | 4 +- mods/cnc/chrome/lobby-options.yaml | 2 +- mods/cnc/chrome/lobby-players.yaml | 2 +- mods/cnc/chrome/lobby-servers.yaml | 2 +- mods/cnc/chrome/lobby.yaml | 13 +-- mods/cnc/chrome/mainmenu.yaml | 10 +- mods/cnc/chrome/mapchooser.yaml | 14 +-- mods/cnc/chrome/missionbrowser.yaml | 6 +- mods/cnc/chrome/multiplayer-browser.yaml | 23 +++-- .../cnc/chrome/multiplayer-browserpanels.yaml | 6 +- mods/cnc/chrome/multiplayer-createserver.yaml | 2 +- .../cnc/chrome/multiplayer-directconnect.yaml | 2 +- mods/cnc/chrome/music.yaml | 10 +- mods/cnc/chrome/playerprofile.yaml | 33 +++---- mods/cnc/chrome/replaybrowser.yaml | 8 +- mods/cnc/chrome/settings.yaml | 58 ++++++------ mods/cnc/chrome/tooltips.yaml | 91 ++++++++++++------- 36 files changed, 266 insertions(+), 235 deletions(-) diff --git a/mods/cnc/chrome/assetbrowser.yaml b/mods/cnc/chrome/assetbrowser.yaml index 5abe346f7f..d55e9d928b 100644 --- a/mods/cnc/chrome/assetbrowser.yaml +++ b/mods/cnc/chrome/assetbrowser.yaml @@ -10,7 +10,7 @@ Container@ASSETBROWSER_PANEL: ColorPreviewManager@COLOR_MANAGER: Label@ASSETBROWSER_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -22,7 +22,7 @@ Container@ASSETBROWSER_PANEL: Children: Label@SOURCE_SELECTOR_DESC: X: 15 - Y: 5 + Y: 6 Width: 160 Height: 25 Font: TinyBold @@ -58,7 +58,7 @@ Container@ASSETBROWSER_PANEL: TooltipTemplate: SIMPLE_TOOLTIP Label@FILENAME_DESC: X: 15 - Y: 340 + Y: 341 Width: 160 Height: 25 Font: TinyBold @@ -72,7 +72,7 @@ Container@ASSETBROWSER_PANEL: Type: Filename Label@PALETTE_DESC: X: PARENT_RIGHT - WIDTH - 270 - Y: 30 + Y: 31 Width: 150 Height: 25 Font: Bold @@ -193,6 +193,7 @@ Container@ASSETBROWSER_PANEL: MinimumValue: 0 Label@FRAME_COUNT: X: 445 + Y: 1 Width: 40 Height: 25 Font: TinyBold diff --git a/mods/cnc/chrome/color-picker.yaml b/mods/cnc/chrome/color-picker.yaml index 8d81a0b664..d965b7e21f 100644 --- a/mods/cnc/chrome/color-picker.yaml +++ b/mods/cnc/chrome/color-picker.yaml @@ -96,7 +96,7 @@ Background@COLOR_CHOOSER: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center Text: Preset Colors Container@PRESET_AREA: @@ -121,7 +121,7 @@ Background@COLOR_CHOOSER: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center Text: Custom Colors Container@CUSTOM_AREA: diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml index b535b0aac8..bb1d0b90d2 100644 --- a/mods/cnc/chrome/connection.yaml +++ b/mods/cnc/chrome/connection.yaml @@ -7,7 +7,7 @@ Container@CONNECTING_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -41,7 +41,7 @@ Container@CONNECTIONFAILED_PANEL: LogicTicker@CONNECTION_FAILED_TICKER: Label@TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -51,21 +51,21 @@ Container@CONNECTIONFAILED_PANEL: Background: panel-black Children: Label@CONNECTING_DESC: - Y: 15 + Y: 16 Width: PARENT_RIGHT Height: 25 Text: Failed to connect Font: Bold Align: Center Label@CONNECTION_ERROR: - Y: 40 + Y: 41 Width: PARENT_RIGHT Height: 25 Align: Center Font: Bold Label@PASSWORD_LABEL: X: 40 - Y: 79 + Y: 80 Width: 95 Height: 25 Align: Right @@ -100,7 +100,7 @@ Container@CONNECTION_SWITCHMOD_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -111,7 +111,7 @@ Container@CONNECTION_SWITCHMOD_PANEL: Background: panel-black Children: Label@DESC: - Y: 15 + Y: 16 Width: PARENT_RIGHT Height: 25 Text: This server is running a different mod: @@ -128,19 +128,20 @@ Container@CONNECTION_SWITCHMOD_PANEL: Height: 32 Label@MOD_TITLE: X: 37 + Y: 1 Width: PARENT_RIGHT - 37 Height: 25 Font: Bold Align: Left Label@MOD_VERSION: X: 37 - Y: 15 + Y: 16 Width: PARENT_RIGHT - 37 Height: 25 Font: Tiny Align: Left Label@DESC2: - Y: 80 + Y: 81 Width: PARENT_RIGHT Height: 25 Text: Switch mods and join server? diff --git a/mods/cnc/chrome/credits.yaml b/mods/cnc/chrome/credits.yaml index 0a8e72a7cd..4a32d98a55 100644 --- a/mods/cnc/chrome/credits.yaml +++ b/mods/cnc/chrome/credits.yaml @@ -7,7 +7,7 @@ Container@CREDITS_PANEL: Children: Label@CREDITS_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -37,7 +37,7 @@ Container@CREDITS_PANEL: Y: 15 Width: PARENT_RIGHT - 30 Height: PARENT_BOTTOM - 30 - TopBottomSpacing: 6 + TopBottomSpacing: 8 Children: Label@CREDITS_TEMPLATE: X: 8 diff --git a/mods/cnc/chrome/dialogs.yaml b/mods/cnc/chrome/dialogs.yaml index 1103e4d447..69af7bb12f 100644 --- a/mods/cnc/chrome/dialogs.yaml +++ b/mods/cnc/chrome/dialogs.yaml @@ -12,7 +12,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT - 27 @@ -58,7 +58,7 @@ ScrollPanel@FACTION_DROPDOWN_TEMPLATE: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT - 27 @@ -126,7 +126,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT - 27 @@ -160,12 +160,12 @@ Background@THREEBUTTON_PROMPT: Children: Label@PROMPT_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center Label@PROMPT_TEXT: - Y: 20 + Y: 22 Width: PARENT_RIGHT Height: 20 Font: Bold @@ -203,12 +203,12 @@ Background@TWOBUTTON_PROMPT: Children: Label@PROMPT_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center Label@PROMPT_TEXT: - Y: 15 + Y: 17 Width: PARENT_RIGHT Height: 20 Font: Bold @@ -237,7 +237,7 @@ Container@TEXT_INPUT_PROMPT: Children: Label@PROMPT_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -248,7 +248,7 @@ Container@TEXT_INPUT_PROMPT: Children: Label@PROMPT_TEXT: X: 20 - Y: 10 + Y: 12 Width: PARENT_RIGHT - 40 Height: 25 Font: Bold @@ -289,23 +289,24 @@ ScrollPanel@NEWS_PANEL: Height: 45 Children: Label@TITLE: + Y: 1 Width: PARENT_RIGHT Height: 25 Align: Center Font: Bold Label@AUTHOR_DATETIME: - Y: 25 + Y: 26 Width: PARENT_RIGHT Height: 15 Align: Center Text: by {0} at {1} Font: TinyBold Label@CONTENT: - Y: 45 + Y: 46 Width: PARENT_RIGHT Label@NEWS_STATUS: X: 80 - Y: 0 + Y: 1 Width: PARENT_RIGHT - 80 - 80 - 24 Height: PARENT_BOTTOM Align: Center diff --git a/mods/cnc/chrome/editor.yaml b/mods/cnc/chrome/editor.yaml index 02563f331d..ab37cbe919 100644 --- a/mods/cnc/chrome/editor.yaml +++ b/mods/cnc/chrome/editor.yaml @@ -8,7 +8,7 @@ Container@NEW_MAP_BG: Label@TITLE: Text: New Map Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -19,7 +19,7 @@ Container@NEW_MAP_BG: Children: Label@TILESET_LABEL: X: 25 - Y: 14 + Y: 15 Width: 95 Height: 25 Align: Right @@ -31,7 +31,7 @@ Container@NEW_MAP_BG: Height: 25 Label@WIDTH_LABEL: X: 25 - Y: 49 + Y: 50 Width: 95 Height: 25 Align: Right @@ -46,7 +46,7 @@ Container@NEW_MAP_BG: Type: Integer Label@HEIGHT_LABEL: X: 135 - Y: 49 + Y: 50 Width: 95 Height: 25 Align: Right @@ -85,7 +85,7 @@ Container@SAVE_MAP_PANEL: Label@LABEL_TITLE: Text: Save Map Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -96,7 +96,7 @@ Container@SAVE_MAP_PANEL: Children: Label@TITLE_LABEL: X: 10 - Y: 14 + Y: 15 Width: 95 Height: 25 Align: Right @@ -109,7 +109,7 @@ Container@SAVE_MAP_PANEL: Height: 25 Label@AUTHOR_LABEL: X: 10 - Y: 49 + Y: 50 Width: 95 Height: 25 Align: Right @@ -122,7 +122,7 @@ Container@SAVE_MAP_PANEL: Height: 25 Label@VISIBILITY_LABEL: X: 10 - Y: 84 + Y: 85 Width: 95 Height: 25 Align: Right @@ -136,7 +136,7 @@ Container@SAVE_MAP_PANEL: Font: Regular Label@DIRECTORY_LABEL: X: 10 - Y: 119 + Y: 120 Width: 95 Height: 25 Align: Right @@ -149,7 +149,7 @@ Container@SAVE_MAP_PANEL: Font: Regular Label@FILENAME_LABEL: X: 10 - Y: 154 + Y: 155 Width: 95 Height: 25 Align: Right @@ -231,13 +231,13 @@ Container@EDITOR_WORLD_ROOT: Children: Label@ACTOR_TYPE_LABEL: X: 2 - Y: 1 + Y: 2 Width: 265 Height: 24 Align: Center Font: Bold Label@ACTOR_ID_LABEL: - Y: 29 + Y: 30 Width: 55 Height: 24 Text: ID @@ -249,7 +249,7 @@ Container@EDITOR_WORLD_ROOT: Height: 25 Label@ACTOR_ID_ERROR_LABEL: X: 67 - Y: 54 + Y: 55 Width: 189 Height: 15 Font: TinyBold @@ -263,6 +263,7 @@ Container@EDITOR_WORLD_ROOT: Height: 22 Children: Label@LABEL: + Y: 1 Width: 55 Height: 16 Align: Right @@ -276,7 +277,7 @@ Container@EDITOR_WORLD_ROOT: Height: 27 Children: Label@LABEL: - Y: 1 + Y: 2 Width: 55 Height: 24 Align: Right @@ -361,13 +362,14 @@ Container@EDITOR_WORLD_ROOT: Background: panel-black Children: Label@SEARCH_LABEL: + Y: 1 Width: PARENT_RIGHT - 5 Height: 25 Text: Search: Align: Right Font: TinyBold Label@CATEGORIES_LABEL: - Y: 24 + Y: 25 Width: PARENT_RIGHT - 5 Height: 25 Text: Filter: @@ -443,20 +445,21 @@ Container@EDITOR_WORLD_ROOT: Background: panel-black Children: Label@SEARCH_LABEL: + Y: 1 Width: PARENT_RIGHT - 5 Height: 25 Text: Search: Align: Right Font: TinyBold Label@CATEGORIES_LABEL: - Y: 24 + Y: 25 Width: PARENT_RIGHT - 5 Height: 25 Text: Filter: Align: Right Font: TinyBold Label@OWNERS_LABEL: - Y: 48 + Y: 49 Width: PARENT_RIGHT - 5 Height: 25 Text: Owner: diff --git a/mods/cnc/chrome/gamesave-browser.yaml b/mods/cnc/chrome/gamesave-browser.yaml index 18bbca9627..7b6dca8c31 100644 --- a/mods/cnc/chrome/gamesave-browser.yaml +++ b/mods/cnc/chrome/gamesave-browser.yaml @@ -7,7 +7,7 @@ Container@GAMESAVE_BROWSER_PANEL: Children: Label@LOAD_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -15,7 +15,7 @@ Container@GAMESAVE_BROWSER_PANEL: Visible: False Label@SAVE_TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center diff --git a/mods/cnc/chrome/gamesave-loading.yaml b/mods/cnc/chrome/gamesave-loading.yaml index 6e0ac415dc..754ac425c5 100644 --- a/mods/cnc/chrome/gamesave-loading.yaml +++ b/mods/cnc/chrome/gamesave-loading.yaml @@ -23,7 +23,7 @@ Container@GAMESAVE_LOADING_SCREEN: ImageName: eva Label@VERSION_LABEL: X: WINDOW_RIGHT - 128 - 43 - Y: 115 + Y: 116 Width: 128 Align: Center Shadow: true @@ -33,7 +33,7 @@ Container@GAMESAVE_LOADING_SCREEN: Background: shellmapborder Label@TITLE: Width: WINDOW_RIGHT - Y: 3 * WINDOW_BOTTOM / 4 - 30 + Y: 3 * WINDOW_BOTTOM / 4 - 29 Height: 25 Font: Bold Align: Center @@ -45,7 +45,7 @@ Container@GAMESAVE_LOADING_SCREEN: Height: 20 Label@DESC: Width: WINDOW_RIGHT - Y: 3 * WINDOW_BOTTOM / 4 + 20 + Y: 3 * WINDOW_BOTTOM / 4 + 19 Height: 25 Font: Regular Align: Center diff --git a/mods/cnc/chrome/ingame-chat.yaml b/mods/cnc/chrome/ingame-chat.yaml index 705f366831..991da74634 100644 --- a/mods/cnc/chrome/ingame-chat.yaml +++ b/mods/cnc/chrome/ingame-chat.yaml @@ -46,7 +46,7 @@ Container@CHAT_PANEL: Y: PARENT_BOTTOM - HEIGHT - 30 Width: 550 Height: 164 - TopBottomSpacing: 4 + TopBottomSpacing: 3 ItemSpacing: 4 Align: Bottom Children: @@ -58,13 +58,11 @@ Container@CHAT_PANEL: Label@NAME: X: 3 Width: 50 - Height: 15 - VAlign: Top + Height: 16 Shadow: True Label@TEXT: X: 12 Width: PARENT_RIGHT - 17 - Height: 15 + Height: 16 WordWrap: true - VAlign: Top Shadow: True diff --git a/mods/cnc/chrome/ingame-debug.yaml b/mods/cnc/chrome/ingame-debug.yaml index 4cbb94d018..e6550a4a8d 100644 --- a/mods/cnc/chrome/ingame-debug.yaml +++ b/mods/cnc/chrome/ingame-debug.yaml @@ -4,7 +4,7 @@ Container@DEBUG_PANEL: Height: PARENT_BOTTOM Children: Label@TITLE: - Y: 25 + Y: 26 Font: Bold Text: Debug Options Align: Center @@ -76,7 +76,7 @@ Container@DEBUG_PANEL: Height: 35 Text: Reset Shroud Label@VISUALIZATIONS_TITLE: - Y: 255 + Y: 256 Font: Bold Text: Visualizations Align: Center diff --git a/mods/cnc/chrome/ingame-info.yaml b/mods/cnc/chrome/ingame-info.yaml index 4b68d15526..88b73a89a1 100644 --- a/mods/cnc/chrome/ingame-info.yaml +++ b/mods/cnc/chrome/ingame-info.yaml @@ -8,14 +8,14 @@ Container@GAME_INFO_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0 - 20 + Y: 0 - 17 Text: Game Information Align: Center Font: BigBold Contrast: true Label@TITLE_NO_TABS: Width: PARENT_RIGHT - Y: 15 + Y: 18 Text: Game Information Align: Center Font: BigBold diff --git a/mods/cnc/chrome/ingame-infobriefing.yaml b/mods/cnc/chrome/ingame-infobriefing.yaml index 50d9af761d..daf57c87ec 100644 --- a/mods/cnc/chrome/ingame-infobriefing.yaml +++ b/mods/cnc/chrome/ingame-infobriefing.yaml @@ -26,5 +26,5 @@ Container@MAP_PANEL: Children: Label@MAP_DESCRIPTION: X: 4 - Y: 1 + Y: 2 Width: PARENT_RIGHT - 32 diff --git a/mods/cnc/chrome/ingame-infochat.yaml b/mods/cnc/chrome/ingame-infochat.yaml index d967eb7e98..d59bcc36e1 100644 --- a/mods/cnc/chrome/ingame-infochat.yaml +++ b/mods/cnc/chrome/ingame-infochat.yaml @@ -23,7 +23,7 @@ Container@CHAT_CONTAINER: ScrollPanel@CHAT_SCROLLPANEL: Width: PARENT_RIGHT Height: PARENT_BOTTOM - 30 - TopBottomSpacing: 2 + TopBottomSpacing: 3 ItemSpacing: 2 Children: Container@CHAT_TEMPLATE: @@ -34,13 +34,11 @@ Container@CHAT_CONTAINER: Label@NAME: X: 3 Width: 50 - Height: 15 - VAlign: Top + Height: 16 Shadow: True Label@TEXT: X: 12 Width: PARENT_RIGHT - 17 - Height: 15 + Height: 16 WordWrap: true - VAlign: Top Shadow: True diff --git a/mods/cnc/chrome/ingame-infoobjectives.yaml b/mods/cnc/chrome/ingame-infoobjectives.yaml index 6b22d2e751..403176e2b4 100644 --- a/mods/cnc/chrome/ingame-infoobjectives.yaml +++ b/mods/cnc/chrome/ingame-infoobjectives.yaml @@ -5,14 +5,14 @@ Container@MISSION_OBJECTIVES: Children: Label@MISSION: X: 15 - Y: 15 + Y: 17 Width: 80 Height: 20 Font: MediumBold Text: Mission: Label@MISSION_STATUS: X: 95 - Y: 15 + Y: 17 Width: PARENT_RIGHT - 110 Height: 20 Font: MediumBold @@ -30,7 +30,7 @@ Container@MISSION_OBJECTIVES: Children: Label@OBJECTIVE_TYPE: X: 10 - Y: 0 + Y: 1 Width: 70 Height: PARENT_BOTTOM Align: Center diff --git a/mods/cnc/chrome/ingame-infostats.yaml b/mods/cnc/chrome/ingame-infostats.yaml index 7343ce30ce..ba821c5dd9 100644 --- a/mods/cnc/chrome/ingame-infostats.yaml +++ b/mods/cnc/chrome/ingame-infostats.yaml @@ -8,14 +8,14 @@ Container@SKIRMISH_STATS: Children: Label@MISSION: X: 15 - Y: 10 + Y: 12 Width: 85 Height: 25 Font: MediumBold Text: Mission: Label@STATS_STATUS: X: 100 - Y: 10 + Y: 12 Width: PARENT_RIGHT - 10 Height: 25 Font: MediumBold @@ -35,18 +35,21 @@ Container@SKIRMISH_STATS: Children: Label@NAME: X: 10 + Y: 1 Width: 210 Height: 25 Text: Player Font: Bold Label@FACTION: X: 230 + Y: 1 Width: 120 Height: 25 Text: Faction Font: Bold Label@SCORE: X: 360 + Y: 1 Width: 75 Height: 25 Text: Score @@ -67,13 +70,13 @@ Container@SKIRMISH_STATS: Children: Label@TEAM: X: 6 - Y: 0 - 2 + Y: 0 Width: 160 Height: 20 Font: Bold Label@TEAM_SCORE: X: 360 - Y: 0 - 2 + Y: 0 Width: 75 Height: 20 Font: Bold @@ -103,7 +106,7 @@ Container@SKIRMISH_STATS: Shadow: True Image@FACTIONFLAG: X: 230 - Y: 6 + Y: 4 Width: 32 Height: 16 Label@FACTION: diff --git a/mods/cnc/chrome/ingame-menu.yaml b/mods/cnc/chrome/ingame-menu.yaml index c348620c31..ed8118926a 100644 --- a/mods/cnc/chrome/ingame-menu.yaml +++ b/mods/cnc/chrome/ingame-menu.yaml @@ -14,7 +14,7 @@ Container@INGAME_MENU: ImageName: eva Label@VERSION_LABEL: X: WINDOW_RIGHT - 128 - 43 - Y: 115 + Y: 116 Width: 128 Align: Center Contrast: true diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 03a51c45b2..ba6449e6a8 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -1625,7 +1625,7 @@ Container@PLAYER_WIDGETS: Label@GAME_TIMER: Logic: GameTimerLogic X: 0 - Y: 233 + Y: 234 Width: PARENT_RIGHT Height: 22 Align: Center @@ -1633,7 +1633,7 @@ Container@PLAYER_WIDGETS: WorldLabelWithTooltip@POWER: Logic: IngamePowerCounterLogic X: 35 - Y: 232 + Y: 234 Width: 50 Height: 22 Font: Bold @@ -1643,13 +1643,13 @@ Container@PLAYER_WIDGETS: Children: Image@POWER_ICON: X: 0 - 16 - Y: 5 + Y: 3 ImageCollection: power-icons ImageName: power-normal WorldLabelWithTooltip@CASH: Logic: IngameCashCounterLogic X: PARENT_RIGHT - WIDTH - 35 - Y: 232 + Y: 234 Width: 50 Height: 22 Align: Right @@ -1660,7 +1660,7 @@ Container@PLAYER_WIDGETS: Children: Image@CASH_ICON: X: PARENT_RIGHT - Y: 5 + Y: 3 ImageCollection: cash-icons ImageName: cash-normal Container@PRODUCTION_TYPES: diff --git a/mods/cnc/chrome/lobby-kickdialogs.yaml b/mods/cnc/chrome/lobby-kickdialogs.yaml index 47a22d7d8a..0525fa15ae 100644 --- a/mods/cnc/chrome/lobby-kickdialogs.yaml +++ b/mods/cnc/chrome/lobby-kickdialogs.yaml @@ -5,20 +5,20 @@ Background@KICK_CLIENT_DIALOG: Background: scrollpanel-bg Children: Label@TITLE: - Y: 40 + Y: 41 Width: PARENT_RIGHT Height: 25 Font: Bold Align: Center Label@TEXTA: - Y: 67 + Y: 68 Width: PARENT_RIGHT Height: 25 Font: Regular Align: Center Text: You may also apply a temporary ban, preventing Label@TEXTB: - Y: 85 + Y: 86 Width: PARENT_RIGHT Height: 25 Font: Regular @@ -53,14 +53,14 @@ Background@KICK_SPECTATORS_DIALOG: Background: scrollpanel-bg Children: Label@TITLE: - Y: 40 + Y: 41 Width: PARENT_RIGHT Height: 25 Font: Bold Align: Center Text: Kick Spectators Label@TEXT: - Y: 85 + Y: 86 Width: PARENT_RIGHT Height: 25 Font: Regular @@ -86,21 +86,21 @@ Background@FORCE_START_DIALOG: Background: scrollpanel-bg Children: Label@TITLE: - Y: 40 + Y: 41 Width: PARENT_RIGHT Height: 25 Font: Bold Align: Center Text: Start Game? Label@TEXTA: - Y: 67 + Y: 68 Width: PARENT_RIGHT Height: 25 Font: Regular Align: Center Text: One or more players are not yet ready. Label@TEXTB: - Y: 85 + Y: 86 Width: PARENT_RIGHT Height: 25 Font: Regular @@ -111,7 +111,7 @@ Background@FORCE_START_DIALOG: Children: Label@KICK_WARNING_A: X: 0 - Y: 106 + Y: 107 Width: PARENT_RIGHT Height: 25 Font: Bold @@ -119,7 +119,7 @@ Background@FORCE_START_DIALOG: Text: One or more clients are missing the selected Label@KICK_WARNING_B: X: 0 - Y: 123 + Y: 124 Width: PARENT_RIGHT Height: 25 Font: Bold diff --git a/mods/cnc/chrome/lobby-mappreview.yaml b/mods/cnc/chrome/lobby-mappreview.yaml index a58c625c5a..8f5a3eb729 100644 --- a/mods/cnc/chrome/lobby-mappreview.yaml +++ b/mods/cnc/chrome/lobby-mappreview.yaml @@ -19,7 +19,7 @@ Container@MAP_PREVIEW: Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER LabelWithTooltip@MAP_TITLE: - Y: 172 + Y: 173 Width: PARENT_RIGHT Height: 25 Font: Bold @@ -27,14 +27,14 @@ Container@MAP_PREVIEW: TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP Label@MAP_TYPE: - Y: 187 + Y: 188 Width: PARENT_RIGHT Height: 25 Font: TinyBold Align: Center IgnoreMouseOver: true Label@MAP_AUTHOR: - Y: 200 + Y: 201 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -55,7 +55,7 @@ Container@MAP_PREVIEW: Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER LabelWithTooltip@MAP_TITLE: - Y: 172 + Y: 173 Width: PARENT_RIGHT Height: 25 Font: Bold @@ -63,7 +63,7 @@ Container@MAP_PREVIEW: TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP Label@MAP_STATUS_A: - Y: 187 + Y: 188 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -71,7 +71,7 @@ Container@MAP_PREVIEW: Text: This map is not compatible IgnoreMouseOver: true Label@MAP_STATUS_B: - Y: 200 + Y: 201 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -93,7 +93,7 @@ Container@MAP_PREVIEW: Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER LabelWithTooltip@MAP_TITLE: - Y: 142 + Y: 143 Width: PARENT_RIGHT Height: 25 Font: Bold @@ -101,14 +101,14 @@ Container@MAP_PREVIEW: TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP Label@MAP_TYPE: - Y: 157 + Y: 158 Width: PARENT_RIGHT Height: 25 Font: TinyBold Align: Center IgnoreMouseOver: true Label@MAP_AUTHOR: - Y: 170 + Y: 171 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -134,7 +134,7 @@ Container@MAP_PREVIEW: Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER LabelWithTooltip@MAP_TITLE: - Y: 142 + Y: 143 Width: PARENT_RIGHT Height: 25 Font: Bold @@ -142,7 +142,7 @@ Container@MAP_PREVIEW: TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP Label@MAP_STATUS_SEARCHING: - Y: 157 + Y: 158 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -153,28 +153,28 @@ Container@MAP_PREVIEW: Width: PARENT_RIGHT Children: Label@a: - Y: 157 + Y: 158 Width: PARENT_RIGHT Height: 25 Font: Tiny Align: Center Text: This map was not found on the Label@b: - Y: 170 + Y: 171 Width: PARENT_RIGHT Height: 25 Font: Tiny Align: Center Text: OpenRA Resource Center Label@MAP_STATUS_ERROR: - Y: 157 + Y: 158 Width: PARENT_RIGHT Height: 25 Font: Tiny Align: Center Text: An error occurred during installation Label@MAP_STATUS_DOWNLOADING: - Y: 157 + Y: 158 Width: PARENT_RIGHT Height: 25 Font: Tiny diff --git a/mods/cnc/chrome/lobby-music.yaml b/mods/cnc/chrome/lobby-music.yaml index 647d7e8bf1..64e89fede0 100644 --- a/mods/cnc/chrome/lobby-music.yaml +++ b/mods/cnc/chrome/lobby-music.yaml @@ -5,7 +5,7 @@ Container@LOBBY_MUSIC_BIN: Children: LogicTicker@SONG_WATCHER: Container@LABEL_CONTAINER: - Y: 0 - 25 + Y: 0 - 23 Width: PARENT_RIGHT Children: Label@MUSIC: @@ -133,7 +133,7 @@ Container@LOBBY_MUSIC_BIN: Font: Regular Text: Loop Label@VOLUME_LABEL: - Y: 180 + Y: 182 Width: 65 Height: 25 Align: Right diff --git a/mods/cnc/chrome/lobby-options.yaml b/mods/cnc/chrome/lobby-options.yaml index 869a8fc09a..fb626437ca 100644 --- a/mods/cnc/chrome/lobby-options.yaml +++ b/mods/cnc/chrome/lobby-options.yaml @@ -3,7 +3,7 @@ Container@LOBBY_OPTIONS_BIN: Height: PARENT_BOTTOM Children: Label@TITLE: - Y: 0 - 25 + Y: 0 - 24 Width: PARENT_RIGHT Height: 25 Font: Bold diff --git a/mods/cnc/chrome/lobby-players.yaml b/mods/cnc/chrome/lobby-players.yaml index 5c54e1c9d0..2c2d02d65a 100644 --- a/mods/cnc/chrome/lobby-players.yaml +++ b/mods/cnc/chrome/lobby-players.yaml @@ -4,7 +4,7 @@ Container@LOBBY_PLAYER_BIN: Children: Container@LABEL_CONTAINER: X: 5 - Y: 0 - 25 + Y: 0 - 24 Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: diff --git a/mods/cnc/chrome/lobby-servers.yaml b/mods/cnc/chrome/lobby-servers.yaml index 48f69313e9..6eec02faf8 100644 --- a/mods/cnc/chrome/lobby-servers.yaml +++ b/mods/cnc/chrome/lobby-servers.yaml @@ -4,7 +4,7 @@ Container@LOBBY_SERVERS_BIN: Height: PARENT_BOTTOM Children: Container@LABEL_CONTAINER: - Y: 0 - 25 + Y: 0 - 24 Width: PARENT_RIGHT Children: Label@NAME: diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index 5f9788109a..114d76422d 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -8,7 +8,7 @@ Container@SERVER_LOBBY: ColorPreviewManager@COLOR_MANAGER: Label@SERVER_NAME: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -96,7 +96,7 @@ Container@SERVER_LOBBY: ScrollPanel@CHAT_DISPLAY: Width: PARENT_RIGHT Height: PARENT_BOTTOM - 30 - TopBottomSpacing: 2 + TopBottomSpacing: 3 ItemSpacing: 2 Children: Container@CHAT_TEMPLATE: @@ -108,21 +108,18 @@ Container@SERVER_LOBBY: Label@TIME: X: 3 Width: 50 - Height: 15 - VAlign: Top + Height: 16 Shadow: True Label@NAME: X: 45 Width: 50 - Height: 15 - VAlign: Top + Height: 16 Shadow: True Label@TEXT: X: 55 Width: PARENT_RIGHT - 60 - Height: 15 + Height: 16 WordWrap: true - VAlign: Top Shadow: True Button@CHAT_MODE: Y: PARENT_BOTTOM - HEIGHT diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index f40a9a6940..b3501db434 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -32,7 +32,7 @@ Container@MENU_BACKGROUND: ImageName: eva Label@VERSION_LABEL: X: WINDOW_RIGHT - 128 - 43 - Y: 115 + Y: 116 Width: 128 Align: Center Shadow: true @@ -51,7 +51,7 @@ Container@MENU_BACKGROUND: Children: Label@MAINMENU_LABEL_TITLE: X: 0 - Y: 0 - 30 + Y: 0 - 28 Width: PARENT_RIGHT Height: 20 Text: Main Menu @@ -100,7 +100,7 @@ Container@MENU_BACKGROUND: Children: Label@SINGLEPLAYER_MENU_TITLE: X: 0 - Y: 0 - 30 + Y: 0 - 28 Width: PARENT_RIGHT Height: 20 Text: Singleplayer @@ -138,7 +138,7 @@ Container@MENU_BACKGROUND: Children: Label@EXTRAS_MENU_TITLE: X: 0 - Y: 0 - 30 + Y: 0 - 28 Width: PARENT_RIGHT Height: 20 Text: Extras @@ -189,7 +189,7 @@ Container@MENU_BACKGROUND: Children: Label@MAP_EDITOR_MENU_TITLE: X: 0 - Y: 0 - 30 + Y: 0 - 28 Width: PARENT_RIGHT Height: 20 Text: Map Editor diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index 450d13c11f..71aa340368 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/mods/cnc/chrome/mapchooser.yaml @@ -7,7 +7,7 @@ Container@MAPCHOOSER_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -19,7 +19,7 @@ Container@MAPCHOOSER_PANEL: Children: Label@FILTER_DESC: X: PARENT_RIGHT - WIDTH - 401 - Y: 15 + Y: 16 Width: 60 Height: 25 Font: Bold @@ -32,7 +32,7 @@ Container@MAPCHOOSER_PANEL: Height: 25 Label@FILTER_DESC_JOINER: X: PARENT_RIGHT - WIDTH - 215 - Y: 15 + Y: 16 Width: 30 Height: 25 Font: Bold @@ -90,25 +90,25 @@ Container@MAPCHOOSER_PANEL: IgnoreMouseInput: true Label@TITLE: X: 4 - Y: PARENT_BOTTOM - 48 + Y: PARENT_BOTTOM - 46 Width: PARENT_RIGHT - 8 Align: Center Label@DETAILS: Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM - 34 + Y: PARENT_BOTTOM - 32 Align: Center Font: Tiny Label@AUTHOR: Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM - 22 + Y: PARENT_BOTTOM - 20 Align: Center Font: Tiny Label@SIZE: Width: PARENT_RIGHT - 8 X: 4 - Y: PARENT_BOTTOM - 10 + Y: PARENT_BOTTOM - 8 Align: Center Font: Tiny Button@BUTTON_CANCEL: diff --git a/mods/cnc/chrome/missionbrowser.yaml b/mods/cnc/chrome/missionbrowser.yaml index eefd51bfd8..9a7c56ddab 100644 --- a/mods/cnc/chrome/missionbrowser.yaml +++ b/mods/cnc/chrome/missionbrowser.yaml @@ -6,7 +6,7 @@ Container@MISSIONBROWSER_PANEL: Height: 420 Children: Label@MISSIONBROWSER_TITLE: - Y: 0 - 25 + Y: 0 - 22 Width: PARENT_RIGHT Text: Missions Align: Center @@ -32,7 +32,7 @@ Container@MISSIONBROWSER_PANEL: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT - 27 @@ -70,10 +70,10 @@ Container@MISSIONBROWSER_PANEL: Y: 213 Width: PARENT_RIGHT Height: 142 + TopBottomSpacing: 5 Children: Label@MISSION_DESCRIPTION: X: 4 - Y: 1 Width: PARENT_RIGHT - 32 VAlign: Top Font: Small diff --git a/mods/cnc/chrome/multiplayer-browser.yaml b/mods/cnc/chrome/multiplayer-browser.yaml index bb91f813f2..1ee026a334 100644 --- a/mods/cnc/chrome/multiplayer-browser.yaml +++ b/mods/cnc/chrome/multiplayer-browser.yaml @@ -8,7 +8,7 @@ Container@MULTIPLAYER_PANEL: Label@TITLE: Text: Multiplayer Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -19,7 +19,7 @@ Container@MULTIPLAYER_PANEL: Children: Container@LABEL_CONTAINER: X: 15 - Y: 5 + Y: 6 Width: PARENT_RIGHT Height: PARENT_BOTTOM Children: @@ -63,21 +63,21 @@ Container@MULTIPLAYER_PANEL: Label@OUTDATED_VERSION_LABEL: X: 5 Width: PARENT_RIGHT-10 - Height: 18 + Height: 20 Align: Center Text: You are running an outdated version of OpenRA. Download the latest version from www.openra.net Font: TinyBold Label@UNKNOWN_VERSION_LABEL: X: 5 Width: PARENT_RIGHT-10 - Height: 18 + Height: 20 Align: Center Text: You are running an unrecognized version of OpenRA. Download the latest version from www.openra.net Font: TinyBold Label@PLAYTEST_AVAILABLE_LABEL: X: 5 Width: PARENT_RIGHT-10 - Height: 18 + Height: 20 Align: Center Text: A preview of the next OpenRA release is available for testing. Download the playtest from www.openra.net Font: TinyBold @@ -95,7 +95,6 @@ Container@MULTIPLAYER_PANEL: Visible: false Children: Label@LABEL: - Y: 0 - 1 Font: TinyBold Width: PARENT_RIGHT Height: 20 @@ -146,7 +145,7 @@ Container@MULTIPLAYER_PANEL: Height: 25 Label@PROGRESS_LABEL: X: 15 - Y: 30 + (PARENT_BOTTOM - 75 - HEIGHT) / 2 + Y: 31 + (PARENT_BOTTOM - 75 - HEIGHT) / 2 Width: 582 Height: 25 Font: Bold @@ -170,31 +169,31 @@ Container@MULTIPLAYER_PANEL: Height: PARENT_BOTTOM - 2 TooltipContainer: TOOLTIP_CONTAINER Label@SELECTED_MAP: - Y: 172 + Y: 173 Width: PARENT_RIGHT Height: 25 Font: Bold Align: Center Label@SELECTED_IP: - Y: 187 + Y: 188 Width: PARENT_RIGHT Height: 25 Font: Tiny Align: Center Label@SELECTED_STATUS: - Y: 203 + Y: 204 Width: PARENT_RIGHT Height: 25 Font: TinyBold Align: Center Label@SELECTED_MOD_VERSION: - Y: 216 + Y: 217 Width: PARENT_RIGHT Height: 25 Font: Tiny Align: Center Label@SELECTED_PLAYERS: - Y: 229 + Y: 230 Width: PARENT_RIGHT Height: 25 Font: TinyBold diff --git a/mods/cnc/chrome/multiplayer-browserpanels.yaml b/mods/cnc/chrome/multiplayer-browserpanels.yaml index dcaf842a03..d62ba3bf16 100644 --- a/mods/cnc/chrome/multiplayer-browserpanels.yaml +++ b/mods/cnc/chrome/multiplayer-browserpanels.yaml @@ -13,7 +13,7 @@ ScrollPanel@MULTIPLAYER_CLIENT_LIST: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT - 27 @@ -31,12 +31,12 @@ ScrollPanel@MULTIPLAYER_CLIENT_LIST: Label@LABEL: X: 40 Width: PARENT_RIGHT - 50 - Height: 23 + Height: 25 Shadow: True Label@NOFLAG_LABEL: X: 5 Width: PARENT_RIGHT - Height: 23 + Height: 25 Shadow: True ScrollPanel@MULTIPLAYER_FILTER_PANEL: diff --git a/mods/cnc/chrome/multiplayer-createserver.yaml b/mods/cnc/chrome/multiplayer-createserver.yaml index b04a608316..caed021f28 100644 --- a/mods/cnc/chrome/multiplayer-createserver.yaml +++ b/mods/cnc/chrome/multiplayer-createserver.yaml @@ -7,7 +7,7 @@ Container@MULTIPLAYER_CREATESERVER_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center diff --git a/mods/cnc/chrome/multiplayer-directconnect.yaml b/mods/cnc/chrome/multiplayer-directconnect.yaml index 54e3d9d4a5..07041fb4b3 100644 --- a/mods/cnc/chrome/multiplayer-directconnect.yaml +++ b/mods/cnc/chrome/multiplayer-directconnect.yaml @@ -7,7 +7,7 @@ Container@DIRECTCONNECT_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0-25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index f578b31d30..1384cbedcf 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -8,7 +8,7 @@ Container@MUSIC_PANEL: LogicTicker@SONG_WATCHER: Label@TITLE: Width: 360 - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -45,7 +45,7 @@ Container@MUSIC_PANEL: Height: 25 Container@LABEL_CONTAINER: X: 25 - Y: 5 + Y: 4 Width: 330 Children: Label@TITLE: @@ -139,7 +139,7 @@ Container@MUSIC_PANEL: Ticks: 7 Label@TIME_LABEL: X: (PARENT_RIGHT - WIDTH) / 2 - Y: 315 + Y: 317 Width: 140 Height: 25 Align: Center @@ -159,7 +159,7 @@ Container@MUSIC_PANEL: Text: Loop Container@NO_MUSIC_LABEL: X: 15 - Y: 120 + Y: 121 Width: 330 Height: 60 Visible: false @@ -191,7 +191,7 @@ Container@MUSIC_PANEL: Text: Back Label@MUTE_LABEL: X: 100 - Y: 337 + Y: 339 Width: 300 Height: 20 Font: Small diff --git a/mods/cnc/chrome/playerprofile.yaml b/mods/cnc/chrome/playerprofile.yaml index 9c5b1cc290..9c2c6fbb45 100644 --- a/mods/cnc/chrome/playerprofile.yaml +++ b/mods/cnc/chrome/playerprofile.yaml @@ -10,13 +10,13 @@ Container@LOCAL_PROFILE_PANEL: Children: Label@PROFILE_NAME: X: 10 - Y: 3 + Y: 5 Width: PARENT_RIGHT - 20 Height: 25 Font: MediumBold Label@PROFILE_RANK: X: 10 - Y: 23 + Y: 24 Width: PARENT_RIGHT - 20 Height: 25 Font: TinyBold @@ -38,21 +38,21 @@ Container@LOCAL_PROFILE_PANEL: Background: panel-black Children: Label@DESC_A: - Y: 5 + Y: 6 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: Connect to a forum account to identify Label@DESC_B: - Y: 21 + Y: 22 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: yourself to other players, join private Label@DESC_C: - Y: 37 + Y: 38 Width: PARENT_RIGHT Height: 25 Font: Small @@ -71,14 +71,14 @@ Container@LOCAL_PROFILE_PANEL: Background: panel-black Children: Label@DESC_A: - Y: 13 + Y: 14 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: Generating authentication key pair. Label@DESC_B: - Y: 29 + Y: 30 Width: PARENT_RIGHT Height: 25 Font: Small @@ -96,21 +96,21 @@ Container@LOCAL_PROFILE_PANEL: Background: panel-black Children: Label@DESC_A: - Y: 2 + Y: 3 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: An authentication key has been copied to your Label@DESC_B: - Y: 18 + Y: 19 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: clipboard. Add this to your User Control Panel Label@DESC_C: - Y: 34 + Y: 35 Width: PARENT_RIGHT Height: 25 Font: Small @@ -136,14 +136,14 @@ Container@LOCAL_PROFILE_PANEL: Background: panel-black Children: Label@DESC_A: - Y: 13 + Y: 14 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: Querying account details from Label@DESC_B: - Y: 29 + Y: 30 Width: PARENT_RIGHT Height: 25 Font: Small @@ -161,14 +161,14 @@ Container@LOCAL_PROFILE_PANEL: Background: panel-black Children: Label@DESC_A: - Y: 13 + Y: 14 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: Your authentication key is not connected Label@DESC_B: - Y: 29 + Y: 30 Width: PARENT_RIGHT Height: 25 Font: Small @@ -187,14 +187,14 @@ Container@LOCAL_PROFILE_PANEL: Background: panel-black Children: Label@DESC_A: - Y: 13 + Y: 14 Width: PARENT_RIGHT Height: 25 Font: Small Align: Center Text: Failed to connect to the OpenRA forum. Label@DESC_B: - Y: 29 + Y: 30 Width: PARENT_RIGHT Height: 25 Font: Small @@ -223,6 +223,7 @@ Container@PLAYER_PROFILE_BADGES_INSERT: Height: 24 Label@LABEL: X: 36 + Y: 2 Width: PARENT_RIGHT - 60 Height: 24 Font: Bold diff --git a/mods/cnc/chrome/replaybrowser.yaml b/mods/cnc/chrome/replaybrowser.yaml index 26272e6809..bcd469be1c 100644 --- a/mods/cnc/chrome/replaybrowser.yaml +++ b/mods/cnc/chrome/replaybrowser.yaml @@ -7,7 +7,7 @@ Container@REPLAYBROWSER_PANEL: Children: Label@TITLE: Width: PARENT_RIGHT - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -139,6 +139,7 @@ Container@REPLAYBROWSER_PANEL: Height: 115 Children: Label@MANAGE_TITLE: + Y: 1 Width: PARENT_RIGHT Height: 25 Font: Bold @@ -171,6 +172,7 @@ Container@REPLAYBROWSER_PANEL: Height: PARENT_BOTTOM - 20 - 20 Children: Label@REPLAYBROWSER_LABEL_TITLE: + Y: 1 Width: PARENT_RIGHT Height: 25 Text: Choose Replay @@ -208,7 +210,7 @@ Container@REPLAYBROWSER_PANEL: Height: PARENT_BOTTOM - 260 Children: Label@DURATION: - Y: 20 + Y: 21 Width: PARENT_RIGHT Height: 15 Font: Tiny @@ -229,7 +231,7 @@ Container@REPLAYBROWSER_PANEL: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center ScrollItem@TEMPLATE: Width: PARENT_RIGHT - 27 diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml index b802211878..f9e60e0ea1 100644 --- a/mods/cnc/chrome/settings.yaml +++ b/mods/cnc/chrome/settings.yaml @@ -32,7 +32,7 @@ Container@SETTINGS_PANEL: Children: Label@TITLE: Width: 590 - Y: 0 - 25 + Y: 0 - 22 Font: BigBold Contrast: true Align: Center @@ -69,14 +69,14 @@ Container@SETTINGS_PANEL: Height: PARENT_BOTTOM Children: Label@VIDEO_TITLE: - Y: 20 + Y: 21 Width: PARENT_RIGHT Font: Bold Text: Display Align: Center Label@MODE_LABEL: X: 110 - Y: 39 + Y: 40 Width: 45 Height: 25 Align: Right @@ -95,7 +95,7 @@ Container@SETTINGS_PANEL: Label@At: Text: @ Font: Bold - Y: 0 - 1 + Y: 0 Height: 25 Width: 25 Align: Center @@ -109,7 +109,7 @@ Container@SETTINGS_PANEL: Text: x Font: Bold X: 70 - Y: 0 - 1 + Y: 0 Height: 25 Width: 15 Align: Center @@ -127,7 +127,7 @@ Container@SETTINGS_PANEL: Font: Regular Text: Use Hardware Cursors Label@VIDEO_DESC: - Y: 93 + Y: 92 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -156,7 +156,7 @@ Container@SETTINGS_PANEL: Text: Also Double Cursor Label@FRAME_LIMIT_DESC_A: X: 45 - Y: 152 + Y: 153 Width: 50 Height: 25 Text: Limit to @@ -170,7 +170,7 @@ Container@SETTINGS_PANEL: Type: Integer Label@FRAME_LIMIT_DESC_B: X: 150 - Y: 152 + Y: 153 Height: 25 Text: FPS Checkbox@PLAYER_STANCE_COLORS_CHECKBOX: @@ -183,7 +183,7 @@ Container@SETTINGS_PANEL: Label@PLAYER: Text: Player: X: 15 - Y: 195 + Y: 197 TextField@PLAYERNAME: Text: Name X: 65 @@ -206,7 +206,7 @@ Container@SETTINGS_PANEL: Height: PARENT_BOTTOM - 12 Label@STATUS_BARS: X: 310 - Y: 255 + Y: 257 Text: Status Bars: DropDownButton@STATUS_BAR_DROPDOWN: X: 400 @@ -265,14 +265,14 @@ Container@SETTINGS_PANEL: Height: PARENT_BOTTOM Children: Label@AUDIO_TITLE: - Y: 20 + Y: 21 Width: PARENT_RIGHT Font: Bold Text: Audio Align: Center Label@SOUND_LABEL: X: PARENT_RIGHT - WIDTH - 270 - Y: 37 + Y: 38 Width: 95 Height: 25 Align: Right @@ -299,7 +299,7 @@ Container@SETTINGS_PANEL: Text: Mute Sound Label@MUSIC_LABEL: X: PARENT_RIGHT - WIDTH - 270 - Y: 67 + Y: 68 Width: 95 Height: 25 Align: Right @@ -312,7 +312,7 @@ Container@SETTINGS_PANEL: Ticks: 7 Label@VIDEO_LABEL: X: PARENT_RIGHT - WIDTH - 270 - Y: 97 + Y: 98 Width: 95 Height: 25 Align: Right @@ -325,7 +325,7 @@ Container@SETTINGS_PANEL: Ticks: 7 Label@AUDIO_DEVICE_LABEL: X: 190 - WIDTH - 5 - Y: 244 + Y: 245 Width: 75 Height: 25 Align: Right @@ -336,7 +336,7 @@ Container@SETTINGS_PANEL: Width: 300 Height: 25 Label@AUDIO_DEVICE_DESC: - Y: 265 + Y: 266 Width: PARENT_RIGHT Height: 25 Font: Tiny @@ -347,7 +347,7 @@ Container@SETTINGS_PANEL: Height: PARENT_BOTTOM Children: Label@INPUT_TITLE: - Y: 20 + Y: 21 Width: PARENT_RIGHT Font: Bold Text: Input @@ -361,7 +361,7 @@ Container@SETTINGS_PANEL: Text: Left-click Orders Label@MIDDLE_MOUSE_SCROLL_LABEL: X: PARENT_RIGHT - WIDTH - 120 - Y: 39 + Y: 41 Width: 160 Height: 20 Font: Regular @@ -375,7 +375,7 @@ Container@SETTINGS_PANEL: Font: Regular Label@MIDDLE_MOUSE_SCROLL_LABEL: X: PARENT_RIGHT - WIDTH - 120 - Y: 69 + Y: 71 Width: 160 Height: 20 Font: Regular @@ -389,7 +389,7 @@ Container@SETTINGS_PANEL: Font: Regular Label@ZOOM_MODIFIER_LABEL: X: PARENT_RIGHT - WIDTH - 120 - Y: 98 + Y: 101 Width: 160 Height: 20 Font: Regular @@ -425,7 +425,7 @@ Container@SETTINGS_PANEL: Text: Lock Mouse to Window Label@SCROLL_SPEED_LABEL: X: PARENT_RIGHT - WIDTH - 270 - Y: 127 + Y: 128 Width: 95 Height: 25 Text: Scroll Speed: @@ -440,7 +440,7 @@ Container@SETTINGS_PANEL: MaximumValue: 50 Label@UI_SCROLL_SPEED_LABEL: X: PARENT_RIGHT - WIDTH - 106 - Y: 127 + Y: 128 Width: 95 Height: 25 Text: UI Scroll: @@ -454,7 +454,7 @@ Container@SETTINGS_PANEL: MinimumValue: 1 MaximumValue: 100 Label@HOTKEYS_TITLE: - Y: 165 + Y: 166 Width: PARENT_RIGHT Font: Bold Text: Hotkeys @@ -475,7 +475,7 @@ Container@SETTINGS_PANEL: Label@LABEL: Font: TinyBold Width: PARENT_RIGHT - Height: 10 + Height: 13 Align: Center Container@TEMPLATES: Children: @@ -485,7 +485,7 @@ Container@SETTINGS_PANEL: Visible: false Children: Label@FUNCTION: - Y: 0 - 1 + Y: 0 Width: PARENT_RIGHT - 85 Height: 25 Align: Right @@ -512,7 +512,7 @@ Container@SETTINGS_PANEL: Height: PARENT_BOTTOM Children: Label@ADVANCED_TITLE: - Y: 20 + Y: 21 Width: PARENT_RIGHT Font: Bold Text: Advanced @@ -561,20 +561,20 @@ Container@SETTINGS_PANEL: Text: Send System Information Label@SENDSYSINFO_DESC: X: 310 - Y: 115 + Y: 116 Width: 250 Height: 30 Font: Tiny WordWrap: True Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development. Label@DEBUG_TITLE: - Y: 200 + Y: 201 Width: PARENT_RIGHT Font: Bold Text: Developer Align: Center Container@DEBUG_HIDDEN_LABEL: - Y: 250 + Y: 252 Width: PARENT_RIGHT Children: Label@A: diff --git a/mods/cnc/chrome/tooltips.yaml b/mods/cnc/chrome/tooltips.yaml index f1c6e2ff2b..054651d2d4 100644 --- a/mods/cnc/chrome/tooltips.yaml +++ b/mods/cnc/chrome/tooltips.yaml @@ -8,7 +8,7 @@ Background@SIMPLE_TOOLTIP: Height: 19 Label@LABEL: X: 5 - Y: 0 - 2 + Y: 0 - 1 Height: 23 Font: Bold @@ -22,27 +22,29 @@ Background@SIMPLE_TOOLTIP_FACTIONSUFFIX: Height: 19 Label@LABEL: X: 5 - Y: 0 - 2 + Y: 0 - 1 Height: 23 Font: Bold Background@BUTTON_TOOLTIP: Logic: ButtonTooltipLogic Background: panel-black - Height: 25 + Height: 26 Children: Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Label@HOTKEY: + Y: 1 Visible: false TextColor: FFFF00 Height: 23 Font: Bold Label@DESC: X: 5 - Y: 23 + Y: 26 Height: 12 Font: TinyBold VAlign: Top @@ -50,20 +52,22 @@ Background@BUTTON_TOOLTIP: Background@BUTTON_TOOLTIP_FACTIONSUFFIX: Logic: ButtonTooltipLogic, AddFactionSuffixLogic Background: panel-black - Height: 25 + Height: 26 Children: Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Label@HOTKEY: + Y: 1 Visible: false TextColor: FFFF00 Height: 23 Font: Bold Label@DESC: X: 5 - Y: 23 + Y: 26 Height: 12 Font: TinyBold VAlign: Top @@ -72,20 +76,22 @@ Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP: Logic: ButtonTooltipWithDescHighlightLogic Highlight: FFFF00 Background: panel-black - Height: 25 + Height: 26 Children: Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Label@HOTKEY: + Y: 1 Visible: false TextColor: FFFF00 Height: 23 Font: Bold Label@DESC: X: 5 - Y: 23 + Y: 26 Height: 12 Font: TinyBold VAlign: Top @@ -94,20 +100,22 @@ Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP_FACTIONSUFFIX: Logic: ButtonTooltipWithDescHighlightLogic, AddFactionSuffixLogic Highlight: FFFF00 Background: panel-black - Height: 25 + Height: 26 Children: Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Label@HOTKEY: + Y: 1 Visible: false TextColor: FFFF00 Height: 23 Font: Bold Label@DESC: X: 5 - Y: 23 + Y: 26 Height: 12 Font: TinyBold VAlign: Top @@ -117,11 +125,12 @@ Background@WORLD_TOOLTIP: Background: panel-black Children: Container@SINGLE_HEIGHT: - Height: 25 + Height: 26 Container@DOUBLE_HEIGHT: Height: 45 Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Image@FLAG: @@ -131,7 +140,7 @@ Background@WORLD_TOOLTIP: Height: 16 Label@OWNER: X: 42 - Y: 19 + Y: 20 Height: 23 Font: Bold Shadow: True @@ -146,11 +155,12 @@ Background@WORLD_TOOLTIP_FACTIONSUFFIX: Background: panel-black Children: Container@SINGLE_HEIGHT: - Height: 25 + Height: 26 Container@DOUBLE_HEIGHT: Height: 45 Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Image@FLAG: @@ -160,13 +170,13 @@ Background@WORLD_TOOLTIP_FACTIONSUFFIX: Height: 16 Label@OWNER: X: 42 - Y: 19 + Y: 20 Height: 23 Font: Bold Shadow: True Label@EXTRA: X: 5 - Y: 47 + Y: 49 Height: 5 Font: Bold @@ -178,33 +188,37 @@ Background@PRODUCTION_TOOLTIP: Children: Label@NAME: X: 5 + Y: 1 Height: 23 Font: Bold Label@HOTKEY: + Y: 1 Visible: false Height: 23 TextColor: FFFF00 Font: Bold Label@REQUIRES: X: 5 - Y: 19 + Y: 20 Height: 15 Font: TinyBold Text: Requires {0} Label@DESC: X: 5 - Y: 19 + Y: 20 Height: 5 Font: TinyBold VAlign: Top Image@COST_ICON: + X: 3 Y: 5 Width: 16 Height: 16 ImageCollection: sidebar-bits ImageName: production-tooltip-cost Label@COST: - Height: 23 + Y: 1 + Height: 24 Font: Bold Image@TIME_ICON: X: 3 @@ -214,7 +228,7 @@ Background@PRODUCTION_TOOLTIP: ImageCollection: sidebar-bits ImageName: production-tooltip-time Label@TIME: - Y: 19 + Y: 20 Height: 23 Font: Bold Image@POWER_ICON: @@ -224,7 +238,7 @@ Background@PRODUCTION_TOOLTIP: ImageCollection: sidebar-bits ImageName: production-tooltip-power Label@POWER: - Y: 39 + Y: 40 Height: 23 Font: Bold @@ -236,22 +250,24 @@ Background@PRODUCTION_TOOLTIP_FACTIONSUFFIX: Children: Label@NAME: X: 5 + Y: 1 Height: 23 Font: Bold Label@HOTKEY: + Y: 1 Visible: false Height: 23 TextColor: FFFF00 Font: Bold Label@REQUIRES: X: 5 - Y: 19 + Y: 20 Height: 15 Font: TinyBold Text: Requires {0} Label@DESC: X: 5 - Y: 19 + Y: 20 Height: 5 Font: TinyBold VAlign: Top @@ -262,6 +278,7 @@ Background@PRODUCTION_TOOLTIP_FACTIONSUFFIX: ImageCollection: sidebar-bits ImageName: production-tooltip-cost Label@COST: + Y: 1 Height: 23 Font: Bold Image@TIME_ICON: @@ -272,7 +289,7 @@ Background@PRODUCTION_TOOLTIP_FACTIONSUFFIX: ImageCollection: sidebar-bits ImageName: production-tooltip-time Label@TIME: - Y: 19 + Y: 20 Height: 23 Font: Bold Image@POWER_ICON: @@ -282,7 +299,7 @@ Background@PRODUCTION_TOOLTIP_FACTIONSUFFIX: ImageCollection: sidebar-bits ImageName: production-tooltip-power Label@POWER: - Y: 39 + Y: 40 Height: 23 Font: Bold @@ -290,7 +307,7 @@ Background@SUPPORT_POWER_TOOLTIP: Logic: SupportPowerTooltipLogic Background: panel-black Width: 200 - Height: 25 + Height: 27 Children: Label@NAME: X: 5 @@ -315,24 +332,26 @@ Background@SUPPORT_POWER_TOOLTIP_FACTIONSUFFIX: Logic: SupportPowerTooltipLogic, AddFactionSuffixLogic Background: panel-black Width: 200 - Height: 25 + Height: 27 Children: Label@NAME: X: 5 + Y: 2 Height: 20 Font: Bold Label@HOTKEY: + Y: 2 Visible: false Height: 20 TextColor: FFFF00 Font: Bold Label@TIME: - Y: 6 + Y: 8 Font: TinyBold VAlign: Top Label@DESC: X: 5 - Y: 20 + Y: 22 Font: TinyBold VAlign: Top @@ -347,6 +366,7 @@ Background@SPAWN_TOOLTIP: Height: 40 Label@LABEL: X: 5 + Y: 1 Height: 23 Font: Bold Image@FLAG: @@ -355,7 +375,7 @@ Background@SPAWN_TOOLTIP: Width: 32 Height: 16 Label@TEAM: - Y: 21 + Y: 22 Height: 15 Font: TinyBold Align: center @@ -368,10 +388,12 @@ Background@LATENCY_TOOLTIP: Children: Label@LATENCY_PREFIX: X: 5 + Y: 1 Height: 23 Font: Bold Text: Latency: Label@LATENCY: + Y: 1 Height: 23 Font: Bold @@ -383,17 +405,18 @@ Background@ANONYMOUS_PLAYER_TOOLTIP: Children: Label@NAME: X: 5 + Y: 2 Text: Anonymous Player Height: 23 Font: MediumBold Label@LOCATION: X: 5 - Y: 23 + Y: 24 Height: 12 Font: TinyBold Label@IP: X: 5 - Y: 36 + Y: 37 Height: 12 Font: TinyBold Container@GAME_ADMIN: @@ -410,6 +433,7 @@ Background@ANONYMOUS_PLAYER_TOOLTIP: ImageName: admin Label@LABEL: X: 10 + Y: 1 Height: 12 Text: Game Admin Font: TinyBold @@ -429,12 +453,13 @@ Container@REGISTERED_PLAYER_TOOLTIP: Children: Label@PROFILE_NAME: X: 5 + Y: 2 Width: PARENT_RIGHT - 20 Height: 23 Font: MediumBold Label@PROFILE_RANK: X: 5 - Y: 23 + Y: 24 Width: PARENT_RIGHT - 20 Height: 12 Font: TinyBold @@ -453,6 +478,7 @@ Container@REGISTERED_PLAYER_TOOLTIP: ImageName: admin Label@LABEL: X: 10 + Y: 1 Height: 12 Text: Game Admin Font: TinyBold @@ -461,6 +487,7 @@ Container@REGISTERED_PLAYER_TOOLTIP: Width: PARENT_RIGHT Children: Label@MESSAGE: + Y: 1 X: 5 Width: PARENT_RIGHT - 20 Height: 23