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

Make the default checkbox text work the right way: check box's text, not a separate label

Browse Source
This commit is contained in:
Bill Kuker 2012-07-14 14:52:16 +00:00 committed by U-WINDOWS-C28163E\Administrator
parent 6a2ebb6851
commit 4ab28bbf54
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -700,7 +700,7 @@ MotorDbLoadDlg.Loadingmotors = Loading motors...
! AppearanceConfig ! AppearanceConfig
AppearanceCfg.lbl.Appearance = Appearance AppearanceCfg.lbl.Appearance = Appearance
AppearanceCfg.lbl.Usedefault = Use default appearance AppearanceCfg.lbl.Usedefault = Use default
AppearanceCfg.but.savedefault = Save as default appearance AppearanceCfg.but.savedefault = Save as default appearance
AppearanceCfg.lbl.Texture = Texture: AppearanceCfg.lbl.Texture = Texture:
AppearanceCfg.lbl.Choose = Choose AppearanceCfg.lbl.Choose = Choose
@ -760,7 +760,7 @@ RocketCompCfg.lbl.Commentsonthe = Comments on the
RocketCompCfg.lbl.Figurestyle = Figure style: RocketCompCfg.lbl.Figurestyle = Figure style:
RocketCompCfg.lbl.Componentcolor = Component color: RocketCompCfg.lbl.Componentcolor = Component color:
RocketCompCfg.lbl.Choosecolor = Choose color RocketCompCfg.lbl.Choosecolor = Choose color
RocketCompCfg.checkbox.Usedefaultcolor = Use default color RocketCompCfg.checkbox.Usedefaultcolor = Use default
RocketCompCfg.lbl.Complinestyle = Component line style: RocketCompCfg.lbl.Complinestyle = Component line style:
RocketCompCfg.but.Saveasdefstyle = Save as default style RocketCompCfg.but.Saveasdefstyle = Save as default style
RocketCompCfg.lbl.Diameter = Diameter: RocketCompCfg.lbl.Diameter = Diameter:

10
core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -154,10 +154,9 @@ public class AppearancePanel extends JPanel {
} }
} }
}); });
colorDefault.setText(trans.get("RocketCompCfg.checkbox.Usedefaultcolor"));
add(new StyledLabel(trans.get("RocketCompCfg.lbl.Figurestyle"), Style.BOLD)); add(new StyledLabel(trans.get("RocketCompCfg.lbl.Figurestyle"), Style.BOLD));
add(colorDefault, "split 2"); add(colorDefault);
add(new JLabel(trans.get("RocketCompCfg.checkbox.Usedefaultcolor")));
JButton button = new JButton(trans.get("RocketCompCfg.but.Saveasdefstyle")); JButton button = new JButton(trans.get("RocketCompCfg.but.Saveasdefstyle"));
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@ -215,9 +214,8 @@ public class AppearancePanel extends JPanel {
} }
} }
}); });
materialDefault.setText(trans.get("AppearanceCfg.lbl.Usedefault"));
add(materialDefault, "split 2"); add(materialDefault);
add(new JLabel(trans.get("AppearanceCfg.lbl.Usedefault")));
JButton setMDefault = new JButton(trans.get("AppearanceCfg.but.savedefault")); JButton setMDefault = new JButton(trans.get("AppearanceCfg.but.savedefault"));
mDefault.addEnableComponent(setMDefault, false); mDefault.addEnableComponent(setMDefault, false);
add(setMDefault, "span 2, align right, wrap"); add(setMDefault, "span 2, align right, wrap");