From f90b8808720af529b4afc7c2e218f9455753e340 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 9 Oct 2017 10:06:59 +0200 Subject: [PATCH] minor changes in l10n files and ExportToFileWizardPage --- .../wizard/NameDetailsViewComposite.java | 35 ++++++------- .../ExportToFileDestinationWizardPage.java | 49 +++++++++++-------- .../eu/etaxonomy/taxeditor/l10n/Messages.java | 36 ++++++++++++-- .../taxeditor/l10n/messages.properties | 22 ++++++++- .../taxeditor/l10n/messages_de.properties | 22 ++++++++- 5 files changed, 121 insertions(+), 43 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java index f578219fa..33103e518 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java @@ -83,7 +83,7 @@ public class NameDetailsViewComposite extends Composite { isSimpleDetailsViewActivated= config.isSimpleDetailsViewActivated(); final Button activateCheckButton = new Button(this, SWT.CHECK); activateCheckButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, true, 1, 1)); - activateCheckButton.setText("Show only a simple name details view"); + activateCheckButton.setText(Messages.NameDetailsViewConfiguration_activateSimpleDetailsView); activateCheckButton.setSelection(isSimpleDetailsViewActivated); activateCheckButton.addSelectionListener(new SelectionAdapter(){ @Override @@ -107,7 +107,7 @@ public class NameDetailsViewComposite extends Composite { final Button showTaxon = new Button(child, SWT.CHECK); isShowTaxon = config.isTaxonSectionActivated(); - showTaxon.setText("Show taxon of the name"); + showTaxon.setText(Messages.NameDetailsViewComposite_Show_Taxon); showTaxon.setSelection(isShowTaxon); showTaxon.addSelectionListener(new SelectionAdapter(){ @Override @@ -119,7 +119,7 @@ public class NameDetailsViewComposite extends Composite { final Button showLsid = new Button(child, SWT.CHECK); isShowLSID = config.isLSIDActivated(); - showLsid.setText("Show Lsid of the name"); + showLsid.setText(Messages.NameDetailsViewComposite_Show_LSID); showLsid.setSelection(isShowLSID); showLsid.addSelectionListener(new SelectionAdapter(){ @Override @@ -131,7 +131,7 @@ public class NameDetailsViewComposite extends Composite { final Button showNomenclaturalCode = new Button(child, SWT.CHECK); isShowNomenclaturalCode = config.isNomenclaturalCodeActived(); - showNomenclaturalCode.setText("Show the nomenclatural code"); + showNomenclaturalCode.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalCode); showNomenclaturalCode.setSelection(isShowNomenclaturalCode); showNomenclaturalCode.addSelectionListener(new SelectionAdapter(){ @Override @@ -143,7 +143,8 @@ public class NameDetailsViewComposite extends Composite { final Button showNameCache = new Button(child, SWT.CHECK); isShowNameCache= config.isNameCacheActivated(); - showNameCache.setText("Show name cache of the name (only the scientific name without the author and year)"); + + showNameCache.setText(Messages.NameDetailsViewComposite_Show_NameCache); showNameCache.setSelection(isShowNomenclaturalCode); showNameCache.addSelectionListener(new SelectionAdapter(){ @Override @@ -154,7 +155,7 @@ public class NameDetailsViewComposite extends Composite { }); final Button showAppendedPhrase = new Button(child, SWT.CHECK); isShowAppendedPhrase= config.isAppendedPhraseActivated(); - showAppendedPhrase.setText("Show appended phrase"); + showAppendedPhrase.setText(Messages.NameDetailsViewComposite_Show_AppendedPhrase); showAppendedPhrase.setSelection(isShowAppendedPhrase); showAppendedPhrase.addSelectionListener(new SelectionAdapter(){ @Override @@ -166,7 +167,7 @@ public class NameDetailsViewComposite extends Composite { final Button showRank = new Button(child, SWT.CHECK); isShowRank = config.isRankActivated(); - showRank.setText("Show rank of the name"); + showRank.setText(Messages.NameDetailsViewComposite_Show_Rank); showRank.setSelection(isShowRank); showRank.addSelectionListener(new SelectionAdapter(){ @Override @@ -176,7 +177,7 @@ public class NameDetailsViewComposite extends Composite { }); final Button showEpithets = new Button(child, SWT.CHECK); isShowEpithets = config.isAtomisedEpithetsActivated(); - showEpithets.setText("Show atomised epithets"); + showEpithets.setText(Messages.NameDetailsViewComposite_Show_AtomisedEpithets); showEpithets.setSelection(isShowEpithets); showEpithets.addSelectionListener(new SelectionAdapter(){ @Override @@ -186,7 +187,7 @@ public class NameDetailsViewComposite extends Composite { }); final Button showAuthorshipCache = new Button(child, SWT.CHECK); isShowAuthorshipCache= config.isAuthorCacheActivated(); - showAuthorshipCache.setText("Show authorship cache"); + showAuthorshipCache.setText(Messages.NameDetailsViewComposite_Show_AuthorCache); showAuthorshipCache.setSelection(isShowAuthorshipCache); showAuthorshipCache.addSelectionListener(new SelectionAdapter(){ @Override @@ -197,7 +198,7 @@ public class NameDetailsViewComposite extends Composite { final Button showAuthorship = new Button(child, SWT.CHECK); isShowAuthorship =config.isAuthorshipSectionActivated(); - showAuthorship.setText("Show authorship section"); + showAuthorship.setText(Messages.NameDetailsViewComposite_Show_Author); showAuthorship.setSelection(isShowAuthorship); showAuthorship.addSelectionListener(new SelectionAdapter(){ @Override @@ -208,7 +209,7 @@ public class NameDetailsViewComposite extends Composite { final Button showNomenclaturalRef = new Button(child, SWT.CHECK); isShowNomenclaturalRef = config.isNomenclaturalReferenceSectionActivated(); - showNomenclaturalRef.setText("Show nomenclatural reference section"); + showNomenclaturalRef.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalReference); showNomenclaturalRef.setSelection(isShowNomenclaturalRef); showNomenclaturalRef.addSelectionListener(new SelectionAdapter(){ @Override @@ -219,7 +220,7 @@ public class NameDetailsViewComposite extends Composite { final Button showNomenclaturalStatus = new Button(child, SWT.CHECK); isShowNomenclaturalStatus = config.isNomenclaturalStatusSectionActivated(); - showNomenclaturalStatus.setText("Show nomenclatural status section"); + showNomenclaturalStatus.setText(Messages.NameDetailsViewComposite_Show_NomenclaturalStatus); showNomenclaturalStatus.setSelection(isShowNomenclaturalStatus); showNomenclaturalStatus.addSelectionListener(new SelectionAdapter(){ @Override @@ -230,7 +231,7 @@ public class NameDetailsViewComposite extends Composite { final Button showProtologue = new Button(child, SWT.CHECK); isShowProtologue = config.isProtologueActivated(); - showProtologue.setText("Show protologue section"); + showProtologue.setText(Messages.NameDetailsViewComposite_Show_Protologue); showProtologue.setSelection(isShowProtologue); showProtologue.addSelectionListener(new SelectionAdapter(){ @Override @@ -241,7 +242,7 @@ public class NameDetailsViewComposite extends Composite { final Button showTypeDesignation = new Button(child, SWT.CHECK); isShowTypeDesignation = config.isTypeDesignationSectionActivated(); - showTypeDesignation.setText("Show name type designation section"); + showTypeDesignation.setText(Messages.NameDetailsViewComposite_Show_TypeDesignation); showTypeDesignation.setSelection(isShowTypeDesignation); showTypeDesignation.addSelectionListener(new SelectionAdapter(){ @Override @@ -253,7 +254,7 @@ public class NameDetailsViewComposite extends Composite { final Button showNameRelationship = new Button(child, SWT.CHECK); isShowNameRelationship = config.isNameRelationsSectionActivated(); - showNameRelationship.setText("Show name relationship section"); + showNameRelationship.setText(Messages.NameDetailsViewComposite_Show_Namerelationships); showNameRelationship.setSelection(isShowNameRelationship); showNameRelationship.addSelectionListener(new SelectionAdapter(){ @Override @@ -264,7 +265,7 @@ public class NameDetailsViewComposite extends Composite { final Button showHybrid = new Button(child, SWT.CHECK); isShowHybrid = config.isHybridActivated(); - showHybrid.setText("Show hybrid section"); + showHybrid.setText(Messages.NameDetailsViewComposite_Show_Hybrid); showHybrid.setSelection(isShowHybrid); showHybrid.addSelectionListener(new SelectionAdapter(){ @Override @@ -274,7 +275,7 @@ public class NameDetailsViewComposite extends Composite { }); final Button showNameApprobiation = new Button(child, SWT.CHECK); isShowNameApprobiation = config.isNameApprobiationActivated(); - showNameApprobiation.setText("Show name approbiation (for bacterial names)"); + showNameApprobiation.setText(Messages.NameDetailsViewComposite_Show_NameApprobiation); showNameApprobiation.setSelection(isShowNameApprobiation); showNameApprobiation.addSelectionListener(new SelectionAdapter(){ @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java index c2391a357..0654a1735 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java @@ -107,6 +107,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel private List classifications; private Classification selectedClassification; + private Label classificationLabel; private ExportConfiguratorBase configurator; @@ -257,11 +258,14 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel if(csvExport || csvPrintExport || outputModelExport|| csvNameExport || dwcaExport){ + +// Label comboBoxLabel = new Label(composite, SWT.NONE); +// comboBoxLabel.setText("Classification"); + Composite selectNodeOrClassification = new Composite(composite, SWT.NONE); + GridLayout grid = new GridLayout(); + grid.numColumns = 1; + selectNodeOrClassification.setLayout(grid); if ((outputModelExport || dwcaExport)&& !configurator.getTaxonNodeFilter().getSubtreeFilter().isEmpty()){ - Composite selectNodeOrClassification = new Composite(composite, SWT.NONE); - GridLayout grid = new GridLayout(); - grid.numColumns = 1; - selectNodeOrClassification.setLayout(grid); checkUseSelectedtaxonNode= new Button(selectNodeOrClassification, SWT.RADIO); String taxonStr = ""; node = CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().load(configurator.getTaxonNodeFilter().getSubtreeFilter().get(0).getUuid()); @@ -276,7 +280,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel GridData data = (GridData) classificationSelectionCombo.getLayoutData(); data.exclude = b.getSelection(); classificationSelectionCombo.setVisible(!data.exclude); - classificationLabel.setVisible(!data.exclude); + } }); checkUseSelectedtaxonNode.setSelection(true); @@ -289,23 +293,27 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel GridData data = (GridData) classificationSelectionCombo.getLayoutData(); data.exclude = b.getSelection(); classificationSelectionCombo.setVisible(data.exclude); - classificationLabel.setVisible(data.exclude); + } }); } if (node!= null){ selectedClassification = node.getClassification(); } - createClassificationSelectionCombo(composite); + createClassificationSelectionCombo(selectNodeOrClassification); + + - classificationSelectionCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, - true, false, 2, 1)); if (checkUseSelectedtaxonNode != null){ if (checkUseSelectedtaxonNode.getSelection()){ classificationSelectionCombo.setVisible(false); - classificationLabel.setVisible(false); + } + }else{ + classificationSelectionCombo.setVisible(true); + classificationSelectionCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, + true, false, 2, 1)); } } @@ -391,19 +399,18 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel private void createClassificationSelectionCombo(Composite parent){ - Composite classificationSelection = new Composite(parent, SWT.NULL); - classificationSelection.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1)); - - GridLayout layout = new GridLayout(); - classificationSelection.setLayout(layout); - - classificationLabel = new Label(classificationSelection, SWT.NULL); - // TODO not working is not really true but leave it here to remind everyone that this is under construction - classificationLabel.setText("Export complete classification"); +// Composite classificationSelection = new Composite(parent, SWT.NULL); +// classificationSelection.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); - classificationSelectionCombo = new Combo(classificationSelection, SWT.BORDER | SWT.READ_ONLY); - classificationSelectionCombo.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true, 2,1)); +// GridLayout layout = new GridLayout(); +// classificationSelection.setLayout(layout); + GridData gridData = new GridData(); + gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false); + gridData.horizontalIndent = 5; +// classificationSelection.setLayoutData(gridData); + classificationSelectionCombo = new Combo(parent, SWT.BORDER| SWT.READ_ONLY); + classificationSelectionCombo.setLayoutData(gridData); for(Classification tree : classifications){ classificationSelectionCombo.add(tree.getName().getText(), classifications.indexOf(tree)); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java index 532a118fd..beb18750c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java @@ -228,7 +228,7 @@ public class Messages extends NLS { public static String AbstractImportWizard_ConfigurationLabel; - + public static String FeatureTreeEditorComposite_ADD_FEATURE; @@ -266,10 +266,40 @@ public class Messages extends NLS { public static String NonViralNameDetails_descriptionDeleteOfCultivarNameParts; - + public static String NameDetailsViewComposite_Show_TypeDesignation; + public static String NameDetailsViewComposite_Show_Namerelationships; + public static String NameDetailsViewComposite_Show_Hybrid; + public static String NameDetailsViewComposite_Show_NameApprobiation; + public static String NameDetailsViewComposite_Show_Taxon; + public static String NameDetailsViewComposite_Show_LSID; + public static String NameDetailsViewComposite_Show_NomenclaturalCode; + public static String NameDetailsViewComposite_Show_NameCache; + public static String NameDetailsViewComposite_Show_AppendedPhrase; + public static String NameDetailsViewComposite_Show_Rank; + public static String NameDetailsViewComposite_Show_AtomisedEpithets; + public static String NameDetailsViewComposite_Show_AuthorCache; + public static String NameDetailsViewComposite_Show_Author; + public static String NameDetailsViewComposite_Show_NomenclaturalReference; + public static String NameDetailsViewComposite_Show_NomenclaturalStatus; + public static String NameDetailsViewComposite_Show_Protologue; + + public static String NameDetailsViewConfiguration_activateSimpleDetailsView; + public static String NameDetailsViewConfiguration_useLocalSettings; + + + + + + + + + + + + + - diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties index a981e91cd..043ef1a89 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties @@ -208,4 +208,24 @@ NonViralNameDetails_desciptionDeleteOfBacterialNameParts=If you click Ok, the na NonViralNameDetails_confirmDeleteOfFungiNameParts=The fungi information anamorph will be lost NonViralNameDetails_descriptionDeleteOfFungiNameParts=If you click Ok, the anamorph flag is removed and the nomenclatural code is changed. NonViralNameDetails_confirmDeleteOfCultivarNameParts=The cultivar name needs to be removed -NonViralNameDetails_descriptionDeleteOfCultivarNameParts=If you click Ok, the cultivar name is removed and the nomenclatural code is changed \ No newline at end of file +NonViralNameDetails_descriptionDeleteOfCultivarNameParts=If you click Ok, the cultivar name is removed and the nomenclatural code is changed + +NameDetailsViewComposite_Show_TypeDesignation=Name type designation section +NameDetailsViewComposite_Show_Namerelationships=Name relationship section +NameDetailsViewComposite_Show_Hybrid=Hybrid section +NameDetailsViewComposite_Show_NameApprobiation=Name approbiation (for bacterial names) +NameDetailsViewComposite_Show_Taxon=Taxon of the name +NameDetailsViewComposite_Show_LSID=Lsid of the name +NameDetailsViewComposite_Show_NomenclaturalCode=Nomenclatural code +NameDetailsViewComposite_Show_NameCache=NameCache of the name (only the scientific name without the author and year) +NameDetailsViewComposite_Show_AppendedPhrase=Appended phrase +NameDetailsViewComposite_Show_Rank=Rank of the name +NameDetailsViewComposite_Show_AtomisedEpithets=Atomised epithets +NameDetailsViewComposite_Show_AuthorCache=Authorship cache +NameDetailsViewComposite_Show_Author=Whole Authorship section +NameDetailsViewComposite_Show_NomenclaturalReference=Nomenclatural reference section +NameDetailsViewComposite_Show_NomenclaturalStatus=Nomenclatural status section +NameDetailsViewComposite_Show_Protologue=Protologue section + +NameDetailsViewConfiguration_activateSimpleDetailsView=Show only a simple name details view with the following elements: +NameDetailsViewConfiguration_useLocalSettings=Use local settings for display of name details \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties index e348f2d35..207e00195 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties @@ -208,4 +208,24 @@ NonViralNameDetails_desciptionDeleteOfBacterialNameParts=Best NonViralNameDetails_confirmDeleteOfFungiNameParts=Die Information, ob der Pilz anamorph ist, muss gelöscht werden NonViralNameDetails_descriptionDeleteOfFungiNameParts=Bestätigen Sie, wenn Sie die Information, ob der Pilz anamorph ist, löschen und den Nomenklatorischen Code ändern wollen. NonViralNameDetails_confirmDeleteOfCultivarNameParts=Der Cultivar Name muss gelöscht werden -NonViralNameDetails_descriptionDeleteOfCultivarNameParts=Bestätigen Sie, wenn Sie den Cultivar Name löschen und den Nomenklatorischen Code ändern wollen. \ No newline at end of file +NonViralNameDetails_descriptionDeleteOfCultivarNameParts=Bestätigen Sie, wenn Sie den Cultivar Name löschen und den Nomenklatorischen Code ändern wollen. + +NameDetailsViewComposite_Show_TypeDesignation=Type Designations +NameDetailsViewComposite_Show_Namerelationships=Namensrelationen +NameDetailsViewComposite_Show_Hybrid=Hybride +NameDetailsViewComposite_Show_NameApprobiation=Namens Approbation (für Bakterien) +NameDetailsViewComposite_Show_Taxon=Taxon +NameDetailsViewComposite_Show_LSID=Lsid +NameDetailsViewComposite_Show_NomenclaturalCode=Nomenclatorischer Code +NameDetailsViewComposite_Show_NameCache=Cache des Namens (nur der wissenschaftliche Name ohne Autor und Jahr) +NameDetailsViewComposite_Show_AppendedPhrase=Appended phrase +NameDetailsViewComposite_Show_Rank=Rang +NameDetailsViewComposite_Show_AtomisedEpithets=Atomisierte Epithete +NameDetailsViewComposite_Show_AuthorCache=Autoren Cache +NameDetailsViewComposite_Show_Author=Alle Autoreninformationen +NameDetailsViewComposite_Show_NomenclaturalReference=Nomenklatorische Referenz +NameDetailsViewComposite_Show_NomenclaturalStatus=Nomenklatorischer Status +NameDetailsViewComposite_Show_Protologue=Protologue + +NameDetailsViewConfiguration_activateSimpleDetailsView=Zeige nur einen vereinfachten Details view mit folgenden ELementen: +NameDetailsViewConfiguration_useLocalSettings=Verwende die lokalen Eigenschaften für die Darstellung der Details \ No newline at end of file -- 2.34.1