eradicate 'delegate' misuse

2011-05-22 21:58:39 +12:00
parent 4b12a19af0
commit ef03d46f13
72 changed files with 234 additions and 269 deletions
--- a/mods/cnc/chrome/cheats.yaml
+++ b/mods/cnc/chrome/cheats.yaml
@@ -1,6 +1,6 @@
 Container@CHEATS_PANEL:
 	Id:CHEATS_PANEL
-	Delegate:CncCheatsLogic
+	Logic:CncCheatsLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 110)/2
 	Width:590
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -1,6 +1,6 @@
 Container@CONNECTING_PANEL:
 	Id:CONNECTING_PANEL
-	Delegate:CncConnectingLogic
+	Logic:CncConnectingLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
@@ -36,7 +36,7 @@ Container@CONNECTING_PANEL:

 Container@CONNECTIONFAILED_PANEL:
 	Id:CONNECTIONFAILED_PANEL
-	Delegate:CncConnectionFailedLogic
+	Logic:CncConnectionFailedLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
--- a/mods/cnc/chrome/createserver.yaml
+++ b/mods/cnc/chrome/createserver.yaml
@@ -3,7 +3,7 @@
 # TODO: Have the advertise checkbox en/disable the external port textfield
 Container@CREATESERVER_PANEL:
 	Id:CREATESERVER_PANEL
-	Delegate:CncServerCreationLogic
+	Logic:CncServerCreationLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 260)/2
 	Width:604
--- a/mods/cnc/chrome/diplomacy.yaml
+++ b/mods/cnc/chrome/diplomacy.yaml
@@ -1,6 +1,6 @@
 Container@DIPLOMACY_PANEL:
 	Id:DIPLOMACY_PANEL
-	Delegate:CncDiplomacyLogic
+	Logic:CncDiplomacyLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 400)/2
 	Width:450
--- a/mods/cnc/chrome/directconnect.yaml
+++ b/mods/cnc/chrome/directconnect.yaml
@@ -1,6 +1,6 @@
 Container@DIRECTCONNECT_PANEL:
 	Id:DIRECTCONNECT_PANEL
-	Delegate:CncDirectConnectLogic
+	Logic:CncDirectConnectLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 90)/2
 	Width:370
--- a/mods/cnc/chrome/dropdowns.yaml
+++ b/mods/cnc/chrome/dropdowns.yaml
@@ -1,6 +1,6 @@
 Background@COLOR_CHOOSER:
 	Id:COLOR_CHOOSER
-	Delegate:CncColorPickerLogic
+	Logic:CncColorPickerLogic
 	Background:panel-black
 	Width:315
 	Height:130
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -1,6 +1,6 @@
 Container@INGAME_ROOT:
 	Id:INGAME_ROOT
-	Delegate:CncIngameChromeLogic
+	Logic:CncIngameChromeLogic
 	Children:
 		WorldInteractionController:
 			Id:INTERACTION_CONTROLLER
@@ -57,7 +57,7 @@ Container@INGAME_ROOT:
 			UseContrast: yes
 		Container@PERFORMANCE_INFO:
 			Id:PERFORMANCE_INFO
-			Delegate:CncPerfDebugLogic
+			Logic:CncPerfDebugLogic
 			Children:
 				Label@PERF_TEXT:
 					Id:PERF_TEXT
@@ -123,7 +123,7 @@ Container@INGAME_ROOT:
 					Children:
 						OrderButton@SELL:
 							Id:SELL
-							Delegate:OrderButtonsChromeDelegate
+							Logic:OrderButtonsChromeLogic
 							X:39
 							Y:0
 							Width:30
@@ -133,7 +133,7 @@ Container@INGAME_ROOT:
 							LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
 						OrderButton@REPAIR:
 							Id:REPAIR
-							Delegate:OrderButtonsChromeDelegate
+							Logic:OrderButtonsChromeLogic
 							X:75
 							Y:0
 							Width:30
--- a/mods/cnc/chrome/ingamemenu.yaml
+++ b/mods/cnc/chrome/ingamemenu.yaml
@@ -2,7 +2,7 @@ Container@INGAME_MENU:
 	Id:INGAME_MENU
 	Width:WINDOW_RIGHT
 	Height:WINDOW_BOTTOM
-	Delegate:CncIngameMenuLogic
+	Logic:CncIngameMenuLogic
 	Children:
 		Image@RETICLE:
 			X:(WINDOW_RIGHT-WIDTH)/2
--- a/mods/cnc/chrome/install.yaml
+++ b/mods/cnc/chrome/install.yaml
@@ -27,7 +27,7 @@ Container@INSTALL_BACKGROUND:

 Container@INSTALL_PANEL:
 	Id:INSTALL_PANEL
-	Delegate:CncInstallLogic
+	Logic:CncInstallLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 150)/2
 	Width:640
@@ -95,7 +95,7 @@ Container@INSTALL_PANEL:

 Container@INSTALL_FROMCD_PANEL:
 	Id:INSTALL_FROMCD_PANEL
-	Delegate:CncInstallFromCDLogic
+	Logic:CncInstallFromCDLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 150)/2
 	Width:640
@@ -148,7 +148,7 @@ Container@INSTALL_FROMCD_PANEL:

 Container@INSTALL_DOWNLOAD_PANEL:
 	Id:INSTALL_DOWNLOAD_PANEL
-	Delegate:CncDownloadPackagesLogic
+	Logic:CncDownloadPackagesLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 150)/2
 	Width:640
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -1,6 +1,6 @@
 Container@SERVER_LOBBY:
 	Id:SERVER_LOBBY
-	Delegate:CncLobbyLogic
+	Logic:CncLobbyLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -2,7 +2,7 @@ Container@MENU_BACKGROUND:
 	Id:MENU_BACKGROUND
 	Width:WINDOW_RIGHT
 	Height:WINDOW_BOTTOM
-	Delegate:CncMenuLogic
+	Logic:CncMenuLogic
 	Children:
 		Image@RETICLE:
 			X:(WINDOW_RIGHT-WIDTH)/2
@@ -176,7 +176,7 @@ Container@MENU_BACKGROUND:
 							Text:Back
 		Container@PERFORMANCE_INFO:
 			Id:PERFORMANCE_INFO
-			Delegate:CncPerfDebugLogic
+			Logic:CncPerfDebugLogic
 			Children:
 				Label@PERF_TEXT:
 					Id:PERF_TEXT
--- a/mods/cnc/chrome/mapchooser.yaml
+++ b/mods/cnc/chrome/mapchooser.yaml
@@ -1,6 +1,6 @@
 Container@MAPCHOOSER_PANEL:
 	Id:MAPCHOOSER_PANEL
-	Delegate:CncMapChooserLogic
+	Logic:CncMapChooserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
--- a/mods/cnc/chrome/modchooser.yaml
+++ b/mods/cnc/chrome/modchooser.yaml
@@ -1,6 +1,6 @@
 Container@MODS_PANEL:
 	Id:MODS_PANEL
-	Delegate:CncModBrowserLogic
+	Logic:CncModBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
--- a/mods/cnc/chrome/music.yaml
+++ b/mods/cnc/chrome/music.yaml
@@ -1,6 +1,6 @@
 Container@MUSIC_PANEL:
 	Id:MUSIC_PANEL
-	Delegate:CncMusicPlayerLogic
+	Logic:CncMusicPlayerLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 400)/2
 	Width:360
@@ -201,7 +201,7 @@ Container@MUSIC_PANEL:

 Container@INSTALL_MUSIC_PANEL:
 	Id:INSTALL_MUSIC_PANEL
-	Delegate:CncInstallMusicLogic
+	Logic:CncInstallMusicLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 150)/2
 	Width:640
--- a/mods/cnc/chrome/preferences.yaml
+++ b/mods/cnc/chrome/preferences.yaml
@@ -1,6 +1,6 @@
 Container@SETTINGS_PANEL:
 	Id:SETTINGS_PANEL
-	Delegate:CncSettingsLogic
+	Logic:CncSettingsLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 250)/2
 	Width:740
--- a/mods/cnc/chrome/replaybrowser.yaml
+++ b/mods/cnc/chrome/replaybrowser.yaml
@@ -1,6 +1,6 @@
 Container@REPLAYBROWSER_PANEL:
 	Id:REPLAYBROWSER_PANEL
-	Delegate:CncReplayBrowserLogic
+	Logic:CncReplayBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 300)/2
 	Width:520
--- a/mods/cnc/chrome/serverbrowser.yaml
+++ b/mods/cnc/chrome/serverbrowser.yaml
@@ -1,6 +1,6 @@
 Container@SERVERBROWSER_PANEL:
 	Id:SERVERBROWSER_PANEL
-	Delegate:CncServerBrowserLogic
+	Logic:CncServerBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - 500)/2
 	Width:740
--- a/mods/ra/chrome/gameinit.yaml
+++ b/mods/ra/chrome/gameinit.yaml
@@ -5,7 +5,7 @@ GameInitInfo@INIT_SETUP:
 	PackageURL:http://open-ra.org/get-dependency.php?file=ra-packages
 	PackagePath:^/Content/ra
 	InstallMode:ra
-	Delegate:GameInitDelegate
+	Logic:GameInitLogic

 Background@INIT_CHOOSEINSTALL:
 	Id:INIT_CHOOSEINSTALL
--- a/mods/ra/chrome/gamelobby.yaml
+++ b/mods/ra/chrome/gamelobby.yaml
@@ -1,6 +1,6 @@
 Background@SERVER_LOBBY:
 	Id:SERVER_LOBBY
-	Delegate:LobbyDelegate
+	Logic:LobbyLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:800
@@ -431,7 +431,7 @@ Background@MAP_CHOOSER:
 	Id:MAP_CHOOSER
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Delegate:MapChooserDelegate
+	Logic:MapChooserLogic
 	Width:800
 	Height:600
 	Children:
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -1,6 +1,6 @@
 Container@INGAME_ROOT:
 	Id:INGAME_ROOT
-	Delegate:IngameChromeDelegate
+	Logic:IngameChromeLogic
 	Children:
 		WorldInteractionController:
 			Id:INTERACTION_CONTROLLER
@@ -93,7 +93,7 @@ Container@INGAME_ROOT:
 			Children:
 				OrderButton@SELL:
 					Id:SELL
-					Delegate:OrderButtonsChromeDelegate
+					Logic:OrderButtonsChromeLogic
 					X:3
 					Y:0
 					Width:30
@@ -103,7 +103,7 @@ Container@INGAME_ROOT:
 					LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
 				OrderButton@POWER_DOWN:
 					Id:POWER_DOWN
-					Delegate:OrderButtonsChromeDelegate
+					Logic:OrderButtonsChromeLogic
 					X:39
 					Y:0
 					Width:30
@@ -113,7 +113,7 @@ Container@INGAME_ROOT:
 					LongDesc:Disable unneeded structures so their \npower can be used elsewhere
 				OrderButton@REPAIR:
 					Id:REPAIR
-					Delegate:OrderButtonsChromeDelegate
+					Logic:OrderButtonsChromeLogic
 					X:75
 					Y:0
 					Width:30
@@ -189,7 +189,7 @@ Container@INGAME_ROOT:
 					Font:Bold
 		Background@DIPLOMACY_BG:
 			Id:DIPLOMACY_BG
-			Delegate:DiplomacyDelegate
+			Logic:DiplomacyLogic
 			X:(WINDOW_RIGHT - WIDTH)/2
 			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:450
@@ -223,7 +223,7 @@ Container@INGAME_ROOT:
 			UseContrast: yes
 		Background@DEVELOPERMODE_BG:
 			Id:DEVELOPERMODE_BG
-			Delegate:DeveloperModeDelegate
+			Logic:DeveloperModeLogic
 			X:(WINDOW_RIGHT - WIDTH)/2
 			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:350
@@ -305,7 +305,7 @@ Container@INGAME_ROOT:
 			ClickThrough:true
 			Id:PERF_BG
 			Background:dialog4
-			Delegate:PerfDebugDelegate
+			Logic:PerfDebugLogic
 			X:10
 			Y:WINDOW_BOTTOM - 250
 			Width: 210
@@ -326,7 +326,7 @@ Container@INGAME_ROOT:
 Container@OBSERVER_ROOT:
 	Id:OBSERVER_ROOT
 	Visible:true
-	Delegate:IngameObserverChromeDelegate
+	Logic:IngameObserverChromeLogic
 	Children:
 		WorldInteractionController:
 			X:0
@@ -455,7 +455,7 @@ Container@OBSERVER_ROOT:
 			ClickThrough:true
 			Id:PERF_BG
 			Background:dialog4
-			Delegate:PerfDebugDelegate
+			Logic:PerfDebugLogic
 			X:10
 			Y:WINDOW_BOTTOM - 250
 			Width: 210
--- a/mods/ra/chrome/mainmenu.yaml
+++ b/mods/ra/chrome/mainmenu.yaml
@@ -5,7 +5,7 @@ Background@MAINMENU_BG:
 	Width:250
 	Height:330
 	Visible:true
-	Delegate:MainMenuButtonsDelegate
+	Logic:MainMenuButtonsLogic
 	Children:
 		Label@MAINMENU_LABEL_TITLE:
 			Id:MAINMENU_LABEL_TITLE
@@ -99,7 +99,7 @@ Background@PERF_BG:
 	ClickThrough:true
 	Id:PERF_BG
 	Background:dialog4
-	Delegate:PerfDebugDelegate
+	Logic:PerfDebugLogic
 	X:10
 	Y:WINDOW_BOTTOM - 250
 	Width: 210
@@ -119,7 +119,7 @@ Background@PERF_BG:
 			Height:40
 Background@MUSIC_MENU:
 	Id:MUSIC_MENU
-	Delegate:MusicPlayerDelegate
+	Logic:MusicPlayerLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width: 450
--- a/mods/ra/chrome/replaybrowser.yaml
+++ b/mods/ra/chrome/replaybrowser.yaml
@@ -1,6 +1,6 @@
 Background@REPLAYBROWSER_BG:
 	Id:REPLAYBROWSER_BG
-	Delegate:ReplayBrowserDelegate
+	Logic:ReplayBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:700
--- a/mods/ra/chrome/serverbrowser.yaml
+++ b/mods/ra/chrome/serverbrowser.yaml
@@ -1,6 +1,6 @@
 Background@CREATESERVER_BG:
 	Id:CREATESERVER_BG
-	Delegate:CreateServerMenuDelegate
+	Logic:CreateServerMenuLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:400
@@ -87,7 +87,7 @@ Background@CREATESERVER_BG:
 			Font:Bold
 Background@JOINSERVER_BG:
 	Id:JOINSERVER_BG
-	Delegate:ServerBrowserDelegate
+	Logic:ServerBrowserLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:700
@@ -242,7 +242,7 @@ Background@JOINSERVER_BG:
 			Font:Bold
 Background@DIRECTCONNECT_BG:
 	Id:DIRECTCONNECT_BG
-	Delegate:DirectConnectDelegate
+	Logic:DirectConnectLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:400
@@ -290,7 +290,7 @@ Background@DIRECTCONNECT_BG:
 			Font:Bold
 Background@CONNECTION_FAILED_BG:
 	Id:CONNECTION_FAILED_BG
-	Delegate:ConnectionFailedDelegate
+	Logic:ConnectionFailedLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:450
@@ -331,7 +331,7 @@ Background@CONNECTION_FAILED_BG:
 			Font:Bold
 Background@CONNECTING_BG:
 	Id:CONNECTING_BG
-	Delegate:ConnectionDialogsDelegate
+	Logic:ConnectionDialogsLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:450
--- a/mods/ra/chrome/settings.yaml
+++ b/mods/ra/chrome/settings.yaml
@@ -1,6 +1,6 @@
 Background@SETTINGS_MENU:
 	Id:SETTINGS_MENU
-	Delegate:SettingsMenuDelegate
+	Logic:SettingsMenuLogic
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM- HEIGHT)/2
 	Width: 450