new design for the films table

* films table is now material design
* choisboxes are material design now
* updated version to 0.6.0 "plasma vampire"
* minor ui fixes
* minor text updates
This commit is contained in:
Jannik 2018-03-11 15:36:55 +01:00
parent da67278e7f
commit 81a79100fc
6 changed files with 113 additions and 16 deletions

View File

@ -84,7 +84,7 @@ public class Main extends Application {
loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml")); loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml"));
pane = (AnchorPane) loader.load(); pane = (AnchorPane) loader.load();
primaryStage.setMinHeight(600.00); primaryStage.setMinHeight(600.00);
primaryStage.setMinWidth(950.00); primaryStage.setMinWidth(1000.00);
primaryStage.setResizable(false); primaryStage.setResizable(false);
primaryStage.setTitle("Project HomeFlix"); primaryStage.setTitle("Project HomeFlix");
primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png"))); //adds application icon primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png"))); //adds application icon

View File

@ -231,9 +231,9 @@ public class MainWindowController {
private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName()); private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName());
private int hashA = -647380320; private int hashA = -647380320;
private String version = "0.5.99"; private String version = "0.6.0";
private String buildNumber = "137"; private String buildNumber = "141";
private String versionName = "solidify cow"; private String versionName = "plasma vampire";
private String dialogBtnStyle; private String dialogBtnStyle;
private String color; private String color;
private String title; private String title;
@ -303,10 +303,10 @@ public class MainWindowController {
// film Table // film Table
columnStreamUrl.setMaxWidth(0); columnStreamUrl.setMaxWidth(0);
columnTitle.setMaxWidth(215); columnTitle.setMaxWidth(190);
columnFavorite.setMaxWidth(60); columnFavorite.setMaxWidth(80);
columnSeason.setMaxWidth(55); columnSeason.setMaxWidth(73);
columnEpisode.setMaxWidth(64); columnEpisode.setMaxWidth(77);
columnFavorite.setStyle("-fx-alignment: CENTER;"); columnFavorite.setStyle("-fx-alignment: CENTER;");
filmsTreeTable.setRoot(filmRoot); filmsTreeTable.setRoot(filmRoot);
@ -441,6 +441,7 @@ public class MainWindowController {
/** /**
* FIXME fix bug when sort by ASCENDING, wrong order * FIXME fix bug when sort by ASCENDING, wrong order
* FIXME when sorting, series are expanded
*/ */
columnFavorite.sortTypeProperty().addListener(new ChangeListener<SortType>() { columnFavorite.sortTypeProperty().addListener(new ChangeListener<SortType>() {
@Override @Override

View File

@ -10,4 +10,100 @@
.jfx-hamburgerB StackPane { .jfx-hamburgerB StackPane {
-fx-background-color: black; -fx-background-color: black;
-fx-background-radius: 5px; -fx-background-radius: 5px;
} }
/*
* TREE TABLE CSS
*/
.tree-table-view {
-fx-tree-table-color: rgba(0, 168, 204, 0.2);
-fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4);
}
.tree-table-view:focused .tree-table-row-cell:selected {
-fx-background-color: -fx-tree-table-color;
-fx-table-cell-border-color: -fx-tree-table-color;
-fx-text-fill: BLACK;
}
.tree-table-view:focused .tree-table-row-cell:selected .tree-table-cell {
-fx-text-fill: BLACK;
}
.tree-table-view .jfx-rippler {
-jfx-rippler-fill: -fx-tree-table-rippler-color;
}
.tree-table-view .column-header,
.tree-table-view .column-header-background,
.tree-table-view .column-header-background .filler {
-fx-background-color: TRANSPARENT;
}
.tree-table-view .column-header {
-fx-border-width: 0 1 0 1;
-fx-border-color: #F3F3F3;
}
.tree-table-view .column-header .label {
-fx-text-fill: #000000;
-fx-padding: 12 0 12 0;
}
.tree-table-view .column-header .arrow, .tree-table-view .column-header .sort-order-dot {
-fx-background-color: #000000;
}
.tree-table-view .column-header:last-visible {
-fx-border-width: 0 2 0 1;
}
.tree-table-view .column-header-background {
-fx-border-width: 0 0.0 1 0;
-fx-border-color: #F3F3F3;
}
.tree-table-view .tree-table-cell {
-fx-border-width: 0 0 0 0;
-fx-padding: 12 4 8 4;
}
.tree-table-view .column-overlay {
-fx-background-color: -fx-tree-table-color;
}
.tree-table-view .column-resize-line, .tree-table-view .column-drag-header {
-fx-background-color: -fx-tree-table-rippler-color;
}
.tree-table-view:focused {
-fx-background-color: -fx-tree-table-color, -fx-box-border, -fx-control-inner-background;
-fx-background-insets: -1.4, 0, 1;
-fx-background-radius: 1.4, 0, 0;
-fx-padding: 1; /* 0.083333em; */
}
/*
* ChoiceBox
*/
.choice-box {
-fx-background-color: transparent;
-fx-border-color: #000000;
-fx-border-width: 0 0 1 0;
-fx-background-radius: 0;
-fx-border-radius: 0;
}
.choice-box:focused {
-fx-border-color: #9E9E9E;
}
.choice-box>.open-button>.arrow {
-fx-background-color: #757575;
}
.menu-item:focused {
-fx-background-color: #EE3523;
}

View File

@ -22,14 +22,14 @@
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.TextFlow?> <?import javafx.scene.text.TextFlow?>
<AnchorPane fx:id="mainAnchorPane" prefHeight="600.0" prefWidth="950.0" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1" fx:controller="kellerkinder.HomeFlix.application.MainWindowController"> <AnchorPane fx:id="mainAnchorPane" prefHeight="600.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1" fx:controller="kellerkinder.HomeFlix.application.MainWindowController">
<children> <children>
<ScrollPane fx:id="textScrollPane" fitToWidth="true" layoutX="408.0" layoutY="44.0" prefHeight="544.0" prefWidth="320.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="408.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0"> <ScrollPane fx:id="textScrollPane" fitToWidth="true" layoutX="408.0" layoutY="44.0" prefHeight="544.0" prefWidth="320.0" AnchorPane.bottomAnchor="12.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0">
<content> <content>
<TextFlow fx:id="textFlow" accessibleRole="TEXT_AREA" maxHeight="544.0" maxWidth="320.0" visible="true" /> <TextFlow fx:id="textFlow" accessibleRole="TEXT_AREA" maxHeight="544.0" maxWidth="320.0" visible="true" />
</content> </content>
</ScrollPane> </ScrollPane>
<TreeTableView fx:id="filmsTreeTable" layoutX="14.0" layoutY="88.0" prefHeight="500.0" prefWidth="375.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="568.0" AnchorPane.topAnchor="88.0" /> <TreeTableView fx:id="filmsTreeTable" layoutX="14.0" layoutY="88.0" prefHeight="500.0" prefWidth="420.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="568.0" AnchorPane.topAnchor="88.0" />
<JFXButton fx:id="playbtn" contentDisplay="CENTER" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0"> <JFXButton fx:id="playbtn" contentDisplay="CENTER" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
<font> <font>
<Font name="System Bold" size="14.0" /> <Font name="System Bold" size="14.0" />
@ -38,7 +38,7 @@
<font> <font>
<Font name="System Bold" size="14.0" /> <Font name="System Bold" size="14.0" />
</font></JFXButton> </font></JFXButton>
<JFXTextField fx:id="searchTextField" layoutX="12.0" layoutY="44.0" maxWidth="477.0" minWidth="359.0" prefHeight="31.0" prefWidth="370.0" promptText="search ..." AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="568.0" AnchorPane.topAnchor="44.0"> <JFXTextField fx:id="searchTextField" layoutX="12.0" layoutY="44.0" maxWidth="-Infinity" minWidth="420.0" prefHeight="31.0" promptText="search ..." AnchorPane.leftAnchor="12.0" AnchorPane.rightAnchor="568.0" AnchorPane.topAnchor="44.0">
<font> <font>
<Font name="Arial" size="12.0" /> <Font name="Arial" size="12.0" />
</font></JFXTextField> </font></JFXTextField>
@ -119,7 +119,7 @@
<JFXSlider fx:id="fontsizeSlider" max="48.0" min="2.0" prefWidth="250.0" /> <JFXSlider fx:id="fontsizeSlider" max="48.0" min="2.0" prefWidth="250.0" />
</children> </children>
</HBox> </HBox>
<HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0"> <HBox spacing="10.0">
<children> <children>
<Label fx:id="languageLbl" prefHeight="25.0" text="Language" /> <Label fx:id="languageLbl" prefHeight="25.0" text="Language" />
<ChoiceBox fx:id="languageChoisBox" prefWidth="150.0" /> <ChoiceBox fx:id="languageChoisBox" prefWidth="150.0" />

View File

@ -39,7 +39,7 @@ errorLoad = Beim laden der Einstellungen ist ein Fehler aufgetreten!
errorSave = Beim speichern der Einstellungen ist ein Fehler aufgetreten! errorSave = Beim speichern der Einstellungen ist ein Fehler aufgetreten!
noFilmFound = Kein Film mit diesem Titel gefunden! noFilmFound = Kein Film mit diesem Titel gefunden!
vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt! vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt!
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016-2018 Kellerkinder www.kellerkinder.xyz infoText = \nAutoren: \n \u2022 seil0@kellerkinder.xyz \n \u2022 hendrik.schutter@coptersicht.de \n(c) 2016-2018 Kellerkinder www.kellerkinder.xyz
#textFlow translations #textFlow translations
title = Titel title = Titel

View File

@ -39,7 +39,7 @@ errorLoad = An error occurred while loading the settings!
errorSave = An error occurred while saving the settings! errorSave = An error occurred while saving the settings!
noFilmFound = No film with this title found! noFilmFound = No film with this title found!
vlcNotInstalled = VLC Media Player is required to play a movie! vlcNotInstalled = VLC Media Player is required to play a movie!
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016-2018 Kellerkinder www.kellerkinder.xyz infoText = \nMaintainers: \n \u2022 seil0@kellerkinder.xyz \n \u2022 hendrik.schutter@coptersicht.de \n(c) 2016-2018 Kellerkinder www.kellerkinder.xyz
#textFlow translations #textFlow translations
title = Title title = Title