From 114e6769176b97bc56c83fbb44138b1f80f0bf1c Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Tue, 3 Jul 2018 15:00:55 +0200 Subject: [PATCH] Added textfield to recording tab, so that you can add models manually --- .classpath | 9 ++---- .settings/org.eclipse.jdt.core.prefs | 7 +++-- .../java/ctbrec/ui/RecordedModelsTab.java | 29 +++++++++++++++++++ 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.classpath b/.classpath index de8cd3cb..202554a4 100644 --- a/.classpath +++ b/.classpath @@ -11,12 +11,7 @@ - - - - - - + @@ -26,11 +21,13 @@ + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 7c5d29a4..8445b6b1 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=10 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=10 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/main/java/ctbrec/ui/RecordedModelsTab.java b/src/main/java/ctbrec/ui/RecordedModelsTab.java index affcd6e0..cd60d949 100644 --- a/src/main/java/ctbrec/ui/RecordedModelsTab.java +++ b/src/main/java/ctbrec/ui/RecordedModelsTab.java @@ -21,12 +21,15 @@ import javafx.concurrent.Task; import javafx.geometry.Insets; import javafx.scene.Cursor; import javafx.scene.control.Alert; +import javafx.scene.control.Button; import javafx.scene.control.ContextMenu; +import javafx.scene.control.Label; import javafx.scene.control.MenuItem; import javafx.scene.control.ScrollPane; import javafx.scene.control.Tab; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; +import javafx.scene.control.TextField; import javafx.scene.control.cell.CheckBoxTableCell; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.input.Clipboard; @@ -35,6 +38,7 @@ import javafx.scene.input.ContextMenuEvent; import javafx.scene.input.MouseEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.FlowPane; +import javafx.scene.layout.HBox; import javafx.util.Duration; public class RecordedModelsTab extends Tab implements TabSelectionListener { @@ -49,6 +53,10 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener { ObservableList observableModels = FXCollections.observableArrayList(); ContextMenu popup = createContextMenu(); + Label modelLabel = new Label("Model"); + TextField model = new TextField(); + Button addModelButton = new Button("Record"); + public RecordedModelsTab(String title, Recorder recorder) { super(title); this.recorder = recorder; @@ -93,8 +101,29 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener { }); scrollPane.setContent(table); + HBox addModelBox = new HBox(5); + addModelBox.getChildren().addAll(modelLabel, model, addModelButton); + modelLabel.setPadding(new Insets(5, 0, 0, 0)); + model.setPrefWidth(300); + BorderPane.setMargin(addModelBox, new Insets(5)); + addModelButton.setOnAction((e) -> { + Model m = new Model(); + m.setName(model.getText()); + m.setUrl("https://chaturbate.com/" + m.getName() + "/"); + try { + recorder.startRecording(m); + } catch (IOException e1) { + Alert alert = new AutosizeAlert(Alert.AlertType.ERROR); + alert.setTitle("Error"); + alert.setHeaderText("Couldn't add model"); + alert.setContentText("The model " + m.getName() + " could not be added: " + e1.getLocalizedMessage()); + alert.showAndWait(); + } + }); + BorderPane root = new BorderPane(); root.setPadding(new Insets(5)); + root.setTop(addModelBox); root.setCenter(scrollPane); setContent(root); }