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

Disable color choice when you have a texture selected.

Browse Source
This commit is contained in:
bkuker 2012-12-17 12:09:56 -05:00
parent 787ef8e347
commit f4a85993e6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ public class AppearancePanel extends JPanel {
} }
final JButton figureColorButton = new JButton(new ColorIcon(figureColor)); final JButton figureColorButton = new JButton(new ColorIcon(figureColor));
final JButton colorButton = new JButton(new ColorIcon(ab.getAmbient())); final JButton colorButton = new JButton(new ColorIcon(ab.getColor()));
final JComboBox textureDropDown = new JComboBox( new DecalModel(this,document,ab));; final JComboBox textureDropDown = new JComboBox( new DecalModel(this,document,ab));;
@ -238,8 +238,15 @@ public class AppearancePanel extends JPanel {
{ // Color { // Color
add(new JLabel(trans.get("AppearanceCfg.lbl.color.Color"))); add(new JLabel(trans.get("AppearanceCfg.lbl.color.Color")));
mDefault.addEnableComponent(colorButton, false); //mDefault.addEnableComponent(colorButton, false);
colorButton.setEnabled(ab.getImage() == null);
add(colorButton); add(colorButton);
ab.addChangeListener(new StateChangeListener() {
@Override
public void stateChanged(EventObject e) {
colorButton.setEnabled(ab.getImage() == null);
}
});
} }
{ // Scale { // Scale