Skip to content

Commit

Permalink
Merge pull request #127 from CodeDead/feature/large-crowd-sound
Browse files Browse the repository at this point in the history
feat: added a large crowd sound and fixed a mediaKey property
  • Loading branch information
CodeDead authored Jul 16, 2024
2 parents c8b3d30 + ef1b62c commit 801020c
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 5 deletions.
Binary file added src/main/resources/audio/largeCrowd.mp3
Binary file not shown.
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication.properties
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Play / Pause
PlayPauseError=Unable to play / pause!
Dolphins=Dolphins
RollerCoaster=Roller coaster
LargeCrowd=Large crowd
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Abspielen / Pause
PlayPauseError=Abspielen / Pause konnte nicht ausgeführt werden!
Dolphins=Delfine
RollerCoaster=Achterbahn
LargeCrowd=Große Menschenmenge
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Reproducir / Pausa
PlayPauseError=¡No se puede reproducir / pausar el sonido!
Dolphins=Delfines
RollerCoaster=Montaña rusa
LargeCrowd=Multitud grande
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Lecture / Pause
PlayPauseError=Impossible de lire / mettre en pause!
Dolphins=Dauphins
RollerCoaster=Montagnes russes
LargeCrowd=Grande foule
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=चालू करे रोके
PlayPauseError=चलाने/रोकने में असमर्थ!
Dolphins=डाल्फिन
RollerCoaster=रोलर कोस्टर
LargeCrowd=बड़ी भीड़
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=再生/一時停止
PlayPauseError=再生/一時停止できません!
Dolphins=イルカ
RollerCoaster=ローラーコースター
LargeCrowd=大観衆
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Afspelen / Pauzeren
PlayPauseError=Kan niet afspelen / pauzeren!
Dolphins=Dolfijnen
RollerCoaster=Achtbaan
LargeCrowd=Grote menigte
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Воспроизведение / Пауза
PlayPauseError=Невозможно воспроизвести / приостановить воспроизведение!
Dolphins=Дельфины
RollerCoaster=Американские горки
LargeCrowd=Большая толпа
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=Oynat / Duraklat
PlayPauseError=Oynatma / Duraklatma düğmesi oluşturulamıyor!
Dolphins=Yunuslar
RollerCoaster=Lunapark treni
LargeCrowd=Kalabalık
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ PlayPause=播放 / 暂停
PlayPauseError=无法播放 / 暂停!
Dolphins=海豚
RollerCoaster=过山车
LargeCrowd=大群众
14 changes: 9 additions & 5 deletions src/main/resources/windows/MainWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>

<columnConstraints>
Expand All @@ -328,16 +329,19 @@
<SoundPane GridPane.rowIndex="0" name="%NetworkingEvent"
mediaKey="networking" mediaPath="/audio/networking.mp3"
image="/images/networking.png"/>
<SoundPane GridPane.rowIndex="1" name="%Restaurant"
<SoundPane GridPane.rowIndex="1" name="%LargeCrowd"
mediaKey="largeCrowd" mediaPath="/audio/largeCrowd.mp3"
image="/images/group.png"/>
<SoundPane GridPane.rowIndex="2" name="%Restaurant"
mediaKey="restaurant" mediaPath="/audio/restaurant.mp3"
image="/images/restaurant.png"/>
<SoundPane GridPane.rowIndex="2" name="%TribalFestival"
<SoundPane GridPane.rowIndex="3" name="%TribalFestival"
mediaKey="tribal" mediaPath="/audio/tribal.mp3"
image="/images/tribal.png"/>
<SoundPane GridPane.rowIndex="3" name="%DrumTribalFestival"
<SoundPane GridPane.rowIndex="4" name="%DrumTribalFestival"
mediaKey="drumtribal" mediaPath="/audio/tribal2.mp3"
image="/images/tribal2.png"/>
<SoundPane GridPane.rowIndex="4" name="%RugbyFootball"
<SoundPane GridPane.rowIndex="5" name="%RugbyFootball"
mediaKey="rugbyfootball" mediaPath="/audio/football.mp3"
image="/images/rugbyfootball.png"/>
</GridPane>
Expand Down Expand Up @@ -432,7 +436,7 @@
mediaKey="sleepy" mediaPath="/audio/sleepy.mp3"
image="/images/sleepy.png"/>
<SoundPane GridPane.rowIndex="3" name="%RollerCoaster"
mediaKey="train" mediaPath="/audio/rollercoaster.mp3"
mediaKey="rollerCoaster" mediaPath="/audio/rollercoaster.mp3"
image="/images/train.png"/>
<SoundPane GridPane.rowIndex="4" name="%Gong"
mediaKey="gong" mediaPath="/audio/gong.mp3"
Expand Down

0 comments on commit 801020c

Please sign in to comment.