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

Refresh the texture drop down contents when one edits a single copy of a

Browse Source 
decal
This commit is contained in:
kruland2607 2013-09-03 14:53:51 -05:00
parent 265fdfe05e
commit 4c3a16f02b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/gui/adaptors/DecalModel.java
View File

@ -93,4 +93,8 @@ public class DecalModel extends AbstractListModel implements ComboBoxModel {
} }
} }
public void refresh() {
decals = document.getDecalList().toArray(new DecalImage[0]);
fireContentsChanged(this, 0, decals.length);
}
} }

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

@ -145,7 +145,8 @@ public class AppearancePanel extends JPanel {
final JButton colorButton = new JButton(new ColorIcon(ab.getPaint())); final JButton colorButton = new JButton(new ColorIcon(ab.getPaint()));
final JComboBox textureDropDown = new JComboBox(new DecalModel(this, document, ab)); final DecalModel decalModel = new DecalModel(this, document, ab);
final JComboBox textureDropDown = new JComboBox(decalModel);
ab.addChangeListener(new StateChangeListener() { ab.addChangeListener(new StateChangeListener() {
@Override @Override
@ -274,6 +275,7 @@ public class AppearancePanel extends JPanel {
try { try {
DecalImage newImage = editDecalHelper.editDecal(SwingUtilities.getWindowAncestor(AppearancePanel.this), document, c, ab.getImage()); DecalImage newImage = editDecalHelper.editDecal(SwingUtilities.getWindowAncestor(AppearancePanel.this), document, c, ab.getImage());
ab.setImage(newImage); ab.setImage(newImage);
decalModel.refresh();
} catch (EditDecalHelperException ex) { } catch (EditDecalHelperException ex) {
JOptionPane.showMessageDialog(AppearancePanel.this, ex.getMessage(), "", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(AppearancePanel.this, ex.getMessage(), "", JOptionPane.ERROR_MESSAGE);
} }