Seil0/Project-HomeFlix
Seil0
/
Project-HomeFlix
1
0
Fork 0
Code Issues 7 Pull Requests Releases 4 Wiki Activity

minor bug fixes

This commit is contained in:
Jannik 2019-01-22 18:12:30 +01:00
parent c735583a04
commit e47f3ea2f7
2 changed files with 63 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
View File

@ -137,17 +137,16 @@ public class MainWindowController {
@FXML private TableColumn<SourceDataType, String> sourceColumn; @FXML private TableColumn<SourceDataType, String> sourceColumn;
@FXML private TableColumn<SourceDataType, String> modeColumn; @FXML private TableColumn<SourceDataType, String> modeColumn;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnStreamUrl;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnTitle;
@FXML private TreeTableColumn<FilmTabelDataType, ImageView> columnFavorite;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnSeason;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnEpisode;
// table-mode // table-mode
@FXML private AnchorPane tableModeAnchorPane; @FXML private AnchorPane tableModeAnchorPane;
@FXML private JFXTextField searchTextField; @FXML private JFXTextField searchTextField;
@FXML private TreeTableView<FilmTabelDataType> filmsTreeTable; @FXML private TreeTableView<FilmTabelDataType> filmsTreeTable;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnStreamUrl;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnTitle;
@FXML private TreeTableColumn<FilmTabelDataType, ImageView> columnFavorite;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnSeason;
@FXML private TreeTableColumn<FilmTabelDataType, String> columnEpisode;
@FXML private TreeItem<FilmTabelDataType> filmRoot = new TreeItem<>(new FilmTabelDataType("", "", "", "", false, null, null)); @FXML private TreeItem<FilmTabelDataType> filmRoot = new TreeItem<>(new FilmTabelDataType("", "", "", "", false, null, null));
@ -161,7 +160,8 @@ public class MainWindowController {
@FXML private JFXButton forwardBtn; @FXML private JFXButton forwardBtn;
// poster-mode // poster-mode
// @FXML private AnchorPane posterModeAnchorPane; @FXML private AnchorPane posterModeAnchorPane;
@FXML private ScrollPane posterModeScrollPane;
private DBController dbController; private DBController dbController;
private UpdateController updateController; private UpdateController updateController;
@ -464,6 +464,7 @@ public class MainWindowController {
// Table-Mode fxml actions // Table-Mode fxml actions
@FXML @FXML
private void playbtnclicked() { private void playbtnclicked() {
if (currentTableFilm.getStreamUrl().length() > 0) {
if (currentTableFilm.getStreamUrl().contains("_rootNode")) { if (currentTableFilm.getStreamUrl().contains("_rootNode")) {
LOGGER.info("rootNode found, getting last watched episode"); LOGGER.info("rootNode found, getting last watched episode");
currentTableFilm = dbController.getLastWatchedEpisode(currentTableFilm.getTitle()); currentTableFilm = dbController.getLastWatchedEpisode(currentTableFilm.getTitle());
@ -512,6 +513,7 @@ public class MainWindowController {
} }
} }
} }
}
@FXML @FXML
private void openfolderbtnclicked() { private void openfolderbtnclicked() {
@ -894,6 +896,10 @@ public class MainWindowController {
return mimeType != null && (mimeType.contains("mp4") || mimeType.contains("vp6")); return mimeType != null && (mimeType.contains("mp4") || mimeType.contains("vp6"));
} }
/**
* Poser Mode WIP
*/
private void posterModeStartup() { private void posterModeStartup() {
checkAllPosters(); checkAllPosters();
} }

9
src/main/resources/fxml/MainWindow.fxml
View File

@ -64,6 +64,15 @@
<JFXButton fx:id="forwardBtn" contentDisplay="CENTER" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" /> <JFXButton fx:id="forwardBtn" contentDisplay="CENTER" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
</children> </children>
</AnchorPane> </AnchorPane>
<ScrollPane fx:id="posterModeScrollPane" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="32.0">
<content>
<AnchorPane fx:id="posterModeAnchorPane">
<padding>
<Insets bottom="17.0" />
</padding>
</AnchorPane>
</content>
</ScrollPane>
<ScrollPane fx:id="settingsScrollPane" prefHeight="568.0" prefWidth="800.0" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="32.0"> <ScrollPane fx:id="settingsScrollPane" prefHeight="568.0" prefWidth="800.0" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="32.0">
<content> <content>
<AnchorPane fx:id="settingsAnchorPane" prefWidth="832.0" style="-fx-background-color: white;"> <AnchorPane fx:id="settingsAnchorPane" prefWidth="832.0" style="-fx-background-color: white;">