hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #420 from teyrana/fix_new_stage

Browse Source 
[fix][oneline] both Create Stage buttons now create stages with the same name
This commit is contained in:
Wes Cravens 2018-07-05 00:54:41 -05:00 committed by GitHub
commit 5fcd62dc84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -37,7 +37,6 @@ RocketActions.EditAct.Edit = Edit
RocketActions.EditAct.ttip.Edit = Edit the selected component. RocketActions.EditAct.ttip.Edit = Edit the selected component.
RocketActions.NewStageAct.Newstage = New stage RocketActions.NewStageAct.Newstage = New stage
RocketActions.NewStageAct.ttip.Newstage = Add a new stage to the rocket design. RocketActions.NewStageAct.ttip.Newstage = Add a new stage to the rocket design.
RocketActions.ActBoosterstage = Booster stage
RocketActions.MoveUpAct.Moveup = Move up RocketActions.MoveUpAct.Moveup = Move up
RocketActions.MoveUpAct.ttip.Moveup = Move this component upwards. RocketActions.MoveUpAct.ttip.Moveup = Move this component upwards.
RocketActions.MoveDownAct.Movedown = Move down RocketActions.MoveDownAct.Movedown = Move down

3
swing/src/net/sf/openrocket/gui/main/RocketActions.java
View File

@ -619,8 +619,7 @@ public class RocketActions {
ComponentConfigDialog.hideDialog(); ComponentConfigDialog.hideDialog();
RocketComponent stage = new AxialStage(); RocketComponent stage = new AxialStage();
//// Booster stage
stage.setName(trans.get("RocketActions.ActBoosterstage"));
//// Add stage //// Add stage
document.addUndoPosition("Add stage"); document.addUndoPosition("Add stage");
rocket.addChild(stage); rocket.addChild(stage);