Default render queue job name to output file name (closes #267)

This commit is contained in:
Jonas Herzig
2020-08-29 14:18:00 +02:00
parent db9db0280b
commit d95af541c7
2 changed files with 5 additions and 1 deletions

View File

@@ -116,6 +116,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
// Add content // Add content
GuiLabel label = new GuiLabel().setI18nText("replaymod.gui.renderqueue.jobname").setColor(Colors.BLACK); GuiLabel label = new GuiLabel().setI18nText("replaymod.gui.renderqueue.jobname").setColor(Colors.BLACK);
GuiTextField nameField = new GuiTextField().setSize(150, 20).setFocused(true); GuiTextField nameField = new GuiTextField().setSize(150, 20).setFocused(true);
nameField.setText(guiRenderSettings.getOutputFile().getName());
popup.getInfo().addElements(new HorizontalLayout.Data(0.5), label, nameField); popup.getInfo().addElements(new HorizontalLayout.Data(0.5), label, nameField);
// Disable "Yes" button while name is empty // Disable "Yes" button while name is empty
nameField.onTextChanged(old -> popup.getYesButton().setEnabled(!nameField.getText().isEmpty())).onEnter(() -> { nameField.onTextChanged(old -> popup.getYesButton().setEnabled(!nameField.getText().isEmpty())).onEnter(() -> {
@@ -123,7 +124,6 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
popup.getYesButton().onClick(); popup.getYesButton().onClick();
} }
}); });
popup.getYesButton().setDisabled();
// Register callback // Register callback
Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() { Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
@Override @Override

View File

@@ -574,6 +574,10 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
return new File(folder, fileName + "." + encodingPreset.getFileExtension()); return new File(folder, fileName + "." + encodingPreset.getFileExtension());
} }
public File getOutputFile() {
return outputFile;
}
protected File conformExtension(File file, RenderSettings.EncodingPreset preset) { protected File conformExtension(File file, RenderSettings.EncodingPreset preset) {
String name = file.getName(); String name = file.getName();
if (name.contains(".")) { if (name.contains(".")) {