commit fb988c094bcf245bcb819802513cd51bcc14dc20 Author: Dmitry Isaenko Date: Wed May 2 05:21:44 2018 +0300 v0.8.2. Fullscreen selection saves after restart. Refactoring in progress. diff --git a/About/AboutController.java b/About/AboutController.java new file mode 100644 index 0000000..be1778f --- /dev/null +++ b/About/AboutController.java @@ -0,0 +1,43 @@ +package mplayer4anime.About; + +import javafx.application.HostServices; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.stage.Stage; + + +public class AboutController { + + private HostServices hostServices; + + public void setHostServices(HostServices hs){ + this.hostServices = hs; + } + + @FXML + private Button buttonOk; + + @FXML + private void buttonClickOk(){ + Stage thisStage = (Stage) buttonOk.getScene().getWindow(); + thisStage.close(); + } + @FXML + private void gitHubUrl(){ + try { + hostServices.showDocument("https://github.com/developersu/mplayer4anime"); + } catch (Exception e){ + e.printStackTrace(); + } + } + @FXML + private void bloggerUrl(){ + try { + hostServices.showDocument("https://developersu.blogspot.com/"); + } catch (Exception e){ + e.printStackTrace(); + } + } + + +} diff --git a/About/AboutLayout.fxml b/About/AboutLayout.fxml new file mode 100644 index 0000000..5723966 --- /dev/null +++ b/About/AboutLayout.fxml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appPanes/mkvPane.fxml b/appPanes/mkvPane.fxml new file mode 100644 index 0000000..b7bba25 --- /dev/null +++ b/appPanes/mkvPane.fxml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appPanes/subPane.fxml b/appPanes/subPane.fxml new file mode 100644 index 0000000..7242835 --- /dev/null +++ b/appPanes/subPane.fxml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/landingPage.fxml b/landingPage.fxml new file mode 100644 index 0000000..b4dcd4c --- /dev/null +++ b/landingPage.fxml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/localization/locale_en.properties b/localization/locale_en.properties new file mode 100644 index 0000000..e087e64 --- /dev/null +++ b/localization/locale_en.properties @@ -0,0 +1,27 @@ +about_line1=mplayer4amine distributes under GNU GPLv3 license. +about_line2=Release: v0.8.2 +about_line3=Development & maintenance by Dmitry Isaenko. +about_AboutName=About +main_tab_audio=Audio +CancelBtn=Cancel +Error=Error +fullscreen_option=Always start in fullscreen +key_mka_open=Audio *.mka +key_mkv_open=Video *.mkv +key_subt_open=Subtitles +settings_PathToMplayerLbl=Path to mplayer executable: +SaveBtn=Save +settings_SettingsName=Settings +main_tab_subtitles=Subtitles +settings_SubtitlesTabFirst=Show 'Subutitles' tab first after application starts: +unableToStartMplayerError=Unable to execute 'mplayer'.\n\ +1. Make sure it's installed.\n\ +2. Check application settings. +settings_unixOsInformation=Unix-like OS uses system $PATH to find mplayer location.\n\ +Please don't change it if not sure. +SelectDirectoryTitle=Select directory +settings_LoadListsOnStart=Save & restore previously opened lists after application starts: +settings_subsExtensionList=Avaliable subtitles extensions: +settings_subsCodepageList=Avaliable codepages for subtitles: +settings_fieldContainSpacesTabs=Spaces and tab symbols are not allowed. + diff --git a/localization/locale_ru.properties b/localization/locale_ru.properties new file mode 100644 index 0000000..8e7817d --- /dev/null +++ b/localization/locale_ru.properties @@ -0,0 +1,26 @@ +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.8.2 +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 +CancelBtn=\u041E\u0442\u043C\u0435\u043D\u0430 +Error=\u041E\u0448\u0438\u0431\u043A\u0430 +fullscreen_option=\u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u043E\u043B\u043D\u043E\u044D\u043A\u0440\u0430\u043D\u043D\u044B\u0439 \u0440\u0435\u0436\u0438\u043C +key_mka_open=\u0410\u0443\u0434\u0438\u043E *.mka +key_mkv_open=\u0412\u0438\u0434\u0435\u043E *.mkv +key_subt_open=\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 +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": +unableToStartMplayerError=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C mplayer.\n\ +1. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044C, \u0447\u0442\u043E \u043E\u043D \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D.\n\ +2. \u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A. +settings_unixOsInformation=Unix-\u043F\u043E\u0434\u043E\u0431\u043D\u044B\u0435 \u041E\u0421 \u0441\u0438\u043F\u043E\u043B\u044C\u0437\u0443\u044E\u0442 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0435 \u043F\u0443\u0442\u0438, \u0447\u0442\u043E\u0431\u044B \u043D\u0430\u0439\u0442\u0438 \u0440\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 mplayer.\n\ +\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u043D\u0435 \u0442\u0440\u043E\u0433\u0430\u0439\u0442\u0435 \u044D\u0442\u043E \u0435\u0441\u043B\u0438 \u043D\u0435 \u0443\u0432\u0435\u0440\u0435\u043D\u044B. +SelectDirectoryTitle=\u0412\u044B\u0431\u043E\u0440 \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u0438 +settings_LoadListsOnStart=\u0417\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u0442\u044C \u0438 \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u0442\u044C \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u0432 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0439 \u0440\u0430\u0437 \u0441\u043F\u0438\u0441\u043A\u0438: +settings_subsExtensionList=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0434\u043B\u044F \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: +settings_subsCodepageList=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0438 \u0434\u043B\u044F \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: +settings_fieldContainSpacesTabs=\u041F\u0440\u043E\u0431\u0435\u043B\u044B \u0438 \u0441\u0438\u043C\u0432\u043E\u043B\u044B \u0442\u0430\u0431\u0443\u043B\u044F\u0446\u0438\u0438 \u043D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B. diff --git a/res/app_icon128x128.png b/res/app_icon128x128.png new file mode 100644 index 0000000..67581bb Binary files /dev/null and b/res/app_icon128x128.png differ diff --git a/res/app_icon32x32.png b/res/app_icon32x32.png new file mode 100644 index 0000000..9f1a175 Binary files /dev/null and b/res/app_icon32x32.png differ diff --git a/res/app_icon48x48.png b/res/app_icon48x48.png new file mode 100644 index 0000000..86072f3 Binary files /dev/null and b/res/app_icon48x48.png differ diff --git a/res/app_icon64x64.png b/res/app_icon64x64.png new file mode 100644 index 0000000..519d776 Binary files /dev/null and b/res/app_icon64x64.png differ diff --git a/res/landing.css b/res/landing.css new file mode 100644 index 0000000..aa0e44e --- /dev/null +++ b/res/landing.css @@ -0,0 +1,109 @@ +.landing { + -fx-background-image: url(pocket.png); + -fx-background-position: center; + -fx-background-repeat: no-repeat; +} + +.btnLeft { + -fx-background-radius: 0.3em 0em 0em 0.3em; + -fx-background-color: #263e48; +} +.btnLeft:hover { + -fx-background-radius: 0.3em 0em 0em 0.3em; + -fx-background-color: #2c4954; +} +.btnLeft:pressed { + -fx-background-radius: 0.3em 0em 0em 0.3em; + -fx-background-color: #1c2e35; +} +.btnCenter { + -fx-background-radius: 0em 0em 0em 0em ; + -fx-background-color: #263e48; +} +.btnCenter:hover { + -fx-background-radius: 0em 0em 0em 0em ; + -fx-background-color: #2c4954; +} +.btnCenter:pressed{ + -fx-background-radius: 0em 0em 0em 0em ; + -fx-background-color: #1c2e35; +} +.btnRight { + -fx-background-radius: 0em 0.3em 0.3em 0em ; + -fx-background-color: #263e48; +} +.btnRight:hover { + -fx-background-radius: 0em 0.3em 0.3em 0em ; + -fx-background-color: #2c4954; +} +.btnRight:pressed { + -fx-background-radius: 0em 0.3em 0.3em 0em ; + -fx-background-color: #1c2e35; +} +.btnSimple { + -fx-background-color: #263e48; +} +.btnSimple:hover { + -fx-background-color: #2c4954; +} +.btnSimple:pressed { + -fx-background-color: #1c2e35; +} +/* SplitMenuButton */ +.splitMenuButton .arrow-button{ + -fx-background-color: #263e48; +} +.splitMenuButton .arrow-button:hover{ + -fx-background-color: #2c4954; +} +.splitMenuButton .arrow-button:pressed{ + -fx-background-color: #1c2e35; +} +.splitMenuButton .arrow{ + -fx-background-color: #e1e1e1; +} +.splitMenuButton .label{ + -fx-background-color: #263e48; +} +.splitMenuButton .label:hover{ + -fx-background-color: #2c4954; +} +.splitMenuButton .label:pressed{ + -fx-background-color: #1c2e35; +} +.splitMenuButton { + -fx-background-color: #263e48; +} + +.splitMenuButton .menu-item .label{ + -fx-background-color: none; +} +.splitMenuButton .menu-item .label:hover{ + -fx-background-color: #000000; + -fx-text-base-color: white; + -fx-focus-color: red; +} + +/* END */ +.topToolBar{ + -fx-background-color: #4f6f8f; +} + +.transparentBtn { + -fx-background-color: none; +} +.transparentBtn:hover { + -fx-background-color: #e5e5e5; +} +.transparentBtn:pressed { + -fx-background-color: #d4d4d4; +} +/* +.tabPane .tab:selected { + -fx-background-color: #f1f1f1; +} + +.tabPane .tab-header-background{ + -fx-background-color: #b9b9b9; +} +*/ diff --git a/res/pocket.png b/res/pocket.png new file mode 100644 index 0000000..eea78aa Binary files /dev/null and b/res/pocket.png differ diff --git a/res/settings_icon128x128.png b/res/settings_icon128x128.png new file mode 100644 index 0000000..b36fbbf Binary files /dev/null and b/res/settings_icon128x128.png differ diff --git a/res/settings_icon32x32.png b/res/settings_icon32x32.png new file mode 100644 index 0000000..3b03ec6 Binary files /dev/null and b/res/settings_icon32x32.png differ diff --git a/res/settings_icon48x48.png b/res/settings_icon48x48.png new file mode 100644 index 0000000..d66891c Binary files /dev/null and b/res/settings_icon48x48.png differ diff --git a/res/settings_icon64x64.png b/res/settings_icon64x64.png new file mode 100644 index 0000000..e370478 Binary files /dev/null and b/res/settings_icon64x64.png differ