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

Resolve merge conflicts

Browse Source
This commit is contained in:
SiboVG 2022-08-23 15:59:05 +02:00
parent 5ac4a43bdf
commit 0f8622a34a
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
swing/src/net/sf/openrocket/gui/main/DesignPanel.java
View File

@ -4,9 +4,8 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.gui.configdialog.ComponentConfigDialog; import net.sf.openrocket.gui.configdialog.ComponentConfigDialog;
import net.sf.openrocket.gui.main.componenttree.ComponentTree; import net.sf.openrocket.gui.main.componenttree.ComponentTree;
import net.sf.openrocket.gui.scalefigure.RocketPanel;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.widgets.SelectColorButton; import net.sf.openrocket.gui.widgets.IconButton;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.PodSet; import net.sf.openrocket.rocketcomponent.PodSet;
@ -23,6 +22,7 @@ import javax.swing.JScrollPane;
import javax.swing.JSplitPane; import javax.swing.JSplitPane;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.ScrollPaneConstants; import javax.swing.ScrollPaneConstants;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.border.TitledBorder; import javax.swing.border.TitledBorder;
import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionEvent;
@ -183,24 +183,31 @@ public class DesignPanel extends JSplitPane {
// Buttons // Buttons
JButton button = new SelectColorButton(parent.getRocketActions().getMoveUpAction()); JButton button = new IconButton();
button.setHorizontalAlignment(SwingConstants.LEFT);
RocketActions.tieActionToButton(button, parent.getRocketActions().getMoveUpAction());
panel.add(button, "sizegroup buttons, aligny 65%"); panel.add(button, "sizegroup buttons, aligny 65%");
button = new SelectColorButton(parent.getRocketActions().getMoveDownAction()); button = new IconButton();
button.setHorizontalAlignment(SwingConstants.LEFT);
RocketActions.tieActionToButton(button, parent.getRocketActions().getMoveDownAction());
panel.add(button, "sizegroup buttons, aligny 0%"); panel.add(button, "sizegroup buttons, aligny 0%");
button = new SelectColorButton(parent.getRocketActions().getEditAction()); button = new IconButton();
button.setIcon(null); button.setHorizontalAlignment(SwingConstants.LEFT);
RocketActions.tieActionToButton(button, parent.getRocketActions().getEditAction());
button.setMnemonic(0); button.setMnemonic(0);
panel.add(button, "sizegroup buttons, gaptop 20%"); panel.add(button, "sizegroup buttons, gaptop 20%");
button = new SelectColorButton(parent.getRocketActions().getDuplicateAction()); button = new IconButton();
button.setIcon(null); button.setHorizontalAlignment(SwingConstants.LEFT);
RocketActions.tieActionToButton(button, parent.getRocketActions().getDuplicateAction());
button.setMnemonic(0); button.setMnemonic(0);
panel.add(button, "sizegroup buttons"); panel.add(button, "sizegroup buttons");
button = new SelectColorButton(parent.getRocketActions().getDeleteAction()); button = new IconButton();
button.setIcon(null); button.setHorizontalAlignment(SwingConstants.LEFT);
RocketActions.tieActionToButton(button, parent.getRocketActions().getDeleteAction());
button.setMnemonic(0); button.setMnemonic(0);
panel.add(button, "sizegroup buttons"); panel.add(button, "sizegroup buttons");

2
swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
View File

@ -24,8 +24,6 @@ import net.sf.openrocket.gui.main.flightconfigpanel.FlightConfigurablePanel;
import net.sf.openrocket.gui.main.flightconfigpanel.MotorConfigurationPanel; import net.sf.openrocket.gui.main.flightconfigpanel.MotorConfigurationPanel;
import net.sf.openrocket.gui.main.flightconfigpanel.RecoveryConfigurationPanel; import net.sf.openrocket.gui.main.flightconfigpanel.RecoveryConfigurationPanel;
import net.sf.openrocket.gui.main.flightconfigpanel.SeparationConfigurationPanel; import net.sf.openrocket.gui.main.flightconfigpanel.SeparationConfigurationPanel;
import net.sf.openrocket.gui.main.BasicFrame;
import net.sf.openrocket.gui.main.RocketActions;
import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.gui.widgets.IconButton; import net.sf.openrocket.gui.widgets.IconButton;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;