From d54a92051c6ba0f088fc9df8f012259d24e280a7 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 20 Jul 2022 10:36:28 +0200 Subject: [PATCH 1/4] Clean up --- .../gui/preset/PresetEditorDialog.java | 194 +++++++++--------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java b/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java index 1aad92e50..588f665b1 100644 --- a/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java +++ b/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java @@ -72,7 +72,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { private static final long serialVersionUID = -3298642844886682536L; - private static Translator trans = Application.getTranslator(); + private static final Translator trans = Application.getTranslator(); private static final Logger log = LoggerFactory.getLogger(PresetEditorDialog.class); @@ -82,138 +82,137 @@ public class PresetEditorDialog extends JDialog implements ItemListener { * Input of non-negative decimals. */ final PresetInputVerifier NON_NEGATIVE_INTEGER = new PresetInputVerifier(Pattern.compile(NON_NEGATIVE_INTEGER_FIELD)); - - private final JPanel contentPanel = new JPanel(); - private DeselectableComboBox typeCombo; - private JTextField mfgTextField; - private MaterialChooser materialChooser; + + private final DeselectableComboBox typeCombo; + private final JTextField mfgTextField; + private final MaterialChooser materialChooser; private MaterialHolder holder = null; - private JTextField ncPartNoTextField; - private JTextField ncDescTextField; - private DoubleModel ncLength; - private JCheckBox ncFilledCB; - private JComboBox ncShapeCB; - private DoubleModel ncAftDia; - private DoubleModel ncAftShoulderDia; - private DoubleModel ncAftShoulderLen; - private DoubleModel ncMass; + private final JTextField ncPartNoTextField; + private final JTextField ncDescTextField; + private final DoubleModel ncLength; + private final JCheckBox ncFilledCB; + private final JComboBox ncShapeCB; + private final DoubleModel ncAftDia; + private final DoubleModel ncAftShoulderDia; + private final DoubleModel ncAftShoulderLen; + private final DoubleModel ncMass; private ImageIcon ncImage; - private JButton ncImageBtn; + private final JButton ncImageBtn; - private JTextField trPartNoTextField; - private JTextField trDescTextField; - private DoubleModel trLength; - private DoubleModel trAftDia; - private DoubleModel trAftShoulderDia; - private DoubleModel trAftShoulderLen; - private DoubleModel trForeDia; - private DoubleModel trForeShoulderDia; - private DoubleModel trForeShoulderLen; + private final JTextField trPartNoTextField; + private final JTextField trDescTextField; + private final DoubleModel trLength; + private final DoubleModel trAftDia; + private final DoubleModel trAftShoulderDia; + private final DoubleModel trAftShoulderLen; + private final DoubleModel trForeDia; + private final DoubleModel trForeShoulderDia; + private final DoubleModel trForeShoulderLen; private DoubleModel trMass; private ImageIcon trImage; - private JCheckBox trFilledCB; - private JComboBox trShapeCB; - private JButton trImageBtn; + private final JCheckBox trFilledCB; + private final JComboBox trShapeCB; + private final JButton trImageBtn; - private JTextField btPartNoTextField; - private JTextField btDescTextField; - private DoubleModel btMass; - private DoubleModel btInnerDia; - private DoubleModel btOuterDia; - private DoubleModel btLength; + private final JTextField btPartNoTextField; + private final JTextField btDescTextField; + private final DoubleModel btMass; + private final DoubleModel btInnerDia; + private final DoubleModel btOuterDia; + private final DoubleModel btLength; private ImageIcon btImage; - private JButton btImageBtn; + private final JButton btImageBtn; - private JTextField tcPartNoTextField; - private JTextField tcDescTextField; - private DoubleModel tcMass; - private DoubleModel tcInnerDia; - private DoubleModel tcOuterDia; - private DoubleModel tcLength; + private final JTextField tcPartNoTextField; + private final JTextField tcDescTextField; + private final DoubleModel tcMass; + private final DoubleModel tcInnerDia; + private final DoubleModel tcOuterDia; + private final DoubleModel tcLength; private ImageIcon tcImage; - private JButton tcImageBtn; + private final JButton tcImageBtn; - private JTextField bhPartNoTextField; - private JTextField bhDescTextField; - private DoubleModel bhOuterDia; - private DoubleModel bhLength; - private DoubleModel bhMass; + private final JTextField bhPartNoTextField; + private final JTextField bhDescTextField; + private final DoubleModel bhOuterDia; + private final DoubleModel bhLength; + private final DoubleModel bhMass; private ImageIcon bhImage; - private JButton bhImageBtn; + private final JButton bhImageBtn; - private JTextField crPartNoTextField; - private JTextField crDescTextField; - private DoubleModel crOuterDia; - private DoubleModel crInnerDia; - private DoubleModel crThickness; - private DoubleModel crMass; + private final JTextField crPartNoTextField; + private final JTextField crDescTextField; + private final DoubleModel crOuterDia; + private final DoubleModel crInnerDia; + private final DoubleModel crThickness; + private final DoubleModel crMass; private ImageIcon crImage; - private JButton crImageBtn; + private final JButton crImageBtn; - private JTextField ebPartNoTextField; - private JTextField ebDescTextField; - private DoubleModel ebOuterDia; - private DoubleModel ebInnerDia; - private DoubleModel ebThickness; - private DoubleModel ebMass; + private final JTextField ebPartNoTextField; + private final JTextField ebDescTextField; + private final DoubleModel ebOuterDia; + private final DoubleModel ebInnerDia; + private final DoubleModel ebThickness; + private final DoubleModel ebMass; private ImageIcon ebImage; - private JButton ebImageBtn; + private final JButton ebImageBtn; - private JTextField llPartNoTextField; - private JTextField llDescTextField; - private DoubleModel llOuterDia; - private DoubleModel llInnerDia; - private DoubleModel llLength; - private DoubleModel llMass; + private final JTextField llPartNoTextField; + private final JTextField llDescTextField; + private final DoubleModel llOuterDia; + private final DoubleModel llInnerDia; + private final DoubleModel llLength; + private final DoubleModel llMass; private ImageIcon llImage; - private JButton llImageBtn; + private final JButton llImageBtn; - private JTextField rbPartNoTextField; - private JTextField rbDescTextField; - private DoubleModel rbOuterDia; - private DoubleModel rbInnerDia; - private DoubleModel rbHeight; - private DoubleModel rbStandoffHeight; - private DoubleModel rbFlangeHeight; - private DoubleModel rbMass; + private final JTextField rbPartNoTextField; + private final JTextField rbDescTextField; + private final DoubleModel rbOuterDia; + private final DoubleModel rbInnerDia; + private final DoubleModel rbHeight; + private final DoubleModel rbStandoffHeight; + private final DoubleModel rbFlangeHeight; + private final DoubleModel rbMass; private ImageIcon rbImage; - private JButton rbImageBtn; + private final JButton rbImageBtn; - private JTextField stPartNoTextField; - private JTextField stDescTextField; - private DoubleModel stThickness; - private DoubleModel stWidth; - private DoubleModel stLength; - private DoubleModel stMass; + private final JTextField stPartNoTextField; + private final JTextField stDescTextField; + private final DoubleModel stThickness; + private final DoubleModel stWidth; + private final DoubleModel stLength; + private final DoubleModel stMass; private ImageIcon stImage; - private JButton stImageBtn; + private final JButton stImageBtn; // Parachute Specific - private JTextField pcPartNoTextField; - private JTextField pcDescTextField; - private DoubleModel pcDiameter; + private final JTextField pcPartNoTextField; + private final JTextField pcDescTextField; + private final DoubleModel pcDiameter; private DoubleModel pcSpillDia; private DoubleModel pcSurfaceArea; private DoubleModel pcDragCoefficient; // Canopy material = private MaterialChooser materialChooser; - private JTextField pcSides; - private JTextField pcLineCount; - private DoubleModel pcLineLength; + private final JTextField pcSides; + private final JTextField pcLineCount; + private final DoubleModel pcLineLength; private DoubleModel pcPackedLength; private DoubleModel pcPackedDiameter; - private MaterialChooser pcLineMaterialChooser; - private DoubleModel pcMass; + private final MaterialChooser pcLineMaterialChooser; + private final DoubleModel pcMass; private ImageIcon pcImage; - private JButton pcImageBtn; + private final JButton pcImageBtn; private final JFileChooser imageChooser = createImageChooser(); - private JPanel componentOverlayPanel; + private final JPanel componentOverlayPanel; - private PresetResultListener resultListener; + private final PresetResultListener resultListener; - private static Map componentMap = new HashMap(); + private static final Map componentMap = new HashMap(); private static final String NOSE_CONE_KEY = "NoseCone.NoseCone"; private static final String BODY_TUBE_KEY = "BodyTube.BodyTube"; @@ -263,6 +262,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { getContentPane().setMinimumSize(new Dimension(200, 200)); setBounds(100, 100, 825, 610); getContentPane().setLayout(new BorderLayout()); + JPanel contentPanel = new JPanel(); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel, BorderLayout.CENTER); contentPanel.setLayout(new MigLayout("", "[][grow][94.00,grow][232.0,grow][130.00][grow]", "[][][20.00,grow][grow]")); From 8d8e2a698a2dd987438a9656288c048119a5a1c3 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 20 Jul 2022 10:51:35 +0200 Subject: [PATCH 2/4] Rename translation keys for 'Tools' --- core/resources/l10n/messages.properties | 16 ++++++++-------- core/resources/l10n/messages_cs.properties | 12 ++++++------ core/resources/l10n/messages_de.properties | 12 ++++++------ core/resources/l10n/messages_es.properties | 16 ++++++++-------- core/resources/l10n/messages_fr.properties | 16 ++++++++-------- core/resources/l10n/messages_it.properties | 12 ++++++------ core/resources/l10n/messages_ja.properties | 16 ++++++++-------- core/resources/l10n/messages_nl.properties | 16 ++++++++-------- core/resources/l10n/messages_pl.properties | 12 ++++++------ core/resources/l10n/messages_pt.properties | 16 ++++++++-------- core/resources/l10n/messages_ru.properties | 16 ++++++++-------- core/resources/l10n/messages_uk_UA.properties | 16 ++++++++-------- core/resources/l10n/messages_zh_CN.properties | 16 ++++++++-------- .../sf/openrocket/gui/main/BasicFrame.java | 19 +++++++++---------- 14 files changed, 105 insertions(+), 106 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index e70342af9..4f4fb50fd 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1375,14 +1375,14 @@ main.menu.edit.editpreset= Edit Component Preset File main.menu.edit.preferences = Preferences main.menu.edit.preferences.desc = Setup the application preferences -main.menu.analyze = Tools -main.menu.analyze.desc = Rocket analysis -main.menu.analyze.componentAnalysis = Component analysis -main.menu.analyze.componentAnalysis.desc = Analyze the rocket components separately -main.menu.analyze.optimization = Rocket optimization -main.menu.analyze.optimization.desc = General rocket design optimization -main.menu.analyze.customExpressions = Custom expressions -main.menu.analyze.customExpressions.desc = Define new flight data types by writing custom mathematical expressions +main.menu.tools = Tools +main.menu.tools.desc = Rocket analysis +main.menu.tools.componentAnalysis = Component analysis +main.menu.tools.componentAnalysis.desc = Analyze the rocket components separately +main.menu.tools.optimization = Rocket optimization +main.menu.tools.optimization.desc = General rocket design optimization +main.menu.tools.customExpressions = Custom expressions +main.menu.tools.customExpressions.desc = Define new flight data types by writing custom mathematical expressions main.menu.help = Help main.menu.help.desc = Information about OpenRocket diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties index a30ef6392..bbcf0a444 100644 --- a/core/resources/l10n/messages_cs.properties +++ b/core/resources/l10n/messages_cs.properties @@ -1004,12 +1004,12 @@ main.menu.edit.delete = Smazat main.menu.edit.preferences = Nastavení main.menu.edit.preferences.desc = Nastavení aplikace -main.menu.analyze = Anal\u017Eęza -main.menu.analyze.desc = Analęza rakety -main.menu.analyze.componentAnalysis = Analęza komponent -main.menu.analyze.componentAnalysis.desc = Analyzuj cásti rakety samostatne -main.menu.analyze.optimization = Optimalizace rakety -main.menu.analyze.optimization.desc = Obecnę návrh optimalizace rakety +main.menu.tools = Anal\u017Eęza +main.menu.tools.desc = Analęza rakety +main.menu.tools.componentAnalysis = Analęza komponent +main.menu.tools.componentAnalysis.desc = Analyzuj cásti rakety samostatne +main.menu.tools.optimization = Optimalizace rakety +main.menu.tools.optimization.desc = Obecnę návrh optimalizace rakety main.menu.help = Pomoc main.menu.help.desc = Informace o programu OpenRocket diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties index 5a1d9a7ec..a8b49af27 100644 --- a/core/resources/l10n/messages_de.properties +++ b/core/resources/l10n/messages_de.properties @@ -1061,12 +1061,12 @@ main.menu.edit.delete = L main.menu.edit.preferences = Einstellungen main.menu.edit.preferences.desc = Einstellungen der Anwenung ändern -main.menu.analyze = Analysieren -main.menu.analyze.desc = Rakete analysieren -main.menu.analyze.componentAnalysis = Komponente analysieren -main.menu.analyze.componentAnalysis.desc = Komponenten der Rakete einzeln analysieren -main.menu.analyze.optimization = Rocket optimization -main.menu.analyze.optimization.desc = General rocket design optimization +main.menu.tools = Analysieren +main.menu.tools.desc = Rakete analysieren +main.menu.tools.componentAnalysis = Komponente analysieren +main.menu.tools.componentAnalysis.desc = Komponenten der Rakete einzeln analysieren +main.menu.tools.optimization = Rocket optimization +main.menu.tools.optimization.desc = General rocket design optimization main.menu.help = Hilfe main.menu.help.desc = Informationen über OpenRocket diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index 556fd9ede..ed92fb24d 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -1429,14 +1429,14 @@ FileHelper.IMAGES = Archivos de imagen ! General file type names FileHelper.PDF_FILTER = Archivos PDF -main.menu.analyze = Analizar -main.menu.analyze.componentAnalysis = An\u00e1lisis de los componentes -main.menu.analyze.componentAnalysis.desc = Analiza los componentes del cohete por separado -main.menu.analyze.customExpressions = Expresiones personalizadas -main.menu.analyze.customExpressions.desc = Defina nuevos tipos de datos escribiendo expresiones matem\u00e1ticas personalizadas -main.menu.analyze.desc = An\u00e1lisis del cohete -main.menu.analyze.optimization = Optimizaci\u00f3n del dise\u00f1o -main.menu.analyze.optimization.desc = Optimizaci\u00f3n global del dise\u00f1o del cohete +main.menu.tools = Analizar +main.menu.tools.componentAnalysis = An\u00e1lisis de los componentes +main.menu.tools.componentAnalysis.desc = Analiza los componentes del cohete por separado +main.menu.tools.customExpressions = Expresiones personalizadas +main.menu.tools.customExpressions.desc = Defina nuevos tipos de datos escribiendo expresiones matem\u00e1ticas personalizadas +main.menu.tools.desc = An\u00e1lisis del cohete +main.menu.tools.optimization = Optimizaci\u00f3n del dise\u00f1o +main.menu.tools.optimization.desc = Optimizaci\u00f3n global del dise\u00f1o del cohete main.menu.debug = Recuperaci\u00f3n main.menu.debug.createtestrocket = Crear una prueba de modelo main.menu.debug.whatisthismenu = \u00bfQue es este men\u00fa? diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index 350bc5874..0e5129640 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -1423,14 +1423,14 @@ FileHelper.IMAGES = Fichiers Image ! General file type names FileHelper.PDF_FILTER = fichier PDF -main.menu.analyze = Analyse -main.menu.analyze.componentAnalysis = Analyse des Pi\u00E8ces -main.menu.analyze.componentAnalysis.desc = Analyse s\u00E9par\u00E9e des pi\u00E8ces de la fus\u00E9e -main.menu.analyze.customExpressions = Expressions personnalis\u00E9es -main.menu.analyze.customExpressions.desc = D\u00E9fini de nouveaux type de donn\u00E9es de vol en \u00E9crivant des expressions math\u00E9matique personnalis\u00E9es -main.menu.analyze.desc = Analyses de la fus\u00E9e -main.menu.analyze.optimization = Optimisation de la fus\u00E9e -main.menu.analyze.optimization.desc = Optimisation g\u00E9n\u00E9rale de la fus\u00E9e +main.menu.tools = Analyse +main.menu.tools.componentAnalysis = Analyse des Pi\u00E8ces +main.menu.tools.componentAnalysis.desc = Analyse s\u00E9par\u00E9e des pi\u00E8ces de la fus\u00E9e +main.menu.tools.customExpressions = Expressions personnalis\u00E9es +main.menu.tools.customExpressions.desc = D\u00E9fini de nouveaux type de donn\u00E9es de vol en \u00E9crivant des expressions math\u00E9matique personnalis\u00E9es +main.menu.tools.desc = Analyses de la fus\u00E9e +main.menu.tools.optimization = Optimisation de la fus\u00E9e +main.menu.tools.optimization.desc = Optimisation g\u00E9n\u00E9rale de la fus\u00E9e main.menu.debug = Debug main.menu.debug.createtestrocket = Cr\u00E9er une fus\u00E9e test main.menu.debug.whatisthismenu = Quel est ce menu? diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index 0596e8fc5..87327e82d 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -1065,12 +1065,12 @@ main.menu.edit.delete = Cancella main.menu.edit.preferences = Preferenze main.menu.edit.preferences.desc = Imposta le preferenze dell'applicazione -main.menu.analyze = Analizza -main.menu.analyze.desc = Analisi del razzo -main.menu.analyze.componentAnalysis = Analizza componente -main.menu.analyze.componentAnalysis.desc = Analizza ogni componente del razzo separatamente -main.menu.analyze.optimization = Ottimizzazione del razzo -main.menu.analyze.optimization.desc = Ottimizzazioni generali sul disegno del razzo +main.menu.tools = Analizza +main.menu.tools.desc = Analisi del razzo +main.menu.tools.componentAnalysis = Analizza componente +main.menu.tools.componentAnalysis.desc = Analizza ogni componente del razzo separatamente +main.menu.tools.optimization = Ottimizzazione del razzo +main.menu.tools.optimization.desc = Ottimizzazioni generali sul disegno del razzo main.menu.help = Aiuto main.menu.help.desc = Informazioni su OpenRocket diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index 3daf4089e..d2cdaaed9 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -1097,14 +1097,14 @@ main.menu.edit.editpreset = Component Preset File\u306E\u7DE8\u96C6 main.menu.edit.preferences = \u8A2D\u5B9A main.menu.edit.preferences.desc = \u30A2\u30D7\u30EA\u306E\u8A2D\u5B9A\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 -main.menu.analyze = \u89E3\u6790 -main.menu.analyze.desc = \u30ED\u30B1\u30C3\u30C8\u89E3\u6790 -main.menu.analyze.componentAnalysis = \u90E8\u54C1\u89E3\u6790 -main.menu.analyze.componentAnalysis.desc = \u90E8\u54C1\u3092\u5206\u3051\u3066\u89E3\u6790 -main.menu.analyze.optimization = \u30ED\u30B1\u30C3\u30C8\u6700\u9069\u5316 -main.menu.analyze.optimization.desc = \u5168\u4F53\u3092\u6700\u9069\u5316 -main.menu.analyze.customExpressions = \u30AB\u30B9\u30BF\u30E0\u5F0F -main.menu.analyze.customExpressions.desc = \u65B0\u3057\u3044\u30D5\u30E9\u30A4\u30C8\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7\u3092\u30AB\u30B9\u30BF\u30E0\u3057\u305F\u6570\u5F0F\u3067\u5B9A\u7FA9 +main.menu.tools = \u89E3\u6790 +main.menu.tools.desc = \u30ED\u30B1\u30C3\u30C8\u89E3\u6790 +main.menu.tools.componentAnalysis = \u90E8\u54C1\u89E3\u6790 +main.menu.tools.componentAnalysis.desc = \u90E8\u54C1\u3092\u5206\u3051\u3066\u89E3\u6790 +main.menu.tools.optimization = \u30ED\u30B1\u30C3\u30C8\u6700\u9069\u5316 +main.menu.tools.optimization.desc = \u5168\u4F53\u3092\u6700\u9069\u5316 +main.menu.tools.customExpressions = \u30AB\u30B9\u30BF\u30E0\u5F0F +main.menu.tools.customExpressions.desc = \u65B0\u3057\u3044\u30D5\u30E9\u30A4\u30C8\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7\u3092\u30AB\u30B9\u30BF\u30E0\u3057\u305F\u6570\u5F0F\u3067\u5B9A\u7FA9 main.menu.help = \u30D8\u30EB\u30D7 main.menu.help.desc = OpenRocket\u306B\u3064\u3044\u3066\u306E\u60C5\u5831 diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 08c3faeed..8317b4e8f 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -1274,14 +1274,14 @@ main.menu.edit.editpreset= Bewerk Component Preset bestand main.menu.edit.preferences = Voorkeuren main.menu.edit.preferences.desc = Stel de programma voorkeuren in -main.menu.analyze = Tools -main.menu.analyze.desc = Raket-analyses -main.menu.analyze.componentAnalysis = Onderdeel-analyses -main.menu.analyze.componentAnalysis.desc = Analyseer de raketonderdelen afzonderlijk -main.menu.analyze.optimization = Raket-optimalisatie -main.menu.analyze.optimization.desc = Algemene optimalisatie van raketontwerp -main.menu.analyze.customExpressions = Aangepaste uitdrukkingen -main.menu.analyze.customExpressions.desc = Definieer nieuwe vluchtdatatypes door aangepaste wiskundige uitdrukkingen te schrijven +main.menu.tools = Tools +main.menu.tools.desc = Raket-analyses +main.menu.tools.componentAnalysis = Onderdeel-analyses +main.menu.tools.componentAnalysis.desc = Analyseer de raketonderdelen afzonderlijk +main.menu.tools.optimization = Raket-optimalisatie +main.menu.tools.optimization.desc = Algemene optimalisatie van raketontwerp +main.menu.tools.customExpressions = Aangepaste uitdrukkingen +main.menu.tools.customExpressions.desc = Definieer nieuwe vluchtdatatypes door aangepaste wiskundige uitdrukkingen te schrijven main.menu.help = Help main.menu.help.desc = Informatie over OpenRocket diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index 4c1cefc01..c95afd101 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -1006,12 +1006,12 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. main.menu.edit.preferences = Ustawienia main.menu.edit.preferences.desc = Edytuj ustawienia programu - main.menu.analyze = Analiza - main.menu.analyze.desc = Analiza rakiety - main.menu.analyze.componentAnalysis = Analiza cz\u0119\u015Bci - main.menu.analyze.componentAnalysis.desc = Analizuj oddzielnie poszczególne cz\u0119\u015Bci sk\u0142adóe rakiety - main.menu.analyze.optimization = Optymalizacja rakiety - main.menu.analyze.optimization.desc = Ogólna optymalizacja projektu rakiety + main.menu.tools = Analiza + main.menu.tools.desc = Analiza rakiety + main.menu.tools.componentAnalysis = Analiza cz\u0119\u015Bci + main.menu.tools.componentAnalysis.desc = Analizuj oddzielnie poszczególne cz\u0119\u015Bci sk\u0142adóe rakiety + main.menu.tools.optimization = Optymalizacja rakiety + main.menu.tools.optimization.desc = Ogólna optymalizacja projektu rakiety main.menu.help = Pomoc main.menu.help.desc = Informacje o programie OpenRocket diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index 18ce530f8..f660c1f83 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -1386,14 +1386,14 @@ FileHelper.IMAGES = Arquivos de imagem # General file type names FileHelper.PDF_FILTER = Arquivos PDF (*.pdf) -main.menu.analyze = Analisar -main.menu.analyze.componentAnalysis = An\u00e1lise dos componentes -main.menu.analyze.componentAnalysis.desc = Analisar os componentes dos foguetes separadamente -main.menu.analyze.customExpressions = Express\u00f5es personalizadas -main.menu.analyze.customExpressions.desc = Definir novos tipos de dados de voo por escrito personalizados express\u00f5es matem\u00e1ticas -main.menu.analyze.desc = An\u00e1lise do foguete -main.menu.analyze.optimization = Otimiza\u00e7\u00e3o do foguete -main.menu.analyze.optimization.desc = Otimiza\u00e7\u00e3o do projeto geral do foguete +main.menu.tools = Analisar +main.menu.tools.componentAnalysis = An\u00e1lise dos componentes +main.menu.tools.componentAnalysis.desc = Analisar os componentes dos foguetes separadamente +main.menu.tools.customExpressions = Express\u00f5es personalizadas +main.menu.tools.customExpressions.desc = Definir novos tipos de dados de voo por escrito personalizados express\u00f5es matem\u00e1ticas +main.menu.tools.desc = An\u00e1lise do foguete +main.menu.tools.optimization = Otimiza\u00e7\u00e3o do foguete +main.menu.tools.optimization.desc = Otimiza\u00e7\u00e3o do projeto geral do foguete main.menu.debug = Depura\u00e7\u00e3o main.menu.debug.createtestrocket = Criar foguete de teste main.menu.debug.whatisthismenu = O que \u00e9 esse menu? diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index 2ae02679c..730abdbce 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -1373,14 +1373,14 @@ main.menu.edit.editpreset = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0 main.menu.edit.preferences = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 main.menu.edit.preferences.desc = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F -main.menu.analyze = \u0410\u043D\u0430\u043B\u0438\u0437 -main.menu.analyze.desc = \u0410\u043D\u0430\u043B\u0438\u0437 \u0440\u0430\u043A\u0435\u0442\u044B -main.menu.analyze.componentAnalysis = \u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 -main.menu.analyze.componentAnalysis.desc = \u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 \u0440\u0430\u043A\u0435\u0442\u044B \u043F\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 -main.menu.analyze.optimization = \u041E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u044F \u0440\u0430\u043A\u0435\u0442\u044B -main.menu.analyze.optimization.desc = \u041E\u0431\u0449\u0430\u044F \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u044F \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0440\u0430\u043A\u0435\u0442\u044B -main.menu.analyze.customExpressions = \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F -main.menu.analyze.customExpressions.desc = \u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u044B\u0445 \u0442\u0438\u043F\u043E\u0432 \u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u043E\u043B\u0435\u0442\u0430 \u043D\u0430\u043F\u0438\u0441\u0430\u043D\u0438\u0435\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0445 \u043C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0439 +main.menu.tools = \u0410\u043D\u0430\u043B\u0438\u0437 +main.menu.tools.desc = \u0410\u043D\u0430\u043B\u0438\u0437 \u0440\u0430\u043A\u0435\u0442\u044B +main.menu.tools.componentAnalysis = \u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 +main.menu.tools.componentAnalysis.desc = \u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 \u0440\u0430\u043A\u0435\u0442\u044B \u043F\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 +main.menu.tools.optimization = \u041E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u044F \u0440\u0430\u043A\u0435\u0442\u044B +main.menu.tools.optimization.desc = \u041E\u0431\u0449\u0430\u044F \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u044F \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0440\u0430\u043A\u0435\u0442\u044B +main.menu.tools.customExpressions = \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F +main.menu.tools.customExpressions.desc = \u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u044B\u0445 \u0442\u0438\u043F\u043E\u0432 \u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u043E\u043B\u0435\u0442\u0430 \u043D\u0430\u043F\u0438\u0441\u0430\u043D\u0438\u0435\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0445 \u043C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u0439 main.menu.help = \u0421\u043F\u0440\u0430\u0432\u043A\u0430 main.menu.help.desc = \u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E\u0431 OpenRocket diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index a7fc899ed..b71674fd6 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -1175,14 +1175,14 @@ main.menu.edit.editpreset= Edit Component Preset File main.menu.edit.preferences = Preferences main.menu.edit.preferences.desc = Setup the application preferences -main.menu.analyze = Tools -main.menu.analyze.desc = Rocket analysis -main.menu.analyze.componentAnalysis = Component analysis -main.menu.analyze.componentAnalysis.desc = Analyze the rocket components separately -main.menu.analyze.optimization = Rocket optimization -main.menu.analyze.optimization.desc = General rocket design optimization -main.menu.analyze.customExpressions = Custom expressions -main.menu.analyze.customExpressions.desc = Define new flight data types by writing custom mathematical expressions +main.menu.tools = Tools +main.menu.tools.desc = Rocket analysis +main.menu.tools.componentAnalysis = Component analysis +main.menu.tools.componentAnalysis.desc = Analyze the rocket components separately +main.menu.tools.optimization = Rocket optimization +main.menu.tools.optimization.desc = General rocket design optimization +main.menu.tools.customExpressions = Custom expressions +main.menu.tools.customExpressions.desc = Define new flight data types by writing custom mathematical expressions main.menu.help = Help main.menu.help.desc = Information about OpenRocket diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index e968675da..910df3e89 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -1509,14 +1509,14 @@ generalprefs.languages.default = \u7CFB\u7EDF\u9ED8\u8BA4 generalprefs.lbl.language = \u754C\u9762\u8BED\u8A00 generalprefs.lbl.languageEffect = \u65B0\u7684\u8BED\u8A00\u5C06\u5728\u4E0B\u6B21\u542F\u52A8OpenRocket\u65F6\u751F\u6548. -main.menu.analyze = \u5206\u6790 -main.menu.analyze.componentAnalysis = \u7EC4\u4EF6\u5206\u6790 -main.menu.analyze.componentAnalysis.desc = \u4EC5\u5206\u6790\u706B\u7BAD\u90E8\u4EF6 -main.menu.analyze.customExpressions = \u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F -main.menu.analyze.customExpressions.desc = \u901A\u8FC7\u81EA\u5B9A\u4E49\u7684\u6570\u5B66\u8868\u8FBE\u5F0F\u6765\u5B9A\u4E49\u65B0\u7684\u98DE\u884C\u6570\u636E\u7C7B\u578B -main.menu.analyze.desc = \u706B\u7BAD\u5206\u6790 -main.menu.analyze.optimization = \u706B\u7BAD\u4F18\u5316 -main.menu.analyze.optimization.desc = \u5E38\u89C4\u706B\u7BAD\u8BBE\u8BA1\u4F18\u5316 +main.menu.tools = \u5206\u6790 +main.menu.tools.componentAnalysis = \u7EC4\u4EF6\u5206\u6790 +main.menu.tools.componentAnalysis.desc = \u4EC5\u5206\u6790\u706B\u7BAD\u90E8\u4EF6 +main.menu.tools.customExpressions = \u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F +main.menu.tools.customExpressions.desc = \u901A\u8FC7\u81EA\u5B9A\u4E49\u7684\u6570\u5B66\u8868\u8FBE\u5F0F\u6765\u5B9A\u4E49\u65B0\u7684\u98DE\u884C\u6570\u636E\u7C7B\u578B +main.menu.tools.desc = \u706B\u7BAD\u5206\u6790 +main.menu.tools.optimization = \u706B\u7BAD\u4F18\u5316 +main.menu.tools.optimization.desc = \u5E38\u89C4\u706B\u7BAD\u8BBE\u8BA1\u4F18\u5316 main.menu.debug = \u8C03\u8BD5 main.menu.debug.createtestrocket = \u5EFA\u7ACB\u6D4B\u8BD5\u706B\u7BAD main.menu.debug.whatisthismenu = \u8FD9\u662F\u4EC0\u4E48\u83DC\u5355? diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 6f76a838d..3c96a975c 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -841,19 +841,18 @@ public class BasicFrame extends JFrame { } - //// Analyze - menu = new JMenu(trans.get("main.menu.analyze")); - menu.setMnemonic(KeyEvent.VK_A); + // Tools + menu = new JMenu(trans.get("main.menu.tools")); //// Analyzing the rocket - menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc")); + menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.tools.desc")); menubar.add(menu); //// Component analysis - item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C); + item = new JMenuItem(trans.get("main.menu.tools.componentAnalysis"), KeyEvent.VK_C); //// Analyze the rocket components separately - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc")); + item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.tools.componentAnalysis.desc")); item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -864,8 +863,8 @@ public class BasicFrame extends JFrame { menu.add(item); //// Optimize - item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); + item = new JMenuItem(trans.get("main.menu.tools.optimization"), KeyEvent.VK_O); + item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.tools.optimization.desc")); item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -880,8 +879,8 @@ public class BasicFrame extends JFrame { menu.add(item); //// Custom expressions - item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E); - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.customExpressions.desc")); + item = new JMenuItem(trans.get("main.menu.tools.customExpressions"), KeyEvent.VK_E); + item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.tools.customExpressions.desc")); item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { From 81561dae766f3cc5aeef0f0a29f707bf7982becd Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 20 Jul 2022 10:54:53 +0200 Subject: [PATCH 3/4] Remove unneeded tools description --- core/resources/l10n/messages.properties | 1 - core/resources/l10n/messages_cs.properties | 1 - core/resources/l10n/messages_de.properties | 1 - core/resources/l10n/messages_es.properties | 1 - core/resources/l10n/messages_fr.properties | 1 - core/resources/l10n/messages_it.properties | 1 - core/resources/l10n/messages_ja.properties | 1 - core/resources/l10n/messages_nl.properties | 1 - core/resources/l10n/messages_pl.properties | 1 - core/resources/l10n/messages_pt.properties | 1 - core/resources/l10n/messages_ru.properties | 1 - core/resources/l10n/messages_uk_UA.properties | 1 - core/resources/l10n/messages_zh_CN.properties | 1 - swing/src/net/sf/openrocket/gui/main/BasicFrame.java | 3 --- 14 files changed, 16 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 4f4fb50fd..be9e2bbba 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1376,7 +1376,6 @@ main.menu.edit.preferences = Preferences main.menu.edit.preferences.desc = Setup the application preferences main.menu.tools = Tools -main.menu.tools.desc = Rocket analysis main.menu.tools.componentAnalysis = Component analysis main.menu.tools.componentAnalysis.desc = Analyze the rocket components separately main.menu.tools.optimization = Rocket optimization diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties index bbcf0a444..ae8ba7d23 100644 --- a/core/resources/l10n/messages_cs.properties +++ b/core/resources/l10n/messages_cs.properties @@ -1005,7 +1005,6 @@ main.menu.edit.preferences = Nastaven main.menu.edit.preferences.desc = Nastavení aplikace main.menu.tools = Anal\u017Eęza -main.menu.tools.desc = Analęza rakety main.menu.tools.componentAnalysis = Analęza komponent main.menu.tools.componentAnalysis.desc = Analyzuj cásti rakety samostatne main.menu.tools.optimization = Optimalizace rakety diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties index a8b49af27..a308fd80b 100644 --- a/core/resources/l10n/messages_de.properties +++ b/core/resources/l10n/messages_de.properties @@ -1062,7 +1062,6 @@ main.menu.edit.preferences = Einstellungen main.menu.edit.preferences.desc = Einstellungen der Anwenung ändern main.menu.tools = Analysieren -main.menu.tools.desc = Rakete analysieren main.menu.tools.componentAnalysis = Komponente analysieren main.menu.tools.componentAnalysis.desc = Komponenten der Rakete einzeln analysieren main.menu.tools.optimization = Rocket optimization diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index ed92fb24d..854ec0214 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -1434,7 +1434,6 @@ main.menu.tools.componentAnalysis = An\u00e1lisis de los componentes main.menu.tools.componentAnalysis.desc = Analiza los componentes del cohete por separado main.menu.tools.customExpressions = Expresiones personalizadas main.menu.tools.customExpressions.desc = Defina nuevos tipos de datos escribiendo expresiones matem\u00e1ticas personalizadas -main.menu.tools.desc = An\u00e1lisis del cohete main.menu.tools.optimization = Optimizaci\u00f3n del dise\u00f1o main.menu.tools.optimization.desc = Optimizaci\u00f3n global del dise\u00f1o del cohete main.menu.debug = Recuperaci\u00f3n diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index 0e5129640..d15c994e5 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -1428,7 +1428,6 @@ main.menu.tools.componentAnalysis = Analyse des Pi\u00E8ces main.menu.tools.componentAnalysis.desc = Analyse s\u00E9par\u00E9e des pi\u00E8ces de la fus\u00E9e main.menu.tools.customExpressions = Expressions personnalis\u00E9es main.menu.tools.customExpressions.desc = D\u00E9fini de nouveaux type de donn\u00E9es de vol en \u00E9crivant des expressions math\u00E9matique personnalis\u00E9es -main.menu.tools.desc = Analyses de la fus\u00E9e main.menu.tools.optimization = Optimisation de la fus\u00E9e main.menu.tools.optimization.desc = Optimisation g\u00E9n\u00E9rale de la fus\u00E9e main.menu.debug = Debug diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index 87327e82d..447e4eff8 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -1066,7 +1066,6 @@ main.menu.edit.preferences = Preferenze main.menu.edit.preferences.desc = Imposta le preferenze dell'applicazione main.menu.tools = Analizza -main.menu.tools.desc = Analisi del razzo main.menu.tools.componentAnalysis = Analizza componente main.menu.tools.componentAnalysis.desc = Analizza ogni componente del razzo separatamente main.menu.tools.optimization = Ottimizzazione del razzo diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index d2cdaaed9..bfef9700f 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -1098,7 +1098,6 @@ main.menu.edit.preferences = \u8A2D\u5B9A main.menu.edit.preferences.desc = \u30A2\u30D7\u30EA\u306E\u8A2D\u5B9A\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 main.menu.tools = \u89E3\u6790 -main.menu.tools.desc = \u30ED\u30B1\u30C3\u30C8\u89E3\u6790 main.menu.tools.componentAnalysis = \u90E8\u54C1\u89E3\u6790 main.menu.tools.componentAnalysis.desc = \u90E8\u54C1\u3092\u5206\u3051\u3066\u89E3\u6790 main.menu.tools.optimization = \u30ED\u30B1\u30C3\u30C8\u6700\u9069\u5316 diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 8317b4e8f..438bea527 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -1275,7 +1275,6 @@ main.menu.edit.preferences = Voorkeuren main.menu.edit.preferences.desc = Stel de programma voorkeuren in main.menu.tools = Tools -main.menu.tools.desc = Raket-analyses main.menu.tools.componentAnalysis = Onderdeel-analyses main.menu.tools.componentAnalysis.desc = Analyseer de raketonderdelen afzonderlijk main.menu.tools.optimization = Raket-optimalisatie diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index c95afd101..1bc052188 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -1007,7 +1007,6 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. main.menu.edit.preferences.desc = Edytuj ustawienia programu main.menu.tools = Analiza - main.menu.tools.desc = Analiza rakiety main.menu.tools.componentAnalysis = Analiza cz\u0119\u015Bci main.menu.tools.componentAnalysis.desc = Analizuj oddzielnie poszczególne cz\u0119\u015Bci sk\u0142adóe rakiety main.menu.tools.optimization = Optymalizacja rakiety diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index f660c1f83..4bdb89578 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -1391,7 +1391,6 @@ main.menu.tools.componentAnalysis = An\u00e1lise dos componentes main.menu.tools.componentAnalysis.desc = Analisar os componentes dos foguetes separadamente main.menu.tools.customExpressions = Express\u00f5es personalizadas main.menu.tools.customExpressions.desc = Definir novos tipos de dados de voo por escrito personalizados express\u00f5es matem\u00e1ticas -main.menu.tools.desc = An\u00e1lise do foguete main.menu.tools.optimization = Otimiza\u00e7\u00e3o do foguete main.menu.tools.optimization.desc = Otimiza\u00e7\u00e3o do projeto geral do foguete main.menu.debug = Depura\u00e7\u00e3o diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index 730abdbce..7190965fc 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -1374,7 +1374,6 @@ main.menu.edit.preferences = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0 main.menu.edit.preferences.desc = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F main.menu.tools = \u0410\u043D\u0430\u043B\u0438\u0437 -main.menu.tools.desc = \u0410\u043D\u0430\u043B\u0438\u0437 \u0440\u0430\u043A\u0435\u0442\u044B main.menu.tools.componentAnalysis = \u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 main.menu.tools.componentAnalysis.desc = \u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 \u0440\u0430\u043A\u0435\u0442\u044B \u043F\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 main.menu.tools.optimization = \u041E\u043F\u0442\u0438\u043C\u0438\u0437\u0430\u0446\u0438\u044F \u0440\u0430\u043A\u0435\u0442\u044B diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index b71674fd6..5c4eb0c59 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -1176,7 +1176,6 @@ main.menu.edit.preferences = Preferences main.menu.edit.preferences.desc = Setup the application preferences main.menu.tools = Tools -main.menu.tools.desc = Rocket analysis main.menu.tools.componentAnalysis = Component analysis main.menu.tools.componentAnalysis.desc = Analyze the rocket components separately main.menu.tools.optimization = Rocket optimization diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 910df3e89..6d98ddb49 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -1514,7 +1514,6 @@ main.menu.tools.componentAnalysis = \u7EC4\u4EF6\u5206\u6790 main.menu.tools.componentAnalysis.desc = \u4EC5\u5206\u6790\u706B\u7BAD\u90E8\u4EF6 main.menu.tools.customExpressions = \u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F main.menu.tools.customExpressions.desc = \u901A\u8FC7\u81EA\u5B9A\u4E49\u7684\u6570\u5B66\u8868\u8FBE\u5F0F\u6765\u5B9A\u4E49\u65B0\u7684\u98DE\u884C\u6570\u636E\u7C7B\u578B -main.menu.tools.desc = \u706B\u7BAD\u5206\u6790 main.menu.tools.optimization = \u706B\u7BAD\u4F18\u5316 main.menu.tools.optimization.desc = \u5E38\u89C4\u706B\u7BAD\u8BBE\u8BA1\u4F18\u5316 main.menu.debug = \u8C03\u8BD5 diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 3c96a975c..0a51adacc 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -843,9 +843,6 @@ public class BasicFrame extends JFrame { // Tools menu = new JMenu(trans.get("main.menu.tools")); - - //// Analyzing the rocket - menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.tools.desc")); menubar.add(menu); //// Component analysis From 12c2d5bf4fdfe38664a6b922a1e5dfb30482c5a3 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 20 Jul 2022 22:15:04 +0200 Subject: [PATCH 4/4] [#1539] Apply preset after double-click --- .../configdialog/RocketComponentConfig.java | 7 +--- .../preset/ComponentPresetChooserDialog.java | 39 +++++++++++++++++-- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 59628c5ac..ccdcfd957 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -264,12 +264,9 @@ public class RocketComponentConfig extends JPanel { if (presetComboBox == null || presetModel == null) return; ((ComponentPresetDatabase) Application.getComponentPresetDao()).addDatabaseListener(presetModel); ComponentPresetChooserDialog dialog = - new ComponentPresetChooserDialog(SwingUtilities.getWindowAncestor(RocketComponentConfig.this), component); + new ComponentPresetChooserDialog(SwingUtilities.getWindowAncestor(RocketComponentConfig.this), + component, presetModel); dialog.setVisible(true); - ComponentPreset preset = dialog.getSelectedComponentPreset(); - if (preset != null) { - presetModel.setSelectedItem(preset); - } ((ComponentPresetDatabase) Application.getComponentPresetDao()).removeChangeListener(presetModel); } }); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java index 3061d6d62..1733e942c 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java @@ -7,6 +7,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -25,6 +27,7 @@ import javax.swing.table.TableColumn; import javax.swing.table.TableModel; import net.miginfocom.swing.MigLayout; +import net.sf.openrocket.gui.adaptors.PresetModel; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.preset.ComponentPreset; @@ -45,8 +48,8 @@ public class ComponentPresetChooserDialog extends JDialog { private final RocketComponent component; - private ComponentPresetTable componentSelectionTable; - private JTextField filterText; + private final ComponentPresetTable componentSelectionTable; + private final JTextField filterText; private JCheckBox foreDiameterFilterCheckBox; private JCheckBox aftDiameterFilterCheckBox; private JCheckBox showLegacyCheckBox; @@ -66,12 +69,14 @@ public class ComponentPresetChooserDialog extends JDialog { private List presets; private ComponentPreset.Type presetType; + private PresetModel presetModel; - public ComponentPresetChooserDialog(Window owner, RocketComponent component) { + public ComponentPresetChooserDialog(Window owner, RocketComponent component, PresetModel presetModel) { super(owner, trans.get("title"), Dialog.ModalityType.APPLICATION_MODAL); this.component = component; this.presetType = component.getPresetType(); + this.presetModel = presetModel; this.presets = Application.getComponentPresetDao().listForType(component.getPresetType()); List> displayedColumnKeys = Arrays.asList(component.getPresetType().getDisplayedColumns()); @@ -150,7 +155,17 @@ public class ComponentPresetChooserDialog extends JDialog { panel.add(scrollpane, "grow, width 700lp, height 300lp, pushy, spanx, wrap rel"); panel.add(new JLabel(Chars.UP_ARROW + " " + trans.get("lbl.favorites")), "spanx, gapleft 5px, wrap para"); - + + // When double-clicking a preset row, apply the preset and close this dialog + componentSelectionTable.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + // Don't do anything when double-clicking the first column + if (e.getClickCount() == 2 && componentSelectionTable.getSelectedColumn() > 0 && applySelectedPreset()) { + ComponentPresetChooserDialog.this.setVisible(false); + } + } + }); // Close buttons JButton closeButton = new SelectColorButton(trans.get("dlg.but.close")); @@ -158,6 +173,7 @@ public class ComponentPresetChooserDialog extends JDialog { @Override public void actionPerformed(ActionEvent e) { ComponentPresetChooserDialog.this.setVisible(false); + applySelectedPreset(); } }); panel.add(closeButton, "spanx, right, tag close"); @@ -169,6 +185,21 @@ public class ComponentPresetChooserDialog extends JDialog { updateFilters(); } + + /** + * Applies the currently selected preset to presetModel. + * + * @return true if the preset was applied, false if otherwise. + */ + private boolean applySelectedPreset() { + if (presetModel == null) return false; + ComponentPreset preset = getSelectedComponentPreset(); + if (preset != null) { + presetModel.setSelectedItem(preset); + return true; + } + return false; + } private JPanel getFilterCheckboxes(XTableColumnModel tm, int legacyColumnIndex) {