code cleanup
better style and overview
This commit is contained in:
@ -1,16 +0,0 @@
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
info = Info
|
||||
settings = Einstellungen
|
||||
play = play
|
||||
openFolder = Ordner \u00F6ffnen
|
||||
chooseFolder = Ordner ausw\u00E4hlen
|
||||
fontSize = Schriftgr\u00F6\u00DFe:
|
||||
checkUpdates = Auf Update pr\u00FCfen
|
||||
autoUpdate = beim Start nach Updates suchen:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Bewertung
|
||||
columnDatName = Datei Name
|
||||
errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
@ -1,16 +0,0 @@
|
||||
# HomeFlix-Local_en_US.properties US-English Local and default
|
||||
info = Info
|
||||
settings = Settings
|
||||
play = play
|
||||
openFolder = open Folder
|
||||
chooseFolder = choose Directory
|
||||
fontSize = font size:
|
||||
checkUpdates = check for updates
|
||||
autoUpdate = check at startup for updates:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Rating
|
||||
columnDatName = File Name
|
||||
errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
@ -4,18 +4,15 @@
|
||||
<?import com.jfoenix.controls.JFXTextArea?>
|
||||
<?import com.jfoenix.controls.JFXTextField?>
|
||||
<?import javafx.scene.control.TreeTableView?>
|
||||
<?import javafx.scene.image.Image?>
|
||||
<?import javafx.scene.image.ImageView?>
|
||||
<?import javafx.scene.layout.AnchorPane?>
|
||||
<?import javafx.scene.layout.HBox?>
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
|
||||
<AnchorPane fx:id="anpane" prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.MainWindowController">
|
||||
<children>
|
||||
<VBox fx:id="topVBox" prefHeight="32.0" prefWidth="800.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||
<children>
|
||||
<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="67.0" text="Menu" />
|
||||
</children>
|
||||
</VBox>
|
||||
<TreeTableView fx:id="treeTableViewfilm" layoutX="14.0" layoutY="88.0" prefHeight="400.0" prefWidth="360.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="12.0" AnchorPane.topAnchor="88.0" />
|
||||
<JFXTextArea fx:id="ta1" layoutX="385.0" layoutY="42.0" maxWidth="503.0" minWidth="275.0" prefHeight="546.0" prefWidth="293.0" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="385.0" AnchorPane.rightAnchor="222.0" AnchorPane.topAnchor="44.0" />
|
||||
<JFXButton fx:id="playbtn" layoutX="690.0" layoutY="363.0" onAction="#playbtnclicked" prefHeight="25.0" prefWidth="198.0" text="play" AnchorPane.bottomAnchor="212.0" AnchorPane.rightAnchor="12.0">
|
||||
@ -30,8 +27,45 @@
|
||||
<font>
|
||||
<Font name="Arial" size="12.0" />
|
||||
</font></JFXTextField>
|
||||
<ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0" />
|
||||
<ImageView fx:id="image1" fitHeight="297.0" fitWidth="198.0" layoutX="481.0" layoutY="46.0" pickOnBounds="true" preserveRatio="true" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="44.0">
|
||||
<image>
|
||||
<Image url="@../recources/Homeflix_Poster.png" />
|
||||
</image></ImageView>
|
||||
<JFXButton fx:id="returnBtn" layoutX="690.0" layoutY="443.0" onAction="#returnBtnclicked" prefHeight="25.0" prefWidth="90.0" text="<<" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="120.0" />
|
||||
<JFXButton fx:id="forwardBtn" layoutX="798.0" layoutY="443.0" onAction="#forwardBtnclicked" prefHeight="25.0" prefWidth="90.0" text=">>" AnchorPane.bottomAnchor="132.0" AnchorPane.rightAnchor="12.0" />
|
||||
<HBox fx:id="topHBox" layoutY="12.0" prefHeight="32.0" prefWidth="900.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||
<children>
|
||||
<JFXButton fx:id="menubtn" onAction="#menubtnclicked" prefHeight="32.0" prefWidth="32.0" />
|
||||
</children>
|
||||
</HBox>
|
||||
<VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="660.0" prefWidth="150.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="34.0">
|
||||
<children>
|
||||
<JFXButton fx:id="infoBtn" onAction="#infoBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font name="System Bold" size="15.0" />
|
||||
</font>
|
||||
</JFXButton>
|
||||
<JFXButton fx:id="settingsBtn" onAction="#settingsBtnclicked" prefHeight="37.0" prefWidth="150.0" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font name="System Bold" size="15.0" />
|
||||
</font>
|
||||
</JFXButton>
|
||||
<JFXButton fx:id="streamingSettingsBtn" onAction="#streamingSettingsBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font name="System Bold" size="15.0" />
|
||||
</font>
|
||||
</JFXButton>
|
||||
<JFXButton fx:id="switchBtn" onAction="#switchBtnclicked" prefHeight="32.0" prefWidth="150.0" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font name="System Bold" size="15.0" />
|
||||
</font>
|
||||
</JFXButton>
|
||||
<JFXButton fx:id="debugBtn" onAction="#debugBtnclicked" prefHeight="32.0" prefWidth="150.0" text="debugging" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font name="System Bold" size="15.0" />
|
||||
</font>
|
||||
</JFXButton>
|
||||
</children>
|
||||
</VBox>
|
||||
</children>
|
||||
</AnchorPane>
|
||||
|
@ -66,7 +66,6 @@ import javafx.collections.ObservableList;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.event.EventHandler;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.scene.control.Alert;
|
||||
import javafx.scene.control.Alert.AlertType;
|
||||
import javafx.scene.control.ChoiceBox;
|
||||
@ -80,10 +79,10 @@ import javafx.scene.control.TreeTableView;
|
||||
import javafx.scene.image.Image;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.AnchorPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.VBox;
|
||||
import javafx.scene.paint.Color;
|
||||
import javafx.scene.text.Font;
|
||||
import javafx.scene.text.FontWeight;
|
||||
import javafx.stage.DirectoryChooser;
|
||||
|
||||
public class MainWindowController {
|
||||
@ -94,9 +93,9 @@ public class MainWindowController {
|
||||
@FXML
|
||||
private AnchorPane streamingSettingsan = new AnchorPane();
|
||||
@FXML
|
||||
private VBox topVBox;
|
||||
private HBox topHBox;
|
||||
@FXML
|
||||
private VBox menuBox = new VBox();
|
||||
private VBox sideMenuVBox;
|
||||
@FXML
|
||||
private VBox settingsBox = new VBox();
|
||||
@FXML
|
||||
@ -118,15 +117,15 @@ public class MainWindowController {
|
||||
@FXML
|
||||
private JFXButton forwardBtn;
|
||||
@FXML
|
||||
private JFXButton infoBtn = new JFXButton("Info");
|
||||
private JFXButton infoBtn;
|
||||
@FXML
|
||||
private JFXButton demoBtn = new JFXButton("Debugging");
|
||||
private JFXButton settingsBtn;
|
||||
@FXML
|
||||
private JFXButton settingsBtn = new JFXButton("Settings");
|
||||
private JFXButton streamingSettingsBtn;
|
||||
@FXML
|
||||
private JFXButton streamingSettingsBtn = new JFXButton("Streaming-Settings");
|
||||
private JFXButton switchBtn;
|
||||
@FXML
|
||||
private JFXButton switchBtn = new JFXButton("local");
|
||||
private JFXButton debugBtn;
|
||||
@FXML
|
||||
private JFXButton updateBtn = new JFXButton("Auf Update pr<70>fen");
|
||||
@FXML
|
||||
@ -167,11 +166,11 @@ public class MainWindowController {
|
||||
@FXML
|
||||
TreeTableColumn<streamUiData, String> columnStreamUrl = new TreeTableColumn<>("Datei Name");
|
||||
@FXML
|
||||
TreeTableColumn<streamUiData, String> columnResolution = new TreeTableColumn<>("Aufl<EFBFBD>sung"); //TODO translate
|
||||
TreeTableColumn<streamUiData, String> columnResolution = new TreeTableColumn<>("Aufl<EFBFBD>sung");
|
||||
@FXML
|
||||
TreeTableColumn<streamUiData, Integer> columnYear = new TreeTableColumn<>("Jahr"); //TODO translate
|
||||
TreeTableColumn<streamUiData, Integer> columnYear = new TreeTableColumn<>("Jahr");
|
||||
@FXML
|
||||
TreeTableColumn<streamUiData, Integer> columnSeason = new TreeTableColumn<>("Staffel"); //TODO translate
|
||||
TreeTableColumn<streamUiData, Integer> columnSeason = new TreeTableColumn<>("Staffel");
|
||||
|
||||
@FXML
|
||||
private TreeItem<streamUiData> streamingRoot =new TreeItem<>(new streamUiData(1 ,1 ,1.0 ,"1" ,"filme" ,"1"));
|
||||
@ -194,6 +193,8 @@ public class MainWindowController {
|
||||
private String errorUpdateD;
|
||||
private String errorUpdateV;
|
||||
private String errorPlay;
|
||||
private String errorOpenStream;
|
||||
private String errorMode;
|
||||
private String infoText;
|
||||
private String linuxBugText;
|
||||
private String vlcNotInstalled;
|
||||
@ -219,7 +220,6 @@ public class MainWindowController {
|
||||
private ObservableList<streamUiData> streamData = FXCollections.observableArrayList();
|
||||
private ObservableList<String> locals = FXCollections.observableArrayList("english", "deutsch");
|
||||
private ObservableList<streamUiData> streamingData = FXCollections.observableArrayList();
|
||||
private Image imHF = new Image("recources/Homeflix_Poster.png");
|
||||
private ImageView menu_icon_black = new ImageView(new Image("recources/menu_icon_black.png"));
|
||||
private ImageView menu_icon_white = new ImageView(new Image("recources/menu_icon_white.png"));
|
||||
private DirectoryChooser directoryChooser = new DirectoryChooser();
|
||||
@ -233,10 +233,10 @@ public class MainWindowController {
|
||||
@FXML
|
||||
private void menubtnclicked(){
|
||||
if(menutrue == false){
|
||||
anpane.getChildren().addAll(menuBox);
|
||||
sideMenuVBox.setVisible(true);
|
||||
menutrue = true;
|
||||
}else{
|
||||
anpane.getChildren().removeAll(menuBox);
|
||||
sideMenuVBox.setVisible(false);
|
||||
menutrue = false;
|
||||
}
|
||||
if(settingstrue == true){
|
||||
@ -246,7 +246,6 @@ public class MainWindowController {
|
||||
settingstrue = false;
|
||||
}
|
||||
if(streamingSettingsTrue == true){
|
||||
System.out.println("close settings");
|
||||
anpane.getChildren().removeAll(streamingSettingsBox);
|
||||
streamingSettingsTrue = false;
|
||||
}
|
||||
@ -310,13 +309,21 @@ public class MainWindowController {
|
||||
}
|
||||
}else if(mode.equals("streaming")){
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI(datPath)); //TODO muss noch <20>berarbeite werden!
|
||||
Desktop.getDesktop().browse(new URI(datPath)); //opening streaming url in browser (other option?)
|
||||
} catch (URISyntaxException | IOException e) {
|
||||
//Auto-generated catch block
|
||||
Alert alert = new Alert(AlertType.ERROR);
|
||||
alert.setHeaderText("");
|
||||
alert.setTitle("Error");
|
||||
alert.setContentText(errorOpenStream);
|
||||
alert.showAndWait();
|
||||
e.printStackTrace();
|
||||
}
|
||||
}else{
|
||||
System.out.println("error"); //TODO richtige fehlermeldung mode
|
||||
Alert alert = new Alert(AlertType.ERROR);
|
||||
alert.setHeaderText("");
|
||||
alert.setTitle("Error");
|
||||
alert.setContentText(errorMode);
|
||||
alert.showAndWait();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -341,6 +348,150 @@ public class MainWindowController {
|
||||
treeTableViewfilm.getSelectionModel().select(next);
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void infoBtnclicked(){
|
||||
Alert alert = new Alert(AlertType.INFORMATION);
|
||||
alert.setTitle("Info");
|
||||
alert.setHeaderText("Project HomeFlix");
|
||||
alert.setContentText(infoText);
|
||||
alert.showAndWait();
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void settingsBtnclicked(){
|
||||
if(settingstrue == false){
|
||||
anpane.getChildren().addAll(settingsBox);
|
||||
|
||||
tfPfad.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
setPath(tfPfad.getText());
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
directoryBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
selectedFolder = directoryChooser.showDialog(null);
|
||||
if(selectedFolder == null){
|
||||
System.out.println("No Directory selected");
|
||||
}else{
|
||||
setPath(selectedFolder.getAbsolutePath());
|
||||
saveSettings();
|
||||
tfPfad.setText(getPath());
|
||||
try {
|
||||
Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu
|
||||
System.exit(0); //beendet sich selbst
|
||||
} catch (IOException e) {
|
||||
System.out.println("es ist ein Fehler aufgetreten");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
mainColor.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
editColor(mainColor.getValue().toString());
|
||||
applyColor();
|
||||
}
|
||||
});
|
||||
sl1.valueProperty().addListener(new ChangeListener<Number>() {
|
||||
@Override
|
||||
public void changed(ObservableValue<? extends Number> ov,Number old_val, Number new_val) {
|
||||
setSize(sl1.getValue());
|
||||
ta1.setFont(Font.font("System", size));
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
|
||||
//updater
|
||||
updateBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
update();
|
||||
}
|
||||
});
|
||||
autoupdateBtn.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
if(autoUpdate.equals("0")){
|
||||
setAutoUpdate("1");
|
||||
saveSettings();
|
||||
}else{
|
||||
setAutoUpdate("0");
|
||||
saveSettings();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
settingstrue = true;
|
||||
}else{
|
||||
anpane.getChildren().removeAll(settingsBox);
|
||||
setPath(tfPfad.getText());
|
||||
saveSettings();
|
||||
settingstrue = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO zus<75>tzliche infos <20>ber die dateien
|
||||
*/
|
||||
@FXML
|
||||
private void streamingSettingsBtnclicked(){
|
||||
if(streamingSettingsTrue == false){
|
||||
anpane.getChildren().addAll(streamingSettingsBox);
|
||||
streamingDirectoryBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
selectedStreamingFolder = directoryChooser.showDialog(null);
|
||||
if(selectedStreamingFolder == null){
|
||||
System.out.println("No Directory selected");
|
||||
}else{
|
||||
setStreamingPath(selectedStreamingFolder.getAbsolutePath());
|
||||
saveSettings();
|
||||
streamingtfPfad.setText(getStreamingPath());
|
||||
try {
|
||||
Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu
|
||||
System.exit(0); //beendet sich selbst
|
||||
} catch (IOException e) {
|
||||
System.out.println("es ist ein Fehler aufgetreten");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
streamingSettingsTrue = true;
|
||||
}else{
|
||||
anpane.getChildren().removeAll(streamingSettingsBox);
|
||||
streamingSettingsTrue = false;
|
||||
}
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void switchBtnclicked(){
|
||||
if(mode.equals("local")){ //switch to streaming mode
|
||||
setMode("streaming");
|
||||
switchBtn.setText("local");
|
||||
}else if(mode.equals("streaming")){ //switch to local mode
|
||||
setMode("local");
|
||||
switchBtn.setText("streaming");
|
||||
}
|
||||
saveSettings();
|
||||
root.getChildren().remove(0,root.getChildren().size());
|
||||
addDataUI();
|
||||
|
||||
sideMenuVBox.setVisible(false); //disables sidemenu
|
||||
menutrue = false;
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void debugBtnclicked(){
|
||||
//for testing
|
||||
}
|
||||
|
||||
//"Main" Methode die beim start von der Klasse Main aufgerufen wird, initialiesirung der einzellnen UI-Objekte
|
||||
@SuppressWarnings({ "static-access"})
|
||||
public void setMain(Main main) {
|
||||
@ -348,34 +499,13 @@ public class MainWindowController {
|
||||
loadSettings();
|
||||
// loadStreamingSettings();
|
||||
initTabel();
|
||||
initBtnAction();
|
||||
initActions();
|
||||
|
||||
System.out.println("Mode: "+mode);
|
||||
|
||||
infoBtn.setPrefWidth(130);
|
||||
infoBtn.setPrefHeight(32);
|
||||
infoBtn.setFont(Font.font("System", FontWeight.BOLD, 15));
|
||||
|
||||
settingsBtn.setPrefWidth(130);
|
||||
settingsBtn.setPrefHeight(32);
|
||||
settingsBtn.setFont(Font.font("System", FontWeight.BOLD, 15));
|
||||
|
||||
streamingSettingsBtn.setPrefWidth(130);
|
||||
streamingSettingsBtn.setPrefHeight(32);
|
||||
streamingSettingsBtn.setFont(Font.font("System", FontWeight.BOLD, 15));
|
||||
|
||||
switchBtn.setPrefWidth(130);
|
||||
switchBtn.setPrefHeight(32);
|
||||
switchBtn.setFont(Font.font("System", FontWeight.BOLD, 15));
|
||||
|
||||
demoBtn.setPrefWidth(130);
|
||||
demoBtn.setPrefHeight(32);
|
||||
demoBtn.setFont(Font.font("System", FontWeight.BOLD, 15));
|
||||
demoBtn.setDisable(false);
|
||||
|
||||
menubtn.setText("");
|
||||
menubtn.setMaxSize(32, 32);
|
||||
|
||||
debugBtn.setDisable(true); //debugging btn for tests
|
||||
debugBtn.setVisible(false);
|
||||
|
||||
tfPfad.setPrefWidth(250);
|
||||
tfPfad.setPromptText("Pfad");
|
||||
tfPfad.setText(getPath());
|
||||
@ -410,14 +540,6 @@ public class MainWindowController {
|
||||
}
|
||||
|
||||
versionlbl.setText("Version: "+version);
|
||||
|
||||
menuBox.setSpacing(2.5); //Zeilenabstand
|
||||
menuBox.setPadding(new Insets(2.5,0,0,2.5)); // abstand zum Rand
|
||||
menuBox.getChildren().addAll(infoBtn, settingsBtn, streamingSettingsBtn, switchBtn, demoBtn);
|
||||
menuBox.setFillWidth(true);
|
||||
|
||||
AnchorPane.setTopAnchor(menuBox, 33d);
|
||||
AnchorPane.setBottomAnchor(menuBox, 0d);
|
||||
|
||||
settingsBox.setStyle("-fx-background-color: #FFFFFF;");
|
||||
settingsBox.getChildren().add(settingsan);
|
||||
@ -473,49 +595,16 @@ public class MainWindowController {
|
||||
AnchorPane.setTopAnchor(settingsBox, 34d);
|
||||
AnchorPane.setRightAnchor(settingsBox, 0d);
|
||||
AnchorPane.setBottomAnchor(settingsBox, 0d);
|
||||
AnchorPane.setLeftAnchor(settingsBox, 130d);
|
||||
AnchorPane.setLeftAnchor(settingsBox, 150d);
|
||||
|
||||
AnchorPane.setTopAnchor(streamingSettingsBox, 34d);
|
||||
AnchorPane.setRightAnchor(streamingSettingsBox, 0d);
|
||||
AnchorPane.setBottomAnchor(streamingSettingsBox, 0d);
|
||||
AnchorPane.setLeftAnchor(streamingSettingsBox, 130d);
|
||||
AnchorPane.setLeftAnchor(streamingSettingsBox, 150d);
|
||||
|
||||
ta1.setWrapText(true);
|
||||
ta1.setEditable(false);
|
||||
ta1.setFont(Font.font("System", getSize()));
|
||||
|
||||
image1.setImage(imHF);
|
||||
|
||||
//TODO kann das auch raus?
|
||||
tfsearch.textProperty().addListener(new ChangeListener<String>() {
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void changed(ObservableValue<? extends String> observable,String oldValue, String newValue) {
|
||||
int counter = newDaten.size();
|
||||
filterData.removeAll(filterData);
|
||||
root.getChildren().remove(0,root.getChildren().size());
|
||||
|
||||
for(int i = 0; i < counter; i++){
|
||||
if(newDaten.get(i).getTitel().toLowerCase().contains(tfsearch.getText().toLowerCase())){
|
||||
filterData.add(newDaten.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
for(int i = 0; i < filterData.size(); i++){
|
||||
root.getChildren().addAll(new TreeItem<streamUiData>(filterData.get(i))); //f<>gt daten zur Rootnode hinzu
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
//TODO das auch?
|
||||
cbLocal.getSelectionModel().selectedIndexProperty()
|
||||
.addListener(new ChangeListener<Number>() {
|
||||
public void changed(ObservableValue<? extends Number> ov, Number value, Number new_value) {
|
||||
setLocal(new_value.intValue());
|
||||
setLoaclUI(local);
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//initialisierung der Tabellen f<>r filme(beide Modi) und Streaming-Settings
|
||||
@ -582,169 +671,37 @@ public class MainWindowController {
|
||||
}
|
||||
|
||||
//initialisierung der Button Actions
|
||||
private void initBtnAction(){
|
||||
private void initActions(){
|
||||
|
||||
infoBtn.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
Alert alert = new Alert(AlertType.INFORMATION);
|
||||
alert.setTitle("Info");
|
||||
alert.setHeaderText("Project HomeFlix");
|
||||
alert.setContentText(infoText);
|
||||
alert.showAndWait();
|
||||
}
|
||||
});
|
||||
|
||||
//setteingsbtn clicked, deklarieren der actions der Objekte die bei settingsbtn angezeigt werden
|
||||
settingsBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
//TODO unterscheiden zwischen streaming und local
|
||||
tfsearch.textProperty().addListener(new ChangeListener<String>() {
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
if(settingstrue == false){
|
||||
anpane.getChildren().addAll(settingsBox);
|
||||
|
||||
tfPfad.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
setPath(tfPfad.getText());
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
directoryBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
selectedFolder = directoryChooser.showDialog(null);
|
||||
if(selectedFolder == null){
|
||||
System.out.println("No Directory selected");
|
||||
}else{
|
||||
setPath(selectedFolder.getAbsolutePath());
|
||||
saveSettings();
|
||||
tfPfad.setText(getPath());
|
||||
try {
|
||||
Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu
|
||||
System.exit(0); //beendet sich selbst
|
||||
} catch (IOException e) {
|
||||
System.out.println("es ist ein Fehler aufgetreten");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
mainColor.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
editColor(mainColor.getValue().toString());
|
||||
applyColor();
|
||||
}
|
||||
});
|
||||
sl1.valueProperty().addListener(new ChangeListener<Number>() {
|
||||
@Override
|
||||
public void changed(ObservableValue<? extends Number> ov,Number old_val, Number new_val) {
|
||||
setSize(sl1.getValue());
|
||||
ta1.setFont(Font.font("System", size));
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
|
||||
//updater
|
||||
updateBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
update();
|
||||
}
|
||||
});
|
||||
autoupdateBtn.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
if(autoUpdate.equals("0")){
|
||||
setAutoUpdate("1");
|
||||
saveSettings();
|
||||
}else{
|
||||
setAutoUpdate("0");
|
||||
saveSettings();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
settingstrue = true;
|
||||
}else{
|
||||
anpane.getChildren().removeAll(settingsBox);
|
||||
setPath(tfPfad.getText());
|
||||
saveSettings();
|
||||
settingstrue = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
//demoBtn clicked debbuging
|
||||
demoBtn.setOnAction(new EventHandler<ActionEvent>(){
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
/**
|
||||
* TODO DBController
|
||||
*/
|
||||
// loadData();
|
||||
}
|
||||
});
|
||||
|
||||
streamingSettingsBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
@Override
|
||||
public void handle(ActionEvent event){
|
||||
if(streamingSettingsTrue == false){
|
||||
anpane.getChildren().addAll(streamingSettingsBox);
|
||||
|
||||
streamingDirectoryBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
selectedStreamingFolder = directoryChooser.showDialog(null);
|
||||
if(selectedStreamingFolder == null){
|
||||
System.out.println("No Directory selected");
|
||||
}else{
|
||||
setStreamingPath(selectedStreamingFolder.getAbsolutePath());
|
||||
saveSettings();
|
||||
streamingtfPfad.setText(getStreamingPath());
|
||||
try {
|
||||
Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //starte neu
|
||||
System.exit(0); //beendet sich selbst
|
||||
} catch (IOException e) {
|
||||
System.out.println("es ist ein Fehler aufgetreten");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
});;
|
||||
|
||||
streamingSettingsTrue = true;
|
||||
}else{
|
||||
anpane.getChildren().removeAll(streamingSettingsBox);
|
||||
streamingSettingsTrue = false;
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* TODO menu wieder verschwinden lassen
|
||||
* TODO Banner zur<75>ck auf homeflix setzen
|
||||
*/
|
||||
switchBtn.setOnAction(new EventHandler<ActionEvent>() {
|
||||
|
||||
@Override
|
||||
public void handle(ActionEvent event) {
|
||||
|
||||
if(mode.equals("local")){ //switch to streaming mode
|
||||
setMode("streaming");
|
||||
switchBtn.setText("local");
|
||||
}else if(mode.equals("streaming")){ //switch to local mode
|
||||
setMode("local");
|
||||
switchBtn.setText("streaming");
|
||||
}
|
||||
saveSettings();
|
||||
root.getChildren().remove(0,root.getChildren().size());
|
||||
addDataUI();
|
||||
|
||||
}
|
||||
});
|
||||
public void changed(ObservableValue<? extends String> observable,String oldValue, String newValue) {
|
||||
int counter = newDaten.size();
|
||||
filterData.removeAll(filterData);
|
||||
root.getChildren().remove(0,root.getChildren().size());
|
||||
|
||||
for(int i = 0; i < counter; i++){
|
||||
if(newDaten.get(i).getTitel().toLowerCase().contains(tfsearch.getText().toLowerCase())){
|
||||
filterData.add(newDaten.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
for(int i = 0; i < filterData.size(); i++){
|
||||
root.getChildren().addAll(new TreeItem<streamUiData>(filterData.get(i))); //f<>gt daten zur Rootnode hinzu
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
cbLocal.getSelectionModel().selectedIndexProperty()
|
||||
.addListener(new ChangeListener<Number>() {
|
||||
public void changed(ObservableValue<? extends Number> ov, Number value, Number new_value) {
|
||||
setLocal(new_value.intValue());
|
||||
setLoaclUI(local);
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//pr<70>ft auf Update und f<>rht es gegebenenfalls aus
|
||||
@ -846,13 +803,6 @@ public class MainWindowController {
|
||||
}
|
||||
}
|
||||
}
|
||||
// }else{
|
||||
// Alert alert = new Alert(AlertType.ERROR);
|
||||
// alert.setHeaderText("");
|
||||
// alert.setTitle("Error");
|
||||
// alert.setContentText("Oh, something went wrong! It seems someone has used a wrong mode. Please contact the maintainer!");
|
||||
// alert.showAndWait();
|
||||
// }
|
||||
}
|
||||
|
||||
public void addDataUI(){
|
||||
@ -913,8 +863,8 @@ public class MainWindowController {
|
||||
BigInteger icolor = new BigInteger(getColor(),16);
|
||||
BigInteger ccolor = new BigInteger("78909cff",16);
|
||||
|
||||
menuBox.setStyle(style);
|
||||
topVBox.setStyle(style);
|
||||
sideMenuVBox.setStyle(style);
|
||||
topHBox.setStyle(style);
|
||||
tfsearch.setFocusColor(Color.valueOf(getColor()));
|
||||
tfPfad.setFocusColor(Color.valueOf(getColor()));
|
||||
|
||||
@ -923,7 +873,7 @@ public class MainWindowController {
|
||||
streamingSettingsBtn.setStyle("-fx-text-fill: WHITE;");
|
||||
switchBtn.setStyle("-fx-text-fill: WHITE;");
|
||||
infoBtn.setStyle("-fx-text-fill: WHITE;");
|
||||
demoBtn.setStyle("-fx-text-fill: WHITE;");
|
||||
debugBtn.setStyle("-fx-text-fill: WHITE;");
|
||||
directoryBtn.setStyle(btnStylewhite);
|
||||
streamingDirectoryBtn.setStyle(btnStyle);
|
||||
updateBtn.setStyle(btnStylewhite);
|
||||
@ -937,7 +887,7 @@ public class MainWindowController {
|
||||
streamingSettingsBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
switchBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
infoBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
demoBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
debugBtn.setStyle("-fx-text-fill: BLACK;");
|
||||
directoryBtn.setStyle(btnStyle);
|
||||
streamingDirectoryBtn.setStyle(btnStyle);
|
||||
updateBtn.setStyle(btnStyle);
|
||||
@ -950,7 +900,7 @@ public class MainWindowController {
|
||||
|
||||
//das solte weg kann aber hier bleiben wicht ist dass es zum selben zeitpunkt wie aply color ausgef<65>hrt wird
|
||||
if(mode.equals("local")){
|
||||
switchBtn.setText("streaming");
|
||||
switchBtn.setText("streaming"); //TODO translate
|
||||
}else if(mode.equals("streaming")){
|
||||
switchBtn.setText("local");
|
||||
}
|
||||
@ -967,8 +917,9 @@ public class MainWindowController {
|
||||
default:bundle = ResourceBundle.getBundle("recources.HomeFlix-Local", Locale.US); //default local
|
||||
break;
|
||||
}
|
||||
settingsBtn.setText(bundle.getString("settings"));
|
||||
infoBtn.setText(bundle.getString("info"));
|
||||
settingsBtn.setText(bundle.getString("settings"));
|
||||
streamingSettingsBtn.setText(bundle.getString("streamingSettings"));
|
||||
playbtn.setText(bundle.getString("play"));
|
||||
openfolderbtn.setText(bundle.getString("openFolder"));
|
||||
updateBtn.setText(bundle.getString("checkUpdates"));
|
||||
@ -978,12 +929,17 @@ public class MainWindowController {
|
||||
versionlbl.setText(bundle.getString("version")+" "+version);
|
||||
columnTitel.setText(bundle.getString("columnName"));
|
||||
columnRating.setText(bundle.getString("columnRating"));
|
||||
columnStreamUrl.setText(bundle.getString("columnDatName"));
|
||||
columnStreamUrl.setText(bundle.getString("columnStreamUrl"));
|
||||
columnResolution.setText(bundle.getString("columnResolution"));
|
||||
columnSeason.setText(bundle.getString("columnSeason"));
|
||||
columnYear.setText(bundle.getString("columnYear"));
|
||||
errorUpdateD = bundle.getString("errorUpdateD");
|
||||
errorUpdateV = bundle.getString("errorUpdateV");
|
||||
errorPlay = bundle.getString("errorPlay");
|
||||
errorOpenStream = bundle.getString("errorOpenStream");
|
||||
errorMode = bundle.getString("errorMode");
|
||||
infoText = bundle.getString("version")+" "+version+" plasma bucket"+bundle.getString("infoText");
|
||||
linuxBugText = bundle.getString("linuxBug");
|
||||
errorPlay = bundle.getString("errorPlay");
|
||||
vlcNotInstalled = bundle.getString("vlcNotInstalled");
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
# HomeFlix-Local_de_DE.properties German Local
|
||||
info = Info
|
||||
settings = Einstellungen
|
||||
streamingSettings = Stream Einst.
|
||||
play = play
|
||||
openFolder = Ordner \u00F6ffnen
|
||||
chooseFolder = Ordner ausw\u00E4hlen
|
||||
@ -10,10 +11,15 @@ autoUpdate = beim Start nach Updates suchen:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Bewertung
|
||||
columnDatName = Datei Name
|
||||
columnStreamUrl = Datei Name
|
||||
columnResolution = Aufl\u00F6sung
|
||||
columnSeason = Staffel
|
||||
columnYear = Jahr
|
||||
errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorPlay = Beim \u00F6ffnen der Datei ist ein Fehler aufgetreten! \nError: could not open file (nof) \nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorMode = Oh, da lief etwas falsch! Da hat jemand einen falschen Modus verwendet. \nError: mode unknow (muk)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz
|
||||
errorOpenStream = Beim \u00F6ffnen des Streams ist ein Fehler aufgetreten!
|
||||
linuxBug = Zurzeit werden unter Linux leider keine Dateien mit Leerzeichen unterst\u00FCtzt!
|
||||
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 Kellerkinder www.kellerkinder.xyz
|
||||
|
@ -1,6 +1,7 @@
|
||||
# HomeFlix-Local_en_US.properties US-English Local and default
|
||||
info = Info
|
||||
settings = Settings
|
||||
streamingSettings = Stream Settings
|
||||
play = play
|
||||
openFolder = open Folder
|
||||
chooseFolder = choose Directory
|
||||
@ -10,10 +11,15 @@ autoUpdate = check at startup for updates:
|
||||
version = Version:
|
||||
columnName = Name
|
||||
columnRating = Rating
|
||||
columnDatName = File Name
|
||||
columnStreamUrl = File Name
|
||||
columnResolution = Resolution
|
||||
columnSeason = Season
|
||||
columnYear = Year
|
||||
errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorPlay = An error has occurred during opening the file! \nError: could not open file (nof) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorMode = Oh, something went wrong! It seems someone has used a wrong mode. \nError: mode unknow (muk) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz
|
||||
errorOpenStream = An error has occurred during opening the stream!
|
||||
linuxBug = Currently no files are supported with additional space under Linux unfortunately!
|
||||
vlcNotInstalled = VLC Media Player is required to play a movie!
|
||||
infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016 Kellerkinder www.kellerkinder.xyz
|
||||
|
Reference in New Issue
Block a user