From 8d3e67bfb120b6e79ec4fa1c5aaf86a53ee0eb15 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 31 May 2022 23:00:40 +0200 Subject: [PATCH] Rename 'copy configuration' to 'duplicate configuration' --- core/resources/l10n/messages.properties | 2 +- core/resources/l10n/messages_es.properties | 2 +- core/resources/l10n/messages_fr.properties | 2 +- core/resources/l10n/messages_nl.properties | 2 +- core/resources/l10n/messages_pt.properties | 2 +- core/resources/l10n/messages_uk_UA.properties | 2 +- .../FlightConfigurationPanel.java | 34 +++++++++---------- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 85b9d601c..6023ef641 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -191,7 +191,7 @@ edtmotorconfdlg.col.configuration = Configuration edtmotorconfdlg.but.Removeconfiguration = Remove Configuration edtmotorconfdlg.but.Renameconfiguration = Rename Configuration edtmotorconfdlg.but.Newconfiguration = New Configuration -edtmotorconfdlg.but.Copyconfiguration = Copy Configuration +edtmotorconfdlg.but.Duplicateconfiguration = Duplicate Configuration edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations edtmotorconfdlg.title.Renameconf = Rename Flight Configuration edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index 44b524abb..61318e768 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -1382,7 +1382,7 @@ dlg.but.close = Cerrar ! Common labels used in buttons of dialog windows dlg.but.ok = OK -edtmotorconfdlg.but.Copyconfiguration = Copiar +edtmotorconfdlg.but.Duplicateconfiguration = Duplicar edtmotorconfdlg.but.Newconfiguration = Nueva configuraci\u00f3n ! Edit Motor configuration dialog edtmotorconfdlg.but.Removeconfiguration = Quitar configuraci\u00f3n diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index 045406135..4b371f405 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -1377,7 +1377,7 @@ dlg.but.close = Fermer ! Common labels used in buttons of dialog windows dlg.but.ok = Accepter -edtmotorconfdlg.but.Copyconfiguration = Copier +edtmotorconfdlg.but.Duplicateconfiguration = Dupliquer edtmotorconfdlg.but.Newconfiguration = Nouvelle configuration edtmotorconfdlg.but.Removeconfiguration = Supprimer la configuration edtmotorconfdlg.but.Renameconfiguration = Renommer diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index ba73e4b30..4d2ea8ae2 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -181,7 +181,7 @@ edtmotorconfdlg.col.configuration = Configuratie edtmotorconfdlg.but.Removeconfiguration = Verwijder Configuratie edtmotorconfdlg.but.Renameconfiguration = Hernoem Configuratie edtmotorconfdlg.but.Newconfiguration = Nieuwe Configuratie -edtmotorconfdlg.but.Copyconfiguration = Kopieer Configuratie +edtmotorconfdlg.but.Duplicateconfiguration = Dupliceer Configuratie edtmotorconfdlg.title.Editmotorconf = Pas Vluchtconfiguratie Aan edtmotorconfdlg.title.Renameconf = Hernoem Vluchtconfiguratie edtmotorconfdlg.title.Selectdeploymentconf = Selecteer Ontplooiingconfiguratie diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index 1dba087eb..bf6db32c0 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -1340,7 +1340,7 @@ dlg.but.close = Fechar # Common labels used in buttons of dialog windows dlg.but.ok = Ok -edtmotorconfdlg.but.Copyconfiguration = Copiar +edtmotorconfdlg.but.Duplicateconfiguration = Duplikat edtmotorconfdlg.but.Newconfiguration = Nova configura\u00e7\u00e3o edtmotorconfdlg.but.Removeconfiguration = Remover configura\u00e7\u00e3o edtmotorconfdlg.but.Renameconfiguration = Renomear diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 29c9ae3cd..8e012cbfe 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -183,7 +183,7 @@ edtmotorconfdlg.col.configuration = Configuration edtmotorconfdlg.but.Removeconfiguration = Remove Configuration edtmotorconfdlg.but.Renameconfiguration = Rename Configuration edtmotorconfdlg.but.Newconfiguration = New Configuration -edtmotorconfdlg.but.Copyconfiguration = Copy Configuration +edtmotorconfdlg.but.Duplicateconfiguration = Duplicate Configuration edtmotorconfdlg.title.Editmotorconf = Edit Flight configurations edtmotorconfdlg.title.Renameconf = Rename Flight Configuration edtmotorconfdlg.title.Selectdeploymentconf = Select Deployment Configuration diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java index e6c306b3d..e03225cd8 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java @@ -3,7 +3,6 @@ package net.sf.openrocket.gui.main.flightconfigpanel; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.EventObject; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; 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.ListMotorMounts; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.StateChangeListener; import net.sf.openrocket.gui.widgets.SelectColorButton; @@ -43,7 +41,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe private final Rocket rocket; private final BasicFrame basicFrame; - private final JButton newConfButton, renameConfButton, removeConfButton, copyConfButton; + private final JButton newConfButton, renameConfButton, removeConfButton, duplicateConfButton; private final JTabbedPane tabs; private final MotorConfigurationPanel motorConfigurationPanel; @@ -83,7 +81,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe newConfButton.addActionListener(new ActionListener() { @Override 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"); - copyConfButton = new SelectColorButton(trans.get("edtmotorconfdlg.but.Copyconfiguration")); - copyConfButton.addActionListener(new ActionListener() { + duplicateConfButton = new SelectColorButton(trans.get("edtmotorconfdlg.but.Duplicateconfiguration")); + duplicateConfButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - newOrCopyConfigAction(true); + newOrDuplicateConfigAction(true); } }); - this.add(copyConfButton, "wrap"); + this.add(duplicateConfButton, "wrap"); tabs.addChangeListener(new ChangeListener() { @Override @@ -143,11 +141,11 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe } /** - * Action for when the new configuration or copy configuration button is pressed. - * @param copy if True, then copy configuration operation, if False then create a new configuration + * Action for when the new configuration or duplicate configuration button is pressed. + * @param duplicate if True, then duplicate configuration operation, if False then create a new configuration */ - private void newOrCopyConfigAction(boolean copy) { - addOrCopyConfiguration(copy); + private void newOrDuplicateConfigAction(boolean duplicate) { + addOrDuplicateConfiguration(duplicate); configurationChanged(ComponentChangeEvent.MOTOR_CHANGE); stateChanged(null); 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 * create simulation for new configuration */ - private void addOrCopyConfiguration(boolean copy) { + private void addOrDuplicateConfiguration(boolean duplicate) { final Map newConfigs = new LinkedHashMap<>(); - // create or copy configuration - if (copy) { + // create or duplicate configuration + if (duplicate) { List oldIds = getSelectedConfigurationIds(); if (oldIds == null || oldIds.size() == 0) return; @@ -248,10 +246,10 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe private void updateButtonState() { 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()); renameConfButton.setEnabled(currentId.isValid()); - copyConfButton.setEnabled(currentId.isValid()); + duplicateConfButton.setEnabled(currentId.isValid()); // Count the number of motor mounts int motorMountCount = rocket.accept(new ListMotorMounts()).size();