From 093fe1776ff97322efd98bf36932b8762aada655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 23 Aug 2014 21:44:50 +0200 Subject: [PATCH 1/4] missing tab --- OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs index aebc3e63f0..081226727b 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic if (tabs.QueueGroup == button.ProductionGroup) tabs.SelectNextTab(reverse); else - tabs.QueueGroup = button.ProductionGroup; + tabs.QueueGroup = button.ProductionGroup; }; button.IsDisabled = () => tabs.Groups[button.ProductionGroup].Tabs.Count == 0; From 749314d04e07780f889c86ce19c20cb6be046124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 23 Aug 2014 21:44:57 +0200 Subject: [PATCH 2/4] tab to space --- mods/cnc/chrome/ingame-infoobjectives.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/cnc/chrome/ingame-infoobjectives.yaml b/mods/cnc/chrome/ingame-infoobjectives.yaml index b61e92a4af..6b987a2f27 100644 --- a/mods/cnc/chrome/ingame-infoobjectives.yaml +++ b/mods/cnc/chrome/ingame-infoobjectives.yaml @@ -1,5 +1,5 @@ Container@MISSION_OBJECTIVES: - Height: PARENT_BOTTOM + Height: PARENT_BOTTOM Width: PARENT_RIGHT Logic: GameInfoObjectivesLogic Children: From ac1544e8bd3983797461f96eebc270d35f6c58e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 23 Aug 2014 21:45:55 +0200 Subject: [PATCH 3/4] remove double click sound when switching production tabs closes #5863 --- OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs index 98f881aa99..6fe41f14ec 100644 --- a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs +++ b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs @@ -97,8 +97,6 @@ namespace OpenRA.Mods.RA.Widgets if (queueGroup == null) return true; - Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null); - // Prioritize alerted queues var queues = Groups[queueGroup].Tabs.Select(t => t.Queue) .OrderByDescending(q => q.CurrentDone ? 1 : 0) From 97b97a4dd253b9661a6f212d4d879b1855bf657a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 24 Aug 2014 08:29:19 +0200 Subject: [PATCH 4/4] bring back click sound for TAB and PageUp/Down --- OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs | 6 ++++++ OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs | 2 ++ 2 files changed, 8 insertions(+) diff --git a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs index 6fe41f14ec..1eb017e282 100644 --- a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs +++ b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs @@ -279,9 +279,15 @@ namespace OpenRA.Mods.RA.Widgets var hotkey = Hotkey.FromKeyInput(e); if (hotkey == Game.Settings.Keys.NextProductionTabKey) + { + Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null); return SelectNextTab(false); + } else if (hotkey == Game.Settings.Keys.PreviousProductionTabKey) + { + Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null); return SelectNextTab(true); + } return false; } diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs index ce2a21ac7f..027b133649 100644 --- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs +++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs @@ -227,6 +227,8 @@ namespace OpenRA.Mods.RA.Widgets world.Selection.Combine(world, new Actor[] { next }, false, true); + Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null); + return ToSelection(); }