Merge pull request #11136 from SzabKel/musicButtons

Added music controlling hotkeys. Closes #3231
This commit is contained in:
Matthias Mailänder
2016-05-03 07:16:05 +02:00
12 changed files with 127 additions and 1 deletions

View File

@@ -5,6 +5,10 @@ Container@NEW_MAP_BG:
Width: 300
Height: 125
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Label@TITLE:
Text: New Map
Width: PARENT_RIGHT

View File

@@ -1,6 +1,10 @@
Container@INGAME_ROOT:
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Container@WORLD_ROOT:
Logic: LoadIngamePerfLogic
Children:

View File

@@ -3,6 +3,10 @@ Container@MENU_BACKGROUND:
Height: WINDOW_BOTTOM
Logic: CncMainMenuLogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Container@SHELLMAP_DECORATIONS:
Children:
Image@RETICLE:

View File

@@ -1,6 +1,10 @@
Container@INGAME_ROOT:
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Container@WORLD_ROOT:
Logic: LoadIngamePerfLogic
Children:

View File

@@ -1,6 +1,10 @@
Container@MAINMENU:
Logic: MainMenuLogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Label@VERSION_LABEL:
X: WINDOW_RIGHT - 10
Y: WINDOW_BOTTOM - 20

View File

@@ -5,6 +5,10 @@ Background@NEW_MAP_BG:
Width: 300
Height: 185
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Label@LABEL_TITLE:
X: 0
Y: 20

View File

@@ -1,6 +1,10 @@
Container@INGAME_ROOT:
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Container@WORLD_ROOT:
Logic: LoadIngamePerfLogic
Children:

View File

@@ -1,6 +1,10 @@
Container@MAINMENU:
Logic: MainMenuLogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Background@BORDER:
Background: mainmenu-border
X: 0 - 15