From 39dfa29d70cce4ecffeaffa358f7d028ea96582f Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Thu, 18 Jun 2015 16:02:32 +0200 Subject: [PATCH] Added Keyframe type dependant title to GuiEditKeyframe Added Hint to Event Marker Name Input Text Field --- .../replaymod/gui/GuiEditKeyframe.java | 16 +++++++++++++--- .../resources/assets/replaymod/lang/en_US.lang | 10 ++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java index 14dde1ba..1e82eedb 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java @@ -2,6 +2,7 @@ package eu.crushedpixel.replaymod.gui; import eu.crushedpixel.replaymod.ReplayMod; 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.GuiNumberInput; import eu.crushedpixel.replaymod.holders.*; @@ -29,7 +30,7 @@ public class GuiEditKeyframe extends GuiScreen { private GuiNumberInput xCoord, yCoord, zCoord, pitch, yaw, roll; private GuiNumberInput min, sec, ms; - private GuiTextField markerNameInput; + private GuiAdvancedTextField markerNameInput; private List inputs = new ArrayList(); private List posInputs = new ArrayList(); @@ -50,6 +51,8 @@ public class GuiEditKeyframe extends GuiScreen { private int totalWidth; private int left; + private String screenTitle; + public GuiEditKeyframe(Keyframe keyframe) { this.keyframe = keyframe; this.keyframeBackup = keyframe.clone(); @@ -62,12 +65,18 @@ public class GuiEditKeyframe extends GuiScreen { if(posKeyframe) { previous = ReplayHandler.getPreviousPositionKeyframe(keyframe.getRealTimestamp() - 1); next = ReplayHandler.getNextPositionKeyframe(keyframe.getRealTimestamp() + 1); + + screenTitle = I18n.format("replaymod.gui.editkeyframe.title.pos"); } else if(timeKeyframe) { previous = ReplayHandler.getPreviousTimeKeyframe(keyframe.getRealTimestamp() - 1); next = ReplayHandler.getNextTimeKeyframe(keyframe.getRealTimestamp() + 1); + + screenTitle = I18n.format("replaymod.gui.editkeyframe.title.time"); } else if(markerKeyframe) { previous = ReplayHandler.getPreviousMarkerKeyframe(keyframe.getRealTimestamp() - 1); next = ReplayHandler.getNextMarkerKeyframe(keyframe.getRealTimestamp() + 1); + + screenTitle = I18n.format("replaymod.gui.editkeyframe.title.marker"); } ReplayHandler.selectKeyframe(keyframe); @@ -120,9 +129,10 @@ public class GuiEditKeyframe extends GuiScreen { inputs.addAll(posInputs); } 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()); inputs.add(markerNameInput); + markerNameInput.hint = I18n.format("replaymod.gui.editkeyframe.markername"); } } @@ -231,7 +241,7 @@ public class GuiEditKeyframe extends GuiScreen { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { 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.minutes"), min.xPosition + min.width + 5, min.yPosition + 7, Color.WHITE.getRGB()); diff --git a/src/main/resources/assets/replaymod/lang/en_US.lang b/src/main/resources/assets/replaymod/lang/en_US.lang index 4dc7459f..6cc74764 100644 --- a/src/main/resources/assets/replaymod/lang/en_US.lang +++ b/src/main/resources/assets/replaymod/lang/en_US.lang @@ -249,7 +249,10 @@ replaymod.gui.keyframerepository.preset.defaultname=New Keyframe Preset replaymod.gui.keyframerepository.duplicate=This Preset already exists #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.ypos=Y 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.camroll=Camera Roll replaymod.gui.editkeyframe.timelineposition=Timeline Position +replaymod.gui.editkeyframe.markername=Event Marker Name #Render Settings GUI 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.pausepath=Pause Camera Path replaymod.gui.ingame.menu.zoomin=Zoom in -replaymod.gui.ingame.menu.zoomout=Zoom out \ No newline at end of file +replaymod.gui.ingame.menu.zoomout=Zoom out + +replaymod.gui.ingame.unnamedmarker=Unnamed Event Marker \ No newline at end of file