Skip to content

Added a 'space' sound, refactoring #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeDead merged 1 commit into from
Sep 16, 2022
Merged

Added a 'space' sound, refactoring #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 7 additions & 81 deletions src/main/java/com/codedead/opal/controller/MainWindowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,60 +38,10 @@ public final class MainWindowController implements IAudioTimer {
@FXML
private GridPane grpControls;
@FXML
private SoundPane snpGong;
@FXML
private SoundPane snpDrumTribal;
@FXML
private SoundPane snpSleepy;
@FXML
private SoundPane snpRugbyFootball;
@FXML
private SoundPane snpTribal;
@FXML
private SoundPane snpNetworkingEvent;
@FXML
private SoundPane snpZoo;
@FXML
private SoundPane snpCoffee;
@FXML
private SoundPane snpZen;
@FXML
private SoundPane snpFrogs;
@FXML
private GridPane grpMain;
@FXML
private SoundPane snpCave;
@FXML
private SoundPane snpFan;
@FXML
private SoundPane snpFantasy;
@FXML
private CheckMenuItem mniTimerEnabled;
@FXML
private SoundPane snpStatic;
@FXML
private SoundPane snpFireplace;
@FXML
private SoundPane snpTraffic;
@FXML
private SoundPane snpChatter;
@FXML
private SoundPane snpTelephone;
@FXML
private SoundPane snpTyping;
@FXML
private SoundPane snpClock;
@FXML
private SoundPane snpBird;
@FXML
private SoundPane snpThunder;
@FXML
private SoundPane snpWind;
@FXML
private SoundPane snpRain;
@FXML
private SoundPane snpRiver;
@FXML
private MenuItem mniUpdate;
@FXML
private MenuItem mniHomepage;
Expand All @@ -116,18 +66,16 @@ public final class MainWindowController implements IAudioTimer {
@FXML
private MenuItem mniOpenSoundPreset;

private final String platformName;
private final HelpUtils helpUtils;

private SettingsController settingsController;
private UpdateController updateController;
private ResourceBundle translationBundle;
private TimerTask timerTask;
private boolean timerEnabled;
private final String platformName;
private final HelpUtils helpUtils;
private final ObjectMapper objectMapper;
private final Timer timer;
private final IAudioTimer audioTimer;
private TimerTask timerTask;
private boolean timerEnabled;

private final Logger logger;

/**
Expand Down Expand Up @@ -196,31 +144,9 @@ public void setControllers(final SettingsController settingsController, final Up
* @param visible True if the media button should be visible, otherwise false
*/
public void loadMediaButtonVisibility(final boolean visible) {
snpRain.setMediaButton(visible);
snpWind.setMediaButton(visible);
snpThunder.setMediaButton(visible);
snpBird.setMediaButton(visible);
snpRiver.setMediaButton(visible);
snpTyping.setMediaButton(visible);
snpTelephone.setMediaButton(visible);
snpChatter.setMediaButton(visible);
snpTraffic.setMediaButton(visible);
snpClock.setMediaButton(visible);
snpFireplace.setMediaButton(visible);
snpStatic.setMediaButton(visible);
snpFantasy.setMediaButton(visible);
snpFan.setMediaButton(visible);
snpCave.setMediaButton(visible);
snpFrogs.setMediaButton(visible);
snpZen.setMediaButton(visible);
snpCoffee.setMediaButton(visible);
snpZoo.setMediaButton(visible);
snpSleepy.setMediaButton(visible);
snpGong.setMediaButton(visible);
snpNetworkingEvent.setMediaButton(visible);
snpTribal.setMediaButton(visible);
snpDrumTribal.setMediaButton(visible);
snpRugbyFootball.setMediaButton(visible);
for (final SoundPane p : getAllSoundPanes(grpControls)) {
p.setMediaButton(visible);
}
}

/**
Expand Down
Binary file added src/main/resources/audio/space.mp3
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/images/space.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Light
Dark=Dark
NordLight=Nord light
NordDark=Nord dark
Space=Space
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_de_DE.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Licht
Dark=Dunkel
NordLight=Nordlicht
NordDark=Norden dunkel
Space=Weltraum
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_en_US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Light
Dark=Dark
NordLight=Nord light
NordDark=Nord dark
Space=Space
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_es_ES.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Ligero
Dark=Oscuro
NordLight=Nord ligero
NordDark=Nord oscuro
Space=Espacio
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_fr_FR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Clair
Dark=Foncé
NordLight=Nord clair
NordDark=Nord foncé
Space=L'espace
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_nl_NL.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Licht
Dark=Donker
NordLight=Nord licht
NordDark=Nord donker
Space=De ruimte
1 change: 1 addition & 0 deletions src/main/resources/translations/OpalApplication_ru_RU.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ Light=Легкий
Dark=Темный
NordLight=Норд лайт
NordDark=Норд темный
Space=Космос
54 changes: 29 additions & 25 deletions src/main/resources/windows/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,31 +120,31 @@
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>

<SoundPane fx:id="snpRain" GridPane.rowIndex="0" name="%Rain"
<SoundPane GridPane.rowIndex="0" name="%Rain"
mediaKey="rain" mediaPath="/audio/rain.mp3"
image="/images/rain.png"/>
<SoundPane fx:id="snpWind" GridPane.rowIndex="1" name="%Wind"
<SoundPane GridPane.rowIndex="1" name="%Wind"
mediaKey="wind" mediaPath="/audio/wind.mp3"
image="/images/wind.png"/>
<SoundPane fx:id="snpThunder" GridPane.rowIndex="2" name="%Thunder"
<SoundPane GridPane.rowIndex="2" name="%Thunder"
mediaKey="thunder" mediaPath="/audio/thunder.mp3"
image="/images/thunder.png"/>
<SoundPane fx:id="snpBird" GridPane.rowIndex="3" name="%Birds"
<SoundPane GridPane.rowIndex="3" name="%Birds"
mediaKey="birds" mediaPath="/audio/birds.mp3"
image="/images/bird.png"/>
<SoundPane fx:id="snpRiver" GridPane.rowIndex="4" name="%River"
<SoundPane GridPane.rowIndex="4" name="%River"
mediaKey="river" mediaPath="/audio/river.mp3"
image="/images/river.png"/>
<SoundPane fx:id="snpFireplace" GridPane.rowIndex="5" name="%Fireplace"
<SoundPane GridPane.rowIndex="5" name="%Fireplace"
mediaKey="fireplace" mediaPath="/audio/fireplace.mp3"
image="/images/fire.png"/>
<SoundPane fx:id="snpCave" GridPane.rowIndex="6" name="%Cave"
<SoundPane GridPane.rowIndex="6" name="%Cave"
mediaKey="cave" mediaPath="/audio/cave.mp3"
image="/images/cave.png"/>
<SoundPane fx:id="snpFrogs" GridPane.rowIndex="7" name="%Frogs"
<SoundPane GridPane.rowIndex="7" name="%Frogs"
mediaKey="frogs" mediaPath="/audio/frogs.mp3"
image="/images/frogs.png"/>
<SoundPane fx:id="snpZoo" GridPane.rowIndex="8" name="%Zoo"
<SoundPane GridPane.rowIndex="8" name="%Zoo"
mediaKey="zoo" mediaPath="/audio/zoo.mp3"
image="/images/zoo.png"/>
</GridPane>
Expand Down Expand Up @@ -179,25 +179,25 @@
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>

<SoundPane fx:id="snpTyping" GridPane.rowIndex="0" name="%Typing"
<SoundPane GridPane.rowIndex="0" name="%Typing"
mediaKey="keyboard" mediaPath="/audio/typing.mp3"
image="/images/keyboard.png"/>
<SoundPane fx:id="snpTelephone" GridPane.rowIndex="1" name="%Phone"
<SoundPane GridPane.rowIndex="1" name="%Phone"
mediaKey="telephone" mediaPath="/audio/telephone.mp3"
image="/images/phone.png"/>
<SoundPane fx:id="snpChatter" GridPane.rowIndex="2" name="%Chatter"
<SoundPane GridPane.rowIndex="2" name="%Chatter"
mediaKey="officeChatter" mediaPath="/audio/office.mp3"
image="/images/group.png"/>
<SoundPane fx:id="snpTraffic" GridPane.rowIndex="3" name="%Traffic"
<SoundPane GridPane.rowIndex="3" name="%Traffic"
mediaKey="traffic" mediaPath="/audio/traffic.mp3"
image="/images/car.png"/>
<SoundPane fx:id="snpClock" GridPane.rowIndex="4" name="%Clock"
<SoundPane GridPane.rowIndex="4" name="%Clock"
mediaKey="clock" mediaPath="/audio/clock.mp3"
image="/images/clock.png"/>
<SoundPane fx:id="snpFan" GridPane.rowIndex="5" name="%Fan"
<SoundPane GridPane.rowIndex="5" name="%Fan"
mediaKey="fan" mediaPath="/audio/fan.mp3"
image="/images/fan.png"/>
<SoundPane fx:id="snpCoffee" GridPane.rowIndex="6" name="%Coffee"
<SoundPane GridPane.rowIndex="6" name="%Coffee"
mediaKey="coffee" mediaPath="/audio/coffee.mp3"
image="/images/coffee.png"/>
</GridPane>
Expand Down Expand Up @@ -229,16 +229,16 @@
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>

<SoundPane fx:id="snpNetworkingEvent" GridPane.rowIndex="0" name="%NetworkingEvent"
<SoundPane GridPane.rowIndex="0" name="%NetworkingEvent"
mediaKey="networking" mediaPath="/audio/networking.mp3"
image="/images/networking.png"/>
<SoundPane fx:id="snpTribal" GridPane.rowIndex="1" name="%TribalFestival"
<SoundPane GridPane.rowIndex="1" name="%TribalFestival"
mediaKey="tribal" mediaPath="/audio/tribal.mp3"
image="/images/tribal.png"/>
<SoundPane fx:id="snpDrumTribal" GridPane.rowIndex="2" name="%DrumTribalFestival"
<SoundPane GridPane.rowIndex="2" name="%DrumTribalFestival"
mediaKey="drumtribal" mediaPath="/audio/tribal2.mp3"
image="/images/tribal2.png"/>
<SoundPane fx:id="snpRugbyFootball" GridPane.rowIndex="3" name="%RugbyFootball"
<SoundPane GridPane.rowIndex="3" name="%RugbyFootball"
mediaKey="rugbyfootball" mediaPath="/audio/football.mp3"
image="/images/rugbyfootball.png"/>
</GridPane>
Expand Down Expand Up @@ -268,27 +268,31 @@
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>

<columnConstraints>
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>

<SoundPane fx:id="snpStatic" GridPane.rowIndex="0" name="%Static"
<SoundPane GridPane.rowIndex="0" name="%Static"
mediaKey="static" mediaPath="/audio/static.mp3"
image="/images/radio.png"/>
<SoundPane fx:id="snpFantasy" GridPane.rowIndex="1" name="%Fantasy"
<SoundPane GridPane.rowIndex="1" name="%Fantasy"
mediaKey="fantasy" mediaPath="/audio/fantasy.mp3"
image="/images/star.png"/>
<SoundPane fx:id="snpZen" GridPane.rowIndex="2" name="%Zen"
<SoundPane GridPane.rowIndex="2" name="%Zen"
mediaKey="zen" mediaPath="/audio/zen.mp3"
image="/images/zen.png"/>
<SoundPane fx:id="snpSleepy" GridPane.rowIndex="3" name="%Sleepy"
<SoundPane GridPane.rowIndex="3" name="%Sleepy"
mediaKey="sleepy" mediaPath="/audio/sleepy.mp3"
image="/images/sleepy.png"/>
<SoundPane fx:id="snpGong" GridPane.rowIndex="4" name="%Gong"
<SoundPane GridPane.rowIndex="4" name="%Gong"
mediaKey="gong" mediaPath="/audio/gong.mp3"
image="/images/gong.png"/>
<SoundPane GridPane.rowIndex="5" name="%Space"
mediaKey="space" mediaPath="/audio/space.mp3"
image="/images/space.png"/>
</GridPane>
</GridPane>
</ScrollPane>
Expand Down