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

Added footnotes for configurable parameters.

Browse Source
This commit is contained in:
kruland2607 2013-04-16 21:54:45 -05:00
parent c55ad71fd5
commit 50e37d747f
6 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ error.fileExists.desc = File '{filename}' exists. Do you want to overwrite it?
error.writing.title = Error writing file error.writing.title = Error writing file
error.writing.desc = An error occurred while writing to the file: error.writing.desc = An error occurred while writing to the file:
Configuration.lbl.override = Parameter can be overridden in each flight configuration.
! Labels used in buttons of dialog windows ! Labels used in buttons of dialog windows

8
core/src/net/sf/openrocket/gui/configdialog/CommonStrings.java Normal file
View File

@ -0,0 +1,8 @@
package net.sf.openrocket.gui.configdialog;
import net.sf.openrocket.startup.Application;
public class CommonStrings {
public final static String dagger = "\u2020";
public final static String override_description = dagger + Application.getTranslator().get("Configuration.lbl.override");
}

7
core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
View File

@ -134,7 +134,7 @@ public class MotorConfig extends JPanel {
// Select ignition event // Select ignition event
//// Ignition at: //// Ignition at:
panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat")), ""); panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat") + CommonStrings.dagger), "");
IgnitionConfiguration ignitionConfig = mount.getIgnitionConfiguration().getDefault(); IgnitionConfiguration ignitionConfig = mount.getIgnitionConfiguration().getDefault();
combo = new JComboBox(new EnumModel<IgnitionConfiguration.IgnitionEvent>(ignitionConfig, "IgnitionEvent")); combo = new JComboBox(new EnumModel<IgnitionConfiguration.IgnitionEvent>(ignitionConfig, "IgnitionEvent"));
@ -152,6 +152,7 @@ public class MotorConfig extends JPanel {
//// seconds //// seconds
panel.add(new JLabel(trans.get("MotorCfg.lbl.seconds")), "wrap unrel"); panel.add(new JLabel(trans.get("MotorCfg.lbl.seconds")), "wrap unrel");
panel.add(new StyledLabel(CommonStrings.override_description, -1), "spanx, wrap para");
// Check stage count // Check stage count
@ -165,13 +166,13 @@ public class MotorConfig extends JPanel {
panel.add(new StyledLabel(trans.get("MotorCfg.lbl.longA1") + " " + panel.add(new StyledLabel(trans.get("MotorCfg.lbl.longA1") + " " +
trans.get("MotorCfg.lbl.longA2"), -1), trans.get("MotorCfg.lbl.longA2"), -1),
"spanx, right, wrap para"); "spanx, wrap para");
} else { } else {
//// The current design has //// The current design has
//// stages. //// stages.
panel.add(new StyledLabel(trans.get("MotorCfg.lbl.longB1") + " " + stages + " " + panel.add(new StyledLabel(trans.get("MotorCfg.lbl.longB1") + " " + stages + " " +
trans.get("MotorCfg.lbl.longB2"), -1), trans.get("MotorCfg.lbl.longB2"), -1),
"skip 1, spanx, wrap para"); "spanx, wrap para");
} }

5
core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java
View File

@ -190,7 +190,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
//// Deployment //// Deployment
//// Deploys at: //// Deploys at:
panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Deploysat")), ""); panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Deploysat") + CommonStrings.dagger), "");
DeploymentConfiguration deploymentConfig = parachute.getDeploymentConfiguration().getDefault(); DeploymentConfiguration deploymentConfig = parachute.getDeploymentConfiguration().getDefault();
combo = new JComboBox(new EnumModel<DeploymentConfiguration.DeployEvent>(deploymentConfig, "DeployEvent")); combo = new JComboBox(new EnumModel<DeploymentConfiguration.DeployEvent>(deploymentConfig, "DeployEvent"));
@ -209,7 +209,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
panel.add(new JLabel(trans.get("ParachuteCfg.lbl.seconds")), "wrap paragraph"); panel.add(new JLabel(trans.get("ParachuteCfg.lbl.seconds")), "wrap paragraph");
// Altitude: // Altitude:
label = new JLabel(trans.get("ParachuteCfg.lbl.Altitude")); label = new JLabel(trans.get("ParachuteCfg.lbl.Altitude") + CommonStrings.dagger);
altitudeComponents.add(label); altitudeComponents.add(label);
panel.add(label); panel.add(label);
@ -226,6 +226,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
altitudeComponents.add(slider); altitudeComponents.add(slider);
panel.add(slider, "w 100lp, wrap"); panel.add(slider, "w 100lp, wrap");
panel.add(new StyledLabel(CommonStrings.override_description, -1), "spanx, wrap para");
primary.add(panel, "grow"); primary.add(panel, "grow");

4
core/src/net/sf/openrocket/gui/configdialog/StageConfig.java
View File

@ -38,7 +38,7 @@ public class StageConfig extends RocketComponentConfig {
JPanel panel = new JPanel(new MigLayout("fill")); JPanel panel = new JPanel(new MigLayout("fill"));
// Select separation event // Select separation event
panel.add(new StyledLabel(trans.get("separation.lbl.title"), Style.BOLD), "spanx, wrap rel"); panel.add(new StyledLabel(trans.get("separation.lbl.title") + CommonStrings.dagger, Style.BOLD), "spanx, wrap rel");
StageSeparationConfiguration config = stage.getStageSeparationConfiguration().getDefault(); StageSeparationConfiguration config = stage.getStageSeparationConfiguration().getDefault();
JComboBox combo = new JComboBox(new EnumModel<StageSeparationConfiguration.SeparationEvent>(config, "SeparationEvent")); JComboBox combo = new JComboBox(new EnumModel<StageSeparationConfiguration.SeparationEvent>(config, "SeparationEvent"));
@ -55,6 +55,8 @@ public class StageConfig extends RocketComponentConfig {
//// seconds //// seconds
panel.add(new JLabel(trans.get("separation.lbl.seconds")), "wrap unrel"); panel.add(new JLabel(trans.get("separation.lbl.seconds")), "wrap unrel");
panel.add(new StyledLabel(CommonStrings.override_description, -1), "spanx, wrap para");
return panel; return panel;
} }

5
core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
View File

@ -192,7 +192,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
//// Deployment //// Deployment
//// Deploys at: //// Deploys at:
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat")), ""); panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat") + CommonStrings.dagger), "");
DeploymentConfiguration deploymentConfig = streamer.getDeploymentConfiguration().getDefault(); DeploymentConfiguration deploymentConfig = streamer.getDeploymentConfiguration().getDefault();
combo = new JComboBox(new EnumModel<DeploymentConfiguration.DeployEvent>(deploymentConfig, "DeployEvent")); combo = new JComboBox(new EnumModel<DeploymentConfiguration.DeployEvent>(deploymentConfig, "DeployEvent"));
@ -211,7 +211,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
panel.add(new JLabel(trans.get("StreamerCfg.lbl.seconds")), "wrap paragraph"); panel.add(new JLabel(trans.get("StreamerCfg.lbl.seconds")), "wrap paragraph");
// Altitude: // Altitude:
label = new JLabel(trans.get("StreamerCfg.lbl.Altitude")); label = new JLabel(trans.get("StreamerCfg.lbl.Altitude") + CommonStrings.dagger);
altitudeComponents.add(label); altitudeComponents.add(label);
panel.add(label); panel.add(label);
@ -228,6 +228,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
altitudeComponents.add(slider); altitudeComponents.add(slider);
panel.add(slider, "w 100lp, wrap"); panel.add(slider, "w 100lp, wrap");
panel.add(new StyledLabel(CommonStrings.override_description, -1), "skip 1, spanx, wrap para");
primary.add(panel, "grow"); primary.add(panel, "grow");