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

Rename 'copy configuration' to 'duplicate configuration'

Browse Source
This commit is contained in:
SiboVG 2022-05-31 23:00:40 +02:00
parent f7a61cb72b
commit 8d3e67bfb1
7 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ edtmotorconfdlg.col.configuration = Configuration
edtmotorconfdlg.but.Removeconfiguration = Remove Configuration edtmotorconfdlg.but.Removeconfiguration = Remove Configuration
edtmotorconfdlg.but.Renameconfiguration = Rename Configuration edtmotorconfdlg.but.Renameconfiguration = Rename Configuration
edtmotorconfdlg.but.Newconfiguration = New Configuration edtmotorconfdlg.but.Newconfiguration = New Configuration
edtmotorconfdlg.but.Copyconfiguration = Copy Configuration edtmotorconfdlg.but.Duplicateconfiguration = Duplicate Configuration
edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations
edtmotorconfdlg.title.Renameconf = Rename Flight Configuration edtmotorconfdlg.title.Renameconf = Rename Flight Configuration
edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration

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

@ -1382,7 +1382,7 @@ dlg.but.close = Cerrar
! Common labels used in buttons of dialog windows ! Common labels used in buttons of dialog windows
dlg.but.ok = OK dlg.but.ok = OK
edtmotorconfdlg.but.Copyconfiguration = Copiar edtmotorconfdlg.but.Duplicateconfiguration = Duplicar
edtmotorconfdlg.but.Newconfiguration = Nueva configuraci\u00f3n edtmotorconfdlg.but.Newconfiguration = Nueva configuraci\u00f3n
! Edit Motor configuration dialog ! Edit Motor configuration dialog
edtmotorconfdlg.but.Removeconfiguration = Quitar configuraci\u00f3n edtmotorconfdlg.but.Removeconfiguration = Quitar configuraci\u00f3n

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

@ -1377,7 +1377,7 @@ dlg.but.close = Fermer
! Common labels used in buttons of dialog windows ! Common labels used in buttons of dialog windows
dlg.but.ok = Accepter dlg.but.ok = Accepter
edtmotorconfdlg.but.Copyconfiguration = Copier edtmotorconfdlg.but.Duplicateconfiguration = Dupliquer
edtmotorconfdlg.but.Newconfiguration = Nouvelle configuration edtmotorconfdlg.but.Newconfiguration = Nouvelle configuration
edtmotorconfdlg.but.Removeconfiguration = Supprimer la configuration edtmotorconfdlg.but.Removeconfiguration = Supprimer la configuration
edtmotorconfdlg.but.Renameconfiguration = Renommer edtmotorconfdlg.but.Renameconfiguration = Renommer

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

@ -181,7 +181,7 @@ edtmotorconfdlg.col.configuration = Configuratie
edtmotorconfdlg.but.Removeconfiguration = Verwijder Configuratie edtmotorconfdlg.but.Removeconfiguration = Verwijder Configuratie
edtmotorconfdlg.but.Renameconfiguration = Hernoem Configuratie edtmotorconfdlg.but.Renameconfiguration = Hernoem Configuratie
edtmotorconfdlg.but.Newconfiguration = Nieuwe Configuratie edtmotorconfdlg.but.Newconfiguration = Nieuwe Configuratie
edtmotorconfdlg.but.Copyconfiguration = Kopieer Configuratie edtmotorconfdlg.but.Duplicateconfiguration = Dupliceer Configuratie
edtmotorconfdlg.title.Editmotorconf = Pas Vluchtconfiguratie Aan edtmotorconfdlg.title.Editmotorconf = Pas Vluchtconfiguratie Aan
edtmotorconfdlg.title.Renameconf = Hernoem Vluchtconfiguratie edtmotorconfdlg.title.Renameconf = Hernoem Vluchtconfiguratie
edtmotorconfdlg.title.Selectdeploymentconf = Selecteer Ontplooiingconfiguratie edtmotorconfdlg.title.Selectdeploymentconf = Selecteer Ontplooiingconfiguratie

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

@ -1340,7 +1340,7 @@ dlg.but.close = Fechar
# Common labels used in buttons of dialog windows # Common labels used in buttons of dialog windows
dlg.but.ok = Ok dlg.but.ok = Ok
edtmotorconfdlg.but.Copyconfiguration = Copiar edtmotorconfdlg.but.Duplicateconfiguration = Duplikat
edtmotorconfdlg.but.Newconfiguration = Nova configura\u00e7\u00e3o edtmotorconfdlg.but.Newconfiguration = Nova configura\u00e7\u00e3o
edtmotorconfdlg.but.Removeconfiguration = Remover configura\u00e7\u00e3o edtmotorconfdlg.but.Removeconfiguration = Remover configura\u00e7\u00e3o
edtmotorconfdlg.but.Renameconfiguration = Renomear edtmotorconfdlg.but.Renameconfiguration = Renomear

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

@ -183,7 +183,7 @@ edtmotorconfdlg.col.configuration = Configuration
edtmotorconfdlg.but.Removeconfiguration = Remove Configuration edtmotorconfdlg.but.Removeconfiguration = Remove Configuration
edtmotorconfdlg.but.Renameconfiguration = Rename Configuration edtmotorconfdlg.but.Renameconfiguration = Rename Configuration
edtmotorconfdlg.but.Newconfiguration = New Configuration edtmotorconfdlg.but.Newconfiguration = New Configuration
edtmotorconfdlg.but.Copyconfiguration = Copy Configuration edtmotorconfdlg.but.Duplicateconfiguration = Duplicate Configuration
edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations
edtmotorconfdlg.title.Renameconf = Rename Flight Configuration edtmotorconfdlg.title.Renameconf = Rename Flight Configuration
edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration

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

@ -3,7 +3,6 @@ package net.sf.openrocket.gui.main.flightconfigpanel;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.EventObject; import java.util.EventObject;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -31,7 +30,6 @@ import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketvisitors.ListComponents; import net.sf.openrocket.rocketvisitors.ListComponents;
import net.sf.openrocket.rocketvisitors.ListMotorMounts; import net.sf.openrocket.rocketvisitors.ListMotorMounts;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayList;
import net.sf.openrocket.util.StateChangeListener; import net.sf.openrocket.util.StateChangeListener;
import net.sf.openrocket.gui.widgets.SelectColorButton; import net.sf.openrocket.gui.widgets.SelectColorButton;
@ -43,7 +41,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
private final Rocket rocket; private final Rocket rocket;
private final BasicFrame basicFrame; private final BasicFrame basicFrame;
private final JButton newConfButton, renameConfButton, removeConfButton, copyConfButton; private final JButton newConfButton, renameConfButton, removeConfButton, duplicateConfButton;
private final JTabbedPane tabs; private final JTabbedPane tabs;
private final MotorConfigurationPanel motorConfigurationPanel; private final MotorConfigurationPanel motorConfigurationPanel;
@ -83,7 +81,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
newConfButton.addActionListener(new ActionListener() { newConfButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
newOrCopyConfigAction(false); newOrDuplicateConfigAction(false);
} }
}); });
@ -110,14 +108,14 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
}); });
this.add(removeConfButton,"gapright para"); this.add(removeConfButton,"gapright para");
copyConfButton = new SelectColorButton(trans.get("edtmotorconfdlg.but.Copyconfiguration")); duplicateConfButton = new SelectColorButton(trans.get("edtmotorconfdlg.but.Duplicateconfiguration"));
copyConfButton.addActionListener(new ActionListener() { duplicateConfButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
newOrCopyConfigAction(true); newOrDuplicateConfigAction(true);
} }
}); });
this.add(copyConfButton, "wrap"); this.add(duplicateConfButton, "wrap");
tabs.addChangeListener(new ChangeListener() { tabs.addChangeListener(new ChangeListener() {
@Override @Override
@ -143,11 +141,11 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
} }
/** /**
* Action for when the new configuration or copy configuration button is pressed. * Action for when the new configuration or duplicate configuration button is pressed.
* @param copy if True, then copy configuration operation, if False then create a new configuration * @param duplicate if True, then duplicate configuration operation, if False then create a new configuration
*/ */
private void newOrCopyConfigAction(boolean copy) { private void newOrDuplicateConfigAction(boolean duplicate) {
addOrCopyConfiguration(copy); addOrDuplicateConfiguration(duplicate);
configurationChanged(ComponentChangeEvent.MOTOR_CHANGE); configurationChanged(ComponentChangeEvent.MOTOR_CHANGE);
stateChanged(null); stateChanged(null);
switch (tabs.getSelectedIndex()) { switch (tabs.getSelectedIndex()) {
@ -165,15 +163,15 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
} }
/** /**
* either create or copy configuration * either create or duplicate configuration
* set new configuration as current * set new configuration as current
* create simulation for new configuration * create simulation for new configuration
*/ */
private void addOrCopyConfiguration(boolean copy) { private void addOrDuplicateConfiguration(boolean duplicate) {
final Map<FlightConfigurationId, FlightConfiguration> newConfigs = new LinkedHashMap<>(); final Map<FlightConfigurationId, FlightConfiguration> newConfigs = new LinkedHashMap<>();
// create or copy configuration // create or duplicate configuration
if (copy) { if (duplicate) {
List<FlightConfigurationId> oldIds = getSelectedConfigurationIds(); List<FlightConfigurationId> oldIds = getSelectedConfigurationIds();
if (oldIds == null || oldIds.size() == 0) return; if (oldIds == null || oldIds.size() == 0) return;
@ -248,10 +246,10 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
private void updateButtonState() { private void updateButtonState() {
FlightConfigurationId currentId = rocket.getSelectedConfiguration().getFlightConfigurationID(); FlightConfigurationId currentId = rocket.getSelectedConfiguration().getFlightConfigurationID();
// Enable the remove/rename/copy buttons only when a configuration is selected. // Enable the remove/rename/duplicate buttons only when a configuration is selected.
removeConfButton.setEnabled(currentId.isValid()); removeConfButton.setEnabled(currentId.isValid());
renameConfButton.setEnabled(currentId.isValid()); renameConfButton.setEnabled(currentId.isValid());
copyConfButton.setEnabled(currentId.isValid()); duplicateConfButton.setEnabled(currentId.isValid());
// Count the number of motor mounts // Count the number of motor mounts
int motorMountCount = rocket.accept(new ListMotorMounts()).size(); int motorMountCount = rocket.accept(new ListMotorMounts()).size();