epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable music player

Browse Source
This commit is contained in:
Paul Chote
2010-09-10 19:45:22 +12:00
parent b0e5bb3718
commit ca32d51375
6 changed files with 359 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs
View File

@@ -19,10 +19,20 @@ namespace OpenRA.Widgets.Delegates
string CurrentSong = null; string CurrentSong = null;
public MusicPlayerDelegate() public MusicPlayerDelegate()
{ {
var bg = Widget.RootWidget.GetWidget("MUSIC_BG"); var bg = Widget.RootWidget.GetWidget("MUSIC_MENU");
//bg.Visible = Game.Settings.MusicPlayer;
CurrentSong = GetNextSong(); CurrentSong = GetNextSong();
bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => {
Game.Settings.Save();
Widget.RootWidget.CloseWindow();
return true;
};
Widget.RootWidget.GetWidget("MAINMENU_BUTTON_MUSIC").OnMouseUp = mi => {
Widget.RootWidget.OpenWindow("MUSIC_MENU");
return true;
};
bg.GetWidget("BUTTON_PLAY").OnMouseUp = mi => bg.GetWidget("BUTTON_PLAY").OnMouseUp = mi =>
{ {
if (CurrentSong == null) if (CurrentSong == null)
@@ -64,9 +74,14 @@ namespace OpenRA.Widgets.Delegates
return bg.GetWidget("BUTTON_PLAY").OnMouseUp(mi); return bg.GetWidget("BUTTON_PLAY").OnMouseUp(mi);
}; };
bg.GetWidget<LabelWidget>("TIME").GetText = () => "{0:D2}:{1:D2} / {2:D2}:{3:D2}".F((int)Sound.MusicSeekPosition / 60, (int)Sound.MusicSeekPosition % 60, bg.GetWidget<LabelWidget>("TIME").GetText = () =>
{
if (CurrentSong == null)
return "";
return "{0:D2}:{1:D2} / {2:D2}:{3:D2}".F((int)Sound.MusicSeekPosition / 60, (int)Sound.MusicSeekPosition % 60,
Rules.Music[CurrentSong].Length / 60, Rules.Music[CurrentSong].Length % 60); Rules.Music[CurrentSong].Length / 60, Rules.Music[CurrentSong].Length % 60);
};
var ml = bg.GetWidget<ListBoxWidget>("MUSIC_LIST"); var ml = bg.GetWidget<ListBoxWidget>("MUSIC_LIST");
var itemTemplate = ml.GetWidget<LabelWidget>("MUSIC_TEMPLATE"); var itemTemplate = ml.GetWidget<LabelWidget>("MUSIC_TEMPLATE");
int offset = itemTemplate.Bounds.Y; int offset = itemTemplate.Bounds.Y;

15
OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs
View File

@@ -29,30 +29,35 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
return true; return true;
}; };
optionsBG.GetWidget("BUTTON_DISCONNECT").OnMouseUp = mi => { optionsBG.GetWidget("DISCONNECT").OnMouseUp = mi => {
optionsBG.Visible = false; optionsBG.Visible = false;
Game.Disconnect(); Game.Disconnect();
return true; return true;
}; };
optionsBG.GetWidget("BUTTON_SETTINGS").OnMouseUp = mi => { optionsBG.GetWidget("SETTINGS").OnMouseUp = mi => {
r.OpenWindow("SETTINGS_MENU"); r.OpenWindow("SETTINGS_MENU");
return true; return true;
}; };
optionsBG.GetWidget("BUTTON_RESUME").OnMouseUp = mi => optionsBG.GetWidget("MUSIC").OnMouseUp = mi => {
r.OpenWindow("MUSIC_MENU");
return true;
};
optionsBG.GetWidget("RESUME").OnMouseUp = mi =>
{ {
optionsBG.Visible = false; optionsBG.Visible = false;
return true; return true;
}; };
optionsBG.GetWidget("BUTTON_SURRENDER").OnMouseUp = mi => optionsBG.GetWidget("SURRENDER").OnMouseUp = mi =>
{ {
Game.IssueOrder(new Order("Surrender", Game.world.LocalPlayer.PlayerActor)); Game.IssueOrder(new Order("Surrender", Game.world.LocalPlayer.PlayerActor));
return true; return true;
}; };
optionsBG.GetWidget("BUTTON_QUIT").OnMouseUp = mi => { optionsBG.GetWidget("QUIT").OnMouseUp = mi => {
Game.Exit(); Game.Exit();
return true; return true;
}; };

38
mods/cnc/chrome/ingame.yaml
View File

@@ -110,7 +110,7 @@ Container@INGAME_ROOT:
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300 Width:300
Height:280 Height:320
Visible:false Visible:false
Children: Children:
Label@LABEL_TITLE: Label@LABEL_TITLE:
@@ -122,44 +122,52 @@ Container@INGAME_ROOT:
Text:Options Text:Options
Align:Center Align:Center
Bold:True Bold:True
Button@BUTTON_RESUME: Button@RESUME:
Id:BUTTON_RESUME Id:RESUME
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:60 Y:60
Width:160 Width:160
Height:25 Height:25
Text:Resume Text:Resume
Bold:True Bold:True
Button@BUTTON_SURRENDER: Button@SETTINGS:
Id:BUTTON_SURRENDER Id:SETTINGS
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:100 Y:100
Width:160 Width:160
Height:25 Height:25
Text:Surrender Text:Settings
Bold:True Bold:True
Button@BUTTON_SETTINGS: Button@MUSIC:
Id:BUTTON_SETTINGS Id:MUSIC
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:140 Y:140
Width:160 Width:160
Height:25 Height:25
Text:Settings Text:Music
Bold:True Bold:True
Button@BUTTON_DISCONNECT: Button@SURRENDER:
Id:BUTTON_DISCONNECT Id:SURRENDER
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:180 Y:180
Width:160 Width:160
Height:25 Height:25
Text:Disconnect Text:Surrender
Bold:True Bold:True
Button@BUTTON_QUIT: Button@DISCONNECT:
Id:BUTTON_QUIT Id:DISCONNECT
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:220 Y:220
Width:160 Width:160
Height:25 Height:25
Text:Disconnect
Bold:True
Button@QUIT:
Id:QUIT
X:(PARENT_RIGHT - WIDTH)/2
Y:260
Width:160
Height:25
Text:Quit Text:Quit
Bold:True Bold:True
Background@DIPLOMACY_BG: Background@DIPLOMACY_BG:

171
mods/cnc/chrome/mainmenu.yaml
View File

@@ -3,7 +3,7 @@ Background@MAINMENU_BG:
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:250 Width:250
Height:250 Height:290
Delegate:MainMenuButtonsDelegate Delegate:MainMenuButtonsDelegate
Children: Children:
Label@MAINMENU_LABEL_TITLE: Label@MAINMENU_LABEL_TITLE:
@@ -39,10 +39,18 @@ Background@MAINMENU_BG:
Height:25 Height:25
Text:Settings Text:Settings
Bold:True Bold:True
Button@MAINMENU_BUTTON_MUSIC:
Id:MAINMENU_BUTTON_MUSIC
X:45
Y:190
Width:160
Height:25
Text:Music
Bold:True
Button@MAINMENU_BUTTON_QUIT: Button@MAINMENU_BUTTON_QUIT:
Id:MAINMENU_BUTTON_QUIT Id:MAINMENU_BUTTON_QUIT
X:45 X:45
Y:190 Y:230
Width:160 Width:160
Height:25 Height:25
Text:Quit Text:Quit
@@ -51,7 +59,7 @@ Background@MAINMENU_BG:
Id:MAINMENU_BUTTON_VIDEOPLAYER Id:MAINMENU_BUTTON_VIDEOPLAYER
Visible:false Visible:false
X:45 X:45
Y:230 Y:260
Width:160 Width:160
Height:25 Height:25
Text:Video Player Text:Video Player
@@ -87,4 +95,159 @@ Background@PERF_BG:
X:20 X:20
Y:205 Y:205
Width:170 Width:170
Height:40 Height:40
Background@MUSIC_MENU:
Id:MUSIC_MENU
Delegate:MusicPlayerDelegate
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width: 450
Height: 250
Visible: false
Children:
Label@SETTINGS_LABEL_TITLE:
Id:SETTINGS_LABEL_TITLE
X:0
Y:20
Width:450
Height:25
Text:Music
Align:Center
Bold:True
Button@BUTTON_CLOSE:
Id:BUTTON_CLOSE
X:PARENT_RIGHT - 180
Y:PARENT_BOTTOM - 45
Width:160
Height:25
Text:Close
Bold:True
Container@BUTTONS:
X:PARENT_RIGHT - 150
Y:50
Children:
Button@BUTTON_PLAY:
Id:BUTTON_PLAY
X:35
Y:0
Width:25
Height:25
Children:
Image@IMAGE_PLAY:
Id:IMAGE_PLAY
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:play
Button@BUTTON_PAUSE:
Id:BUTTON_PAUSE
Visible:false
X:35
Y:0
Width:25
Height:25
Children:
Image@IMAGE_PAUSE:
Id:IMAGE_PAUSE
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:pause
Button@BUTTON_STOP:
Id:BUTTON_STOP
X:70
Y:0
Width:25
Height:25
Children:
Image@IMAGE_STOP:
Id:IMAGE_STOP
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:stop
Button@BUTTON_NEXT:
Id:BUTTON_NEXT
X:105
Y:0
Width:25
Height:25
Children:
Image@IMAGE_NEXT:
Id:IMAGE_NEXT
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:next
Button@BUTTON_PREV:
Id:BUTTON_PREV
X:0
Y:0
Width:25
Height:25
Children:
Image@IMAGE_PREV:
Id:IMAGE_PREV
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:prev
Label@TIME:
Id:TIME
X:PARENT_RIGHT - 150
Y:75
Width:140
Height:25
Align: Center
ListBox@MUSIC_LIST:
Id:MUSIC_LIST
X:10
Y:50
Width:280
Height:140
Children:
Label@MUSIC_TEMPLATE:
Id:MUSIC_TEMPLATE
Width:PARENT_RIGHT-28
Height:25
ClickThrough:false
X:2
Y:0
Visible:false
Children:
Label@TITLE:
Id:TITLE
X:5
Width:PARENT_RIGHT - 10
Height:PARENT_BOTTOM
Align: Left
Label@LENGTH:
Id:LENGTH
X:5
Width:PARENT_RIGHT - 10
Height:PARENT_BOTTOM
Align: Right
Checkbox@SHUFFLE:
Id:SHUFFLE
X:PARENT_RIGHT - 150
Y:110
Width:100
Height:20
Text:Shuffle
Checkbox@REPEAT:
Id:REPEAT
X:PARENT_RIGHT - 150
Y:140
Width:100
Height:20
Text:Repeat

38
mods/ra/chrome/ingame.yaml
View File

@@ -119,7 +119,7 @@ Container@INGAME_ROOT:
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300 Width:300
Height:280 Height:320
Visible:false Visible:false
Children: Children:
Label@LABEL_TITLE: Label@LABEL_TITLE:
@@ -131,44 +131,52 @@ Container@INGAME_ROOT:
Text:Options Text:Options
Align:Center Align:Center
Bold:True Bold:True
Button@BUTTON_RESUME: Button@RESUME:
Id:BUTTON_RESUME Id:RESUME
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:60 Y:60
Width:160 Width:160
Height:25 Height:25
Text:Resume Text:Resume
Bold:True Bold:True
Button@BUTTON_SURRENDER: Button@SETTINGS:
Id:BUTTON_SURRENDER Id:SETTINGS
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:100 Y:100
Width:160 Width:160
Height:25 Height:25
Text:Surrender Text:Settings
Bold:True Bold:True
Button@BUTTON_SETTINGS: Button@MUSIC:
Id:BUTTON_SETTINGS Id:MUSIC
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:140 Y:140
Width:160 Width:160
Height:25 Height:25
Text:Settings Text:Music
Bold:True Bold:True
Button@BUTTON_DISCONNECT: Button@SURRENDER:
Id:BUTTON_DISCONNECT Id:SURRENDER
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:180 Y:180
Width:160 Width:160
Height:25 Height:25
Text:Disconnect Text:Surrender
Bold:True Bold:True
Button@BUTTON_QUIT: Button@DISCONNECT:
Id:BUTTON_QUIT Id:DISCONNECT
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
Y:220 Y:220
Width:160 Width:160
Height:25 Height:25
Text:Disconnect
Bold:True
Button@QUIT:
Id:QUIT
X:(PARENT_RIGHT - WIDTH)/2
Y:260
Width:160
Height:25
Text:Quit Text:Quit
Bold:True Bold:True
Background@DIPLOMACY_BG: Background@DIPLOMACY_BG:

205
mods/ra/chrome/mainmenu.yaml
View File

@@ -3,7 +3,7 @@ Background@MAINMENU_BG:
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:250 Width:250
Height:250 Height:290
Delegate:MainMenuButtonsDelegate Delegate:MainMenuButtonsDelegate
Children: Children:
Label@MAINMENU_LABEL_TITLE: Label@MAINMENU_LABEL_TITLE:
@@ -39,10 +39,18 @@ Background@MAINMENU_BG:
Height:25 Height:25
Text:Settings Text:Settings
Bold:True Bold:True
Button@MAINMENU_BUTTON_MUSIC:
Id:MAINMENU_BUTTON_MUSIC
X:45
Y:190
Width:160
Height:25
Text:Music
Bold:True
Button@MAINMENU_BUTTON_QUIT: Button@MAINMENU_BUTTON_QUIT:
Id:MAINMENU_BUTTON_QUIT Id:MAINMENU_BUTTON_QUIT
X:45 X:45
Y:190 Y:230
Width:160 Width:160
Height:25 Height:25
Text:Quit Text:Quit
@@ -51,7 +59,7 @@ Background@MAINMENU_BG:
Id:MAINMENU_BUTTON_VIDEOPLAYER Id:MAINMENU_BUTTON_VIDEOPLAYER
Visible:false Visible:false
X:45 X:45
Y:230 Y:260
Width:160 Width:160
Height:25 Height:25
Text:Video Player Text:Video Player
@@ -88,104 +96,125 @@ Background@PERF_BG:
Y:205 Y:205
Width:170 Width:170
Height:40 Height:40
Background@MUSIC_BG: Background@MUSIC_MENU:
Id:MUSIC_BG Id:MUSIC_MENU
Delegate:MusicPlayerDelegate Delegate:MusicPlayerDelegate
X:WINDOW_RIGHT - WIDTH - 20 X:(WINDOW_RIGHT - WIDTH)/2
Y:WINDOW_BOTTOM - HEIGHT - 20 Y:(WINDOW_BOTTOM - HEIGHT)/2
Width: 300 Width: 450
Height: 210 Height: 250
Visible: false Visible: false
Children: Children:
Button@BUTTON_PLAY: Label@SETTINGS_LABEL_TITLE:
Id:BUTTON_PLAY Id:SETTINGS_LABEL_TITLE
X:50 X:0
Y:15 Y:20
Width:25 Width:450
Height:25 Height:25
Text:Music
Align:Center
Bold:True
Button@BUTTON_CLOSE:
Id:BUTTON_CLOSE
X:PARENT_RIGHT - 180
Y:PARENT_BOTTOM - 45
Width:160
Height:25
Text:Close
Bold:True
Container@BUTTONS:
X:PARENT_RIGHT - 150
Y:50
Children: Children:
Image@IMAGE_PLAY: Button@BUTTON_PLAY:
Id:IMAGE_PLAY Id:BUTTON_PLAY
X:35
Y:0
Width:25
Height:25
Children:
Image@IMAGE_PLAY:
Id:IMAGE_PLAY
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:play
Button@BUTTON_PAUSE:
Id:BUTTON_PAUSE
Visible:false
X:35
Y:0
Width:25
Height:25
Children:
Image@IMAGE_PAUSE:
Id:IMAGE_PAUSE
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:pause
Button@BUTTON_STOP:
Id:BUTTON_STOP
X:70
Y:0
Width:25
Height:25
Children:
Image@IMAGE_STOP:
Id:IMAGE_STOP
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:stop
Button@BUTTON_NEXT:
Id:BUTTON_NEXT
X:105
Y:0
Width:25
Height:25
Children:
Image@IMAGE_NEXT:
Id:IMAGE_NEXT
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:next
Button@BUTTON_PREV:
Id:BUTTON_PREV
X:0 X:0
Y:0 Y:0
Width:25 Width:25
Height:25 Height:25
ImageCollection:music Children:
ImageName:play Image@IMAGE_PREV:
Button@BUTTON_PAUSE: Id:IMAGE_PREV
Id:BUTTON_PAUSE X:0
Visible:false Y:0
X:50 Width:25
Y:15 Height:25
Width:25 ImageCollection:music
Height:25 ImageName:prev
Children:
Image@IMAGE_PAUSE:
Id:IMAGE_PAUSE
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:pause
Button@BUTTON_STOP:
Id:BUTTON_STOP
X:85
Y:15
Width:25
Height:25
Children:
Image@IMAGE_STOP:
Id:IMAGE_STOP
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:stop
Button@BUTTON_NEXT:
Id:BUTTON_NEXT
X:120
Y:15
Width:25
Height:25
Children:
Image@IMAGE_NEXT:
Id:IMAGE_NEXT
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:next
Button@BUTTON_PREV:
Id:BUTTON_PREV
X:15
Y:15
Width:25
Height:25
Children:
Image@IMAGE_PREV:
Id:IMAGE_PREV
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:prev
Label@TIME: Label@TIME:
Id:TIME Id:TIME
X:PARENT_RIGHT - WIDTH - 20 X:PARENT_RIGHT - 150
Y:15 Y:75
Width:100 Width:140
Height:25 Height:25
Align: Right Align: Center
ListBox@MUSIC_LIST: ListBox@MUSIC_LIST:
Id:MUSIC_LIST Id:MUSIC_LIST
X:10 X:10
Y:50 Y:50
Width:280 Width:280
Height:120 Height:140
Children: Children:
Label@MUSIC_TEMPLATE: Label@MUSIC_TEMPLATE:
Id:MUSIC_TEMPLATE Id:MUSIC_TEMPLATE
@@ -210,15 +239,15 @@ Background@MUSIC_BG:
Align: Right Align: Right
Checkbox@SHUFFLE: Checkbox@SHUFFLE:
Id:SHUFFLE Id:SHUFFLE
X:15 X:PARENT_RIGHT - 150
Y:175 Y:110
Width:100 Width:100
Height:20 Height:20
Text:Shuffle Text:Shuffle
Checkbox@REPEAT: Checkbox@REPEAT:
Id:REPEAT Id:REPEAT
X:120 X:PARENT_RIGHT - 150
Y:175 Y:140
Width:100 Width:100
Height:20 Height:20
Text:Repeat Text:Repeat