Added Keyframe type dependant title to GuiEditKeyframe
Added Hint to Event Marker Name Input Text Field
This commit is contained in:
@@ -2,6 +2,7 @@ package eu.crushedpixel.replaymod.gui;
|
|||||||
|
|
||||||
import eu.crushedpixel.replaymod.ReplayMod;
|
import eu.crushedpixel.replaymod.ReplayMod;
|
||||||
import eu.crushedpixel.replaymod.events.KeyframesModifyEvent;
|
import eu.crushedpixel.replaymod.events.KeyframesModifyEvent;
|
||||||
|
import eu.crushedpixel.replaymod.gui.elements.GuiAdvancedTextField;
|
||||||
import eu.crushedpixel.replaymod.gui.elements.GuiArrowButton;
|
import eu.crushedpixel.replaymod.gui.elements.GuiArrowButton;
|
||||||
import eu.crushedpixel.replaymod.gui.elements.GuiNumberInput;
|
import eu.crushedpixel.replaymod.gui.elements.GuiNumberInput;
|
||||||
import eu.crushedpixel.replaymod.holders.*;
|
import eu.crushedpixel.replaymod.holders.*;
|
||||||
@@ -29,7 +30,7 @@ public class GuiEditKeyframe extends GuiScreen {
|
|||||||
private GuiNumberInput xCoord, yCoord, zCoord, pitch, yaw, roll;
|
private GuiNumberInput xCoord, yCoord, zCoord, pitch, yaw, roll;
|
||||||
private GuiNumberInput min, sec, ms;
|
private GuiNumberInput min, sec, ms;
|
||||||
|
|
||||||
private GuiTextField markerNameInput;
|
private GuiAdvancedTextField markerNameInput;
|
||||||
|
|
||||||
private List<GuiTextField> inputs = new ArrayList<GuiTextField>();
|
private List<GuiTextField> inputs = new ArrayList<GuiTextField>();
|
||||||
private List<GuiTextField> posInputs = new ArrayList<GuiTextField>();
|
private List<GuiTextField> posInputs = new ArrayList<GuiTextField>();
|
||||||
@@ -50,6 +51,8 @@ public class GuiEditKeyframe extends GuiScreen {
|
|||||||
private int totalWidth;
|
private int totalWidth;
|
||||||
private int left;
|
private int left;
|
||||||
|
|
||||||
|
private String screenTitle;
|
||||||
|
|
||||||
public GuiEditKeyframe(Keyframe keyframe) {
|
public GuiEditKeyframe(Keyframe keyframe) {
|
||||||
this.keyframe = keyframe;
|
this.keyframe = keyframe;
|
||||||
this.keyframeBackup = keyframe.clone();
|
this.keyframeBackup = keyframe.clone();
|
||||||
@@ -62,12 +65,18 @@ public class GuiEditKeyframe extends GuiScreen {
|
|||||||
if(posKeyframe) {
|
if(posKeyframe) {
|
||||||
previous = ReplayHandler.getPreviousPositionKeyframe(keyframe.getRealTimestamp() - 1);
|
previous = ReplayHandler.getPreviousPositionKeyframe(keyframe.getRealTimestamp() - 1);
|
||||||
next = ReplayHandler.getNextPositionKeyframe(keyframe.getRealTimestamp() + 1);
|
next = ReplayHandler.getNextPositionKeyframe(keyframe.getRealTimestamp() + 1);
|
||||||
|
|
||||||
|
screenTitle = I18n.format("replaymod.gui.editkeyframe.title.pos");
|
||||||
} else if(timeKeyframe) {
|
} else if(timeKeyframe) {
|
||||||
previous = ReplayHandler.getPreviousTimeKeyframe(keyframe.getRealTimestamp() - 1);
|
previous = ReplayHandler.getPreviousTimeKeyframe(keyframe.getRealTimestamp() - 1);
|
||||||
next = ReplayHandler.getNextTimeKeyframe(keyframe.getRealTimestamp() + 1);
|
next = ReplayHandler.getNextTimeKeyframe(keyframe.getRealTimestamp() + 1);
|
||||||
|
|
||||||
|
screenTitle = I18n.format("replaymod.gui.editkeyframe.title.time");
|
||||||
} else if(markerKeyframe) {
|
} else if(markerKeyframe) {
|
||||||
previous = ReplayHandler.getPreviousMarkerKeyframe(keyframe.getRealTimestamp() - 1);
|
previous = ReplayHandler.getPreviousMarkerKeyframe(keyframe.getRealTimestamp() - 1);
|
||||||
next = ReplayHandler.getNextMarkerKeyframe(keyframe.getRealTimestamp() + 1);
|
next = ReplayHandler.getNextMarkerKeyframe(keyframe.getRealTimestamp() + 1);
|
||||||
|
|
||||||
|
screenTitle = I18n.format("replaymod.gui.editkeyframe.title.marker");
|
||||||
}
|
}
|
||||||
|
|
||||||
ReplayHandler.selectKeyframe(keyframe);
|
ReplayHandler.selectKeyframe(keyframe);
|
||||||
@@ -120,9 +129,10 @@ public class GuiEditKeyframe extends GuiScreen {
|
|||||||
|
|
||||||
inputs.addAll(posInputs);
|
inputs.addAll(posInputs);
|
||||||
} else if(markerKeyframe) {
|
} else if(markerKeyframe) {
|
||||||
markerNameInput = new GuiTextField(GuiConstants.KEYFRAME_REPOSTORY_NAME_INPUT, fontRendererObj, 0, 0, 300, 20);
|
markerNameInput = new GuiAdvancedTextField(fontRendererObj, 0, 0, 300, 20);
|
||||||
markerNameInput.setText(((MarkerKeyframe)keyframe).getName() == null ? "" : ((MarkerKeyframe)keyframe).getName());
|
markerNameInput.setText(((MarkerKeyframe)keyframe).getName() == null ? "" : ((MarkerKeyframe)keyframe).getName());
|
||||||
inputs.add(markerNameInput);
|
inputs.add(markerNameInput);
|
||||||
|
markerNameInput.hint = I18n.format("replaymod.gui.editkeyframe.markername");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,7 +241,7 @@ public class GuiEditKeyframe extends GuiScreen {
|
|||||||
@Override
|
@Override
|
||||||
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
public void drawScreen(int mouseX, int mouseY, float partialTicks) {
|
||||||
drawGradientRect(10, virtualY, width - 10, virtualY + virtualHeight, -1072689136, -804253680);
|
drawGradientRect(10, virtualY, width - 10, virtualY + virtualHeight, -1072689136, -804253680);
|
||||||
drawCenteredString(fontRendererObj, I18n.format("replaymod.gui.editkeyframe.title"), this.width / 2, virtualY + 5, Color.WHITE.getRGB());
|
drawCenteredString(fontRendererObj, screenTitle, this.width / 2, virtualY + 5, Color.WHITE.getRGB());
|
||||||
|
|
||||||
drawString(fontRendererObj, I18n.format("replaymod.gui.editkeyframe.timelineposition")+":", (width-w3)/2, min.yPosition + 7, Color.WHITE.getRGB());
|
drawString(fontRendererObj, I18n.format("replaymod.gui.editkeyframe.timelineposition")+":", (width-w3)/2, min.yPosition + 7, Color.WHITE.getRGB());
|
||||||
drawString(fontRendererObj, I18n.format("replaymod.gui.minutes"), min.xPosition + min.width + 5, min.yPosition + 7, Color.WHITE.getRGB());
|
drawString(fontRendererObj, I18n.format("replaymod.gui.minutes"), min.xPosition + min.width + 5, min.yPosition + 7, Color.WHITE.getRGB());
|
||||||
|
|||||||
@@ -249,7 +249,10 @@ replaymod.gui.keyframerepository.preset.defaultname=New Keyframe Preset
|
|||||||
replaymod.gui.keyframerepository.duplicate=This Preset already exists
|
replaymod.gui.keyframerepository.duplicate=This Preset already exists
|
||||||
|
|
||||||
#Edit Keyframe GUI
|
#Edit Keyframe GUI
|
||||||
replaymod.gui.editkeyframe.title=Edit Keyframe
|
replaymod.gui.editkeyframe.title.pos=Edit Position Keyframe
|
||||||
|
replaymod.gui.editkeyframe.title.time=Edit Time Keyframe
|
||||||
|
replaymod.gui.editkeyframe.title.marker=Edit Event Marker
|
||||||
|
replaymod.gui.editkeyframe.title.spec=Edit Spectator Keyframe
|
||||||
replaymod.gui.editkeyframe.xpos=X Position
|
replaymod.gui.editkeyframe.xpos=X Position
|
||||||
replaymod.gui.editkeyframe.ypos=Y Position
|
replaymod.gui.editkeyframe.ypos=Y Position
|
||||||
replaymod.gui.editkeyframe.zpos=Z Position
|
replaymod.gui.editkeyframe.zpos=Z Position
|
||||||
@@ -257,6 +260,7 @@ replaymod.gui.editkeyframe.campitch=Camera Pitch
|
|||||||
replaymod.gui.editkeyframe.camyaw=Camera Yaw
|
replaymod.gui.editkeyframe.camyaw=Camera Yaw
|
||||||
replaymod.gui.editkeyframe.camroll=Camera Roll
|
replaymod.gui.editkeyframe.camroll=Camera Roll
|
||||||
replaymod.gui.editkeyframe.timelineposition=Timeline Position
|
replaymod.gui.editkeyframe.timelineposition=Timeline Position
|
||||||
|
replaymod.gui.editkeyframe.markername=Event Marker Name
|
||||||
|
|
||||||
#Render Settings GUI
|
#Render Settings GUI
|
||||||
replaymod.gui.rendersettings.title=Rendering Options
|
replaymod.gui.rendersettings.title=Rendering Options
|
||||||
@@ -312,4 +316,6 @@ replaymod.gui.ingame.menu.renderpath=Render Camera Path
|
|||||||
replaymod.gui.ingame.menu.playpath=Play Camera Path
|
replaymod.gui.ingame.menu.playpath=Play Camera Path
|
||||||
replaymod.gui.ingame.menu.pausepath=Pause Camera Path
|
replaymod.gui.ingame.menu.pausepath=Pause Camera Path
|
||||||
replaymod.gui.ingame.menu.zoomin=Zoom in
|
replaymod.gui.ingame.menu.zoomin=Zoom in
|
||||||
replaymod.gui.ingame.menu.zoomout=Zoom out
|
replaymod.gui.ingame.menu.zoomout=Zoom out
|
||||||
|
|
||||||
|
replaymod.gui.ingame.unnamedmarker=Unnamed Event Marker
|
||||||
Reference in New Issue
Block a user