desu/mplayer4anime
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

v0.14.1: Adding Apply button to settings, rename Save button to OK, readme update.

Browse source
This commit is contained in:
Dmitry Isaenko 2019-04-30 03:34:04 +03:00
parent 43256dc708
commit 2af689b666
6 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Readme.md
View file

@ -25,7 +25,7 @@ For older versions (prior to v0.12) please use JRE/JDK 8 (and JavaFX if you're N
### Running on Linux
Just start it as usual Java application:
Just start it as regular Java application:
```
$ java -jar mplayer4anime.jar
```

2
pom.xml
View file

@ -8,7 +8,7 @@
<name>mplayer4anime</name>
<artifactId>mplayer4anime</artifactId>
<version>0.14-SNAPSHOT</version>
<version>0.14.1-SNAPSHOT</version>
<packaging>jar</packaging>

9
src/main/java/mplayer4anime/Settings/SettingsController.java
View file

@ -77,8 +77,13 @@ public class SettingsController implements Initializable {
}
@FXML
private void Save(){
private void Ok(){
this.Apply();
Stage thisStage = (Stage) pathToMplayerLbl.getScene().getWindow(); // TODO: consider refactoring. Non-urgent.
thisStage.close();
}
@FXML
private void Apply(){
appPreferences.setPath(pathToMplayerLbl.getText());
appPreferences.setSubtilesFirst(subtitlesFirstCheckBox.isSelected());
appPreferences.setSubsExtensionsList(subExtensionListController.getList());
@ -87,7 +92,5 @@ public class SettingsController implements Initializable {
appPreferences.setAudioExtensionsList(audioExtensionListController.getList());
MediatorControl.getInstance().sentUpdates(); // TODO: implement list to track what should be updated
thisStage.close();
}
}

19
src/main/resources/Settings/SettingsLayout.fxml
View file

@ -44,9 +44,7 @@
</Label>
<HBox alignment="CENTER_LEFT" VBox.vgrow="NEVER">
<children>
<Label text="%settings_SubtitlesTabFirst" />
<Pane HBox.hgrow="ALWAYS" />
<CheckBox fx:id="subtitlesFirstCheckBox" mnemonicParsing="false" />
<CheckBox fx:id="subtitlesFirstCheckBox" mnemonicParsing="false" text="%settings_SubtitlesTabFirst" />
</children>
</HBox>
</children>
@ -132,8 +130,19 @@
<HBox prefWidth="200.0" spacing="5.0" VBox.vgrow="NEVER">
<children>
<Pane HBox.hgrow="ALWAYS" />
<Button cancelButton="true" mnemonicParsing="false" onAction="#Cancel" text="%CancelBtn" />
<Button mnemonicParsing="false" onAction="#Save" text="%SaveBtn" />
<Button mnemonicParsing="false" onAction="#Ok" text="%OkBtn">
<graphic>
<SVGPath content="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
</graphic></Button>
<Button mnemonicParsing="false" onAction="#Apply" text="%ApplyBtn">
<graphic>
<SVGPath content="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
</graphic>
</Button>
<Button cancelButton="true" mnemonicParsing="false" onAction="#Cancel" text="%CancelBtn">
<graphic>
<SVGPath content="M 8.705,8.59 A 6.705,6.705 0 0 1 15.41,15.295 6.705,6.705 0 0 1 8.705,22 6.705,6.705 0 0 1 2,15.295 6.705,6.705 0 0 1 8.705,8.59 m 0,1.341 a 5.364,5.364 0 0 0 -5.364,5.364 c 0,1.240425 0.422415,2.380275 1.12644,3.292155 L 11.997155,11.05744 C 11.085275,10.353415 9.945425,9.931 8.705,9.931 m 0,10.728 a 5.364,5.364 0 0 0 5.364,-5.364 c 0,-1.240425 -0.422415,-2.380275 -1.12644,-3.292155 L 5.412845,19.53256 C 6.324725,20.236585 7.464575,20.659 8.705,20.659 Z" />
</graphic></Button>
</children>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

5
src/main/resources/locale.properties
View file

@ -1,5 +1,5 @@
about_line1=mplayer4amine distributes under GNU GPLv3 license.
about_line2=Release: v0.14
about_line2=Release: v0.14.1
about_line3=Development & maintenance by Dmitry Isaenko.
about_AboutName=About
main_tab_audio=Audio
@ -10,7 +10,7 @@ lbl_AudioPane=Audio
lbl_VideoPane=Video
lbl_SubsPane=Subtitles
settings_PathToMplayerLbl=Path to mplayer executable:
SaveBtn=Save
OkBtn=OK
settings_SettingsName=Settings
main_tab_subtitles=Subtitles
settings_SubtitlesTabFirst=Show 'Subutitles' tab first after application starts:
@ -55,6 +55,7 @@ settings_Tab_Audio=Audio
settings_Tab_Subtitles=Subtitles
settings_videoExtensionList=Avaliable video files extensions:
settings_audioExtensionList=Avaliable audio layer extensions:
ApplyBtn=Apply

5
src/main/resources/locale_rus.properties
View file

@ -1,6 +1,6 @@
menu_File_Recent=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 \u0444\u0430\u0439\u043B\u044B...
about_line1=mplayer4amine \u0440\u0430\u0441\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u044F\u0435\u0442\u0441\u044F \u043F\u043E \u043B\u0438\u0446\u0435\u043D\u0437\u0438\u0438 GNU GPLv3.
about_line2=\u0420\u0435\u043B\u0438\u0437: v0.14
about_line2=\u0420\u0435\u043B\u0438\u0437: v0.14.1
about_line3=\u0420\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043E \u0438 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0414\u043C\u0438\u0442\u0440\u0438\u0435\u043C \u0418\u0441\u0430\u0435\u043D\u043A\u043E.
about_AboutName=\u041E \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0438
main_tab_audio=\u0410\u0443\u0434\u0438\u043E
@ -11,7 +11,7 @@ lbl_AudioPane=\u0410\u0443\u0434\u0438\u043E
lbl_VideoPane=\u0412\u0438\u0434\u0435\u043E
lbl_SubsPane=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044B
settings_PathToMplayerLbl=\u0420\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 mplayer:
SaveBtn=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
OkBtn=\u041E\u041A
settings_SettingsName=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
main_tab_subtitles=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044B
settings_SubtitlesTabFirst=\u041F\u0440\u0438 \u0437\u0430\u043F\u0443\u0441\u043A\u0435 \u0441\u043F\u0435\u0440\u0432\u0430 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0432\u043A\u043B\u0430\u0434\u043A\u0443 "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044B":
@ -55,4 +55,5 @@ settings_Tab_Subtitles=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044B
settings_Tab_Video=\u0412\u0438\u0434\u0435\u043E
settings_videoExtensionList=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0444\u0430\u0439\u043B\u043E\u0432 \u0432\u0438\u0434\u0435\u043E:
settings_audioExtensionList=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0430\u0443\u0434\u0438\u043E\u0434\u043E\u0440\u043E\u0436\u0435\u043A:
ApplyBtn=\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C