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

Merge pull request #1995 from JoePfeiffer/graphics-editor-linux

Browse Source 
Enable decal editing in Linux
This commit is contained in:
Billy Olsen 2023-01-25 11:34:54 -07:00 committed by GitHub
commit 3f9b98cea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -32,6 +32,8 @@ import net.sf.openrocket.appearance.AppearanceBuilder;
import net.sf.openrocket.appearance.Decal.EdgeMode; import net.sf.openrocket.appearance.Decal.EdgeMode;
import net.sf.openrocket.appearance.DecalImage; import net.sf.openrocket.appearance.DecalImage;
import net.sf.openrocket.appearance.defaults.DefaultAppearance; import net.sf.openrocket.appearance.defaults.DefaultAppearance;
import net.sf.openrocket.arch.SystemInfo;
import net.sf.openrocket.arch.SystemInfo.Platform;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.gui.SpinnerEditor; import net.sf.openrocket.gui.SpinnerEditor;
import net.sf.openrocket.gui.adaptors.BooleanModel; import net.sf.openrocket.gui.adaptors.BooleanModel;
@ -578,12 +580,12 @@ public class AppearancePanel extends JPanel {
order.add(textureDropDown); order.add(textureDropDown);
//// Edit button //// Edit button
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) { if ((SystemInfo.getPlatform() != Platform.UNIX) || !SystemInfo.isConfined()) {
JButton editBtn = new SelectColorButton( JButton editBtn = new SelectColorButton(
trans.get("AppearanceCfg.but.edit")); trans.get("AppearanceCfg.but.edit"));
editBtn.setEnabled(!materialDefault.isSelected() && builder.getImage() != null);
// Enable the editBtn only when the appearance builder has an Image // Enable the editBtn only when the appearance builder has an Image
// assigned to it. // assigned to it.
editBtn.setEnabled(!materialDefault.isSelected() && builder.getImage() != null);
builder.addChangeListener(new StateChangeListener() { builder.addChangeListener(new StateChangeListener() {
@Override @Override
public void stateChanged(EventObject e) { public void stateChanged(EventObject e) {

4
swing/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java
View File

@ -96,11 +96,11 @@ public class EditDecalDialog extends JDialog {
} else { } else {
commandText = new JTextArea(); commandText = new JTextArea();
commandText.setEnabled(false); commandText.setEnabled(true);
panel.add(commandText, "growx, wrap"); panel.add(commandText, "growx, wrap");
final JButton chooser = new SelectColorButton(trans.get("EditDecalDialog.btn.chooser")); final JButton chooser = new SelectColorButton(trans.get("EditDecalDialog.btn.chooser"));
chooser.setEnabled(false); chooser.setEnabled(true);
chooser.addActionListener(new ActionListener() { chooser.addActionListener(new ActionListener() {
@Override @Override

2
swing/src/net/sf/openrocket/gui/dialogs/preferences/GraphicsPreferencesPanel.java
View File

@ -145,7 +145,7 @@ public class GraphicsPreferencesPanel extends PreferencesPanel {
* we will rely on using the xdg-open command which allows the user to pick * we will rely on using the xdg-open command which allows the user to pick
* their preferred application. * their preferred application.
*/ */
if (SystemInfo.getPlatform() != Platform.UNIX && !SystemInfo.isConfined()) { if ((SystemInfo.getPlatform() != Platform.UNIX) || !SystemInfo.isConfined()) {
this.add(editorPrefPanel, "growx, span"); this.add(editorPrefPanel, "growx, span");
} }