diff --git a/Readme.md b/Readme.md index b3bdeff..65a6463 100644 --- a/Readme.md +++ b/Readme.md @@ -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 ``` diff --git a/pom.xml b/pom.xml index 93a0c39..b59426b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ mplayer4anime mplayer4anime - 0.14-SNAPSHOT + 0.14.1-SNAPSHOT jar diff --git a/src/main/java/mplayer4anime/Settings/SettingsController.java b/src/main/java/mplayer4anime/Settings/SettingsController.java index 205cf6a..938723a 100644 --- a/src/main/java/mplayer4anime/Settings/SettingsController.java +++ b/src/main/java/mplayer4anime/Settings/SettingsController.java @@ -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(); } } diff --git a/src/main/resources/Settings/SettingsLayout.fxml b/src/main/resources/Settings/SettingsLayout.fxml index 47545e2..7bec19c 100644 --- a/src/main/resources/Settings/SettingsLayout.fxml +++ b/src/main/resources/Settings/SettingsLayout.fxml @@ -44,9 +44,7 @@ - @@ -132,8 +130,19 @@ - + + diff --git a/src/main/resources/locale.properties b/src/main/resources/locale.properties index 5f2251e..b4b05fa 100644 --- a/src/main/resources/locale.properties +++ b/src/main/resources/locale.properties @@ -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 diff --git a/src/main/resources/locale_rus.properties b/src/main/resources/locale_rus.properties index aa9e2da..dce4409 100644 --- a/src/main/resources/locale_rus.properties +++ b/src/main/resources/locale_rus.properties @@ -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