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

Add export components to OBJ export dialog

Browse Source
This commit is contained in:
SiboVG 2023-08-23 21:10:36 +02:00
parent b428e2cde0
commit 022820a708
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1487,6 +1487,8 @@ StorageOptChooser.ttip.Saveopt = Save options
StorageOptChooser.lbl.Saveopt = Save options StorageOptChooser.lbl.Saveopt = Save options
! OBJOptionChooser ! OBJOptionChooser
OBJOptionChooser.lbl.component = <html>Component: %s</html>
OBJOptionChooser.lbl.multipleComponents = <i>Multiple components</i>
OBJOptionChooser.checkbox.exportChildren = Export children OBJOptionChooser.checkbox.exportChildren = Export children
OBJOptionChooser.checkbox.exportChildren.ttip = If true, export children of the selected components as well. OBJOptionChooser.checkbox.exportChildren.ttip = If true, export children of the selected components as well.
OBJOptionChooser.checkbox.exportChildren.assemblies.ttip = Component assemblies always export their children OBJOptionChooser.checkbox.exportChildren.assemblies.ttip = Component assemblies always export their children

36
swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java
View File

@ -50,6 +50,37 @@ public class OBJOptionChooser extends JPanel {
this.selectedComponents = selectedComponents; this.selectedComponents = selectedComponents;
this.rocket = rocket; this.rocket = rocket;
// ------------ Component selection ------------
final boolean singleComponent = selectedComponents.size() == 1;
String componentName = singleComponent ?
"<b>" + selectedComponents.get(0).getName() + "</b>":
trans.get("OBJOptionChooser.lbl.multipleComponents");
JLabel components = new JLabel(String.format(trans.get("OBJOptionChooser.lbl.component"),
componentName));
if (!singleComponent) {
StringBuilder tooltipBuilder = new StringBuilder("<html>");
int counter = 0;
for (int i = 0; i < selectedComponents.size()-1; i++) {
tooltipBuilder.append(selectedComponents.get(i).getName()).append(", ");
// Add line break every 4 components
if (counter == 4) {
tooltipBuilder.append("<br>");
counter = 0;
} else {
counter++;
}
}
tooltipBuilder.append(selectedComponents.get(selectedComponents.size()-1).getComponentName());
tooltipBuilder.append("</html>");
components.setToolTipText(tooltipBuilder.toString());
}
this.add(components, "spanx, wrap");
this.add(new JSeparator(JSeparator.HORIZONTAL), "spanx, growx, wrap para");
// ------------ Basic options ------------ // ------------ Basic options ------------
//// Export children //// Export children
this.exportChildren = new JCheckBox(trans.get("OBJOptionChooser.checkbox.exportChildren")); this.exportChildren = new JCheckBox(trans.get("OBJOptionChooser.checkbox.exportChildren"));
@ -78,12 +109,11 @@ public class OBJOptionChooser extends JPanel {
JSpinner spin = new JSpinner(scalingModel.getSpinnerModel()); JSpinner spin = new JSpinner(scalingModel.getSpinnerModel());
spin.setToolTipText(trans.get("OBJOptionChooser.lbl.Scaling.ttip")); spin.setToolTipText(trans.get("OBJOptionChooser.lbl.Scaling.ttip"));
spin.setEditor(new SpinnerEditor(spin, 5)); spin.setEditor(new SpinnerEditor(spin, 5));
this.add(spin, "wrap para"); this.add(spin, "wrap");
this.add(new JSeparator(JSeparator.HORIZONTAL), "spanx, growx, wrap para");
// ------------ Advanced options ------------ // ------------ Advanced options ------------
this.add(new JSeparator(JSeparator.HORIZONTAL), "spanx, growx, wrap");
// Show advanced options toggle // Show advanced options toggle
JToggleButton advancedToggle = new JToggleButton(trans.get("OBJOptionChooser.btn.showAdvanced")); JToggleButton advancedToggle = new JToggleButton(trans.get("OBJOptionChooser.btn.showAdvanced"));
this.add(advancedToggle, "spanx, wrap para"); this.add(advancedToggle, "spanx, wrap para");