From: Katja Luther Date: Fri, 1 Apr 2016 12:27:10 +0000 (+0200) Subject: move restore navigator status to taxonNavigator preferences X-Git-Tag: 4.0.0^2~52 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7c9efe6cb4d32c7a7b032a558a5d27f66f5276fa move restore navigator status to taxonNavigator preferences --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java index bc51c0d98..047dab01d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java @@ -1,17 +1,10 @@ package eu.etaxonomy.taxeditor.preference; -import java.io.IOException; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -19,17 +12,16 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.ListSelectionDialog; import eu.etaxonomy.taxeditor.Messages; public class OrderPreferences extends PreferencePage implements IWorkbenchPreferencePage { - + boolean isNaturalOrderActivated; boolean isAlphabeticalOrderActivated; boolean isRankAndNameOrderActivated; + boolean isRestoreTaxonNavigator; boolean isSelectionChanged = false; boolean isStrictlyAlphabeticallyOrdered; /* @@ -42,25 +34,44 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer @Override protected Control createContents(Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); + isRestoreTaxonNavigator = PreferencesUtil.isRestoreNavigator(); + + Composite secondComposite = new Composite(parent, SWT.NULL); + secondComposite.setLayout(new GridLayout()); + + final Button activateRestoreNavigatorButton = new Button(secondComposite, SWT.CHECK | SWT.LEFT); + activateRestoreNavigatorButton.setText("Restore the last Taxon Navigator state."); + activateRestoreNavigatorButton.setSelection(isRestoreTaxonNavigator); + activateRestoreNavigatorButton.addSelectionListener(new SelectionAdapter(){ + @Override + public void widgetSelected(SelectionEvent e) { + if(isRestoreTaxonNavigator != activateRestoreNavigatorButton.getSelection()) { + isRestoreTaxonNavigator = activateRestoreNavigatorButton.getSelection(); + PreferencesUtil.setRestoreNavigator(isRestoreTaxonNavigator); + } + } + + }); + + + Composite composite = new Composite(parent, SWT.NULL); composite.setLayout(new GridLayout()); - final Label description = new Label(parent, SWT.NONE); - description.setText(Messages.OrderPreferencePage_NewNavigatorWindowRequired); + isNaturalOrderActivated = PreferencesUtil.getSortNodesNaturally(); final Button activateNaturalOrderCheckButton = new Button(composite, SWT.RADIO); activateNaturalOrderCheckButton.setText("Enable Natural Order"); activateNaturalOrderCheckButton.setSelection(isNaturalOrderActivated); - + isRankAndNameOrderActivated = !PreferencesUtil.getSortNodesStrictlyAlphabetically() && !PreferencesUtil.getSortNodesNaturally(); final Button activateRankAndNameOrderActivatedCheckButton = new Button(composite, SWT.RADIO); activateRankAndNameOrderActivatedCheckButton.setText("Enable Rank and Aplhabetical Order"); activateRankAndNameOrderActivatedCheckButton.setSelection(isRankAndNameOrderActivated); - + isAlphabeticalOrderActivated = PreferencesUtil.getSortNodesStrictlyAlphabetically(); final Button activateAlphabeticallyOrderedCheckButton = new Button(composite, SWT.RADIO); activateAlphabeticallyOrderedCheckButton.setText("Enable Alphabetical Order"); activateAlphabeticallyOrderedCheckButton.setSelection(isAlphabeticalOrderActivated); - + activateNaturalOrderCheckButton.addSelectionListener(new SelectionAdapter(){ @Override public void widgetSelected(SelectionEvent e) { @@ -69,10 +80,10 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer if (isAlphabeticalOrderActivated && isNaturalOrderActivated){ isAlphabeticalOrderActivated = false; PreferencesUtil.setSortNodesStrictlyAlphabetically(isAlphabeticalOrderActivated); - } + } if (isRankAndNameOrderActivated && isNaturalOrderActivated){ isRankAndNameOrderActivated = false; - } + } PreferencesUtil.setSortNodesNaturally(isNaturalOrderActivated); isSelectionChanged = true; }else{ @@ -89,10 +100,10 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer if (isNaturalOrderActivated && isAlphabeticalOrderActivated){ isNaturalOrderActivated = false; PreferencesUtil.setSortNodesNaturally(isNaturalOrderActivated); - } + } if (isRankAndNameOrderActivated && isAlphabeticalOrderActivated){ isRankAndNameOrderActivated = false; - } + } PreferencesUtil.setSortNodesStrictlyAlphabetically(isAlphabeticalOrderActivated); isSelectionChanged = true; }else{ @@ -101,7 +112,7 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer } }); - + activateRankAndNameOrderActivatedCheckButton.addSelectionListener(new SelectionAdapter(){ @Override public void widgetSelected(SelectionEvent e) { @@ -109,11 +120,11 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer isRankAndNameOrderActivated = activateRankAndNameOrderActivatedCheckButton.getSelection(); if (isAlphabeticalOrderActivated && isRankAndNameOrderActivated){ isAlphabeticalOrderActivated = false; - } + } if (isNaturalOrderActivated && isRankAndNameOrderActivated){ isNaturalOrderActivated = false; - } - + } + if (isRankAndNameOrderActivated ||(!isNaturalOrderActivated && !isAlphabeticalOrderActivated)){ PreferencesUtil.setSortNodesStrictlyAlphabetically(false); PreferencesUtil.setSortNodesNaturally(false); @@ -127,16 +138,20 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer }); - + + + + final Label description = new Label(parent, SWT.NONE); + description.setText(Messages.OrderPreferencePage_NewNavigatorWindowRequired); return composite; } - + @Override public void init(IWorkbench workbench) { // TODO Auto-generated method stub - + } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java index 6e8733952..d97e7cef1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java @@ -834,4 +834,15 @@ public class PreferencesUtil implements IPreferenceKeys { public static void setShowUpWidgetIsDisposedMessages(boolean selection) { getPreferenceStore().setValue(IS_SHOW_UP_WIDGET_IS_DISPOSED, selection); } + + /** + * @return + */ + public static boolean isRestoreNavigator() { + return getPreferenceStore().getBoolean(RESTORE_NAVIGATOR_STATE); + } + public static void setRestoreNavigator(boolean selection) { + getPreferenceStore().setValue(RESTORE_NAVIGATOR_STATE, selection); + } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java index d07a19fca..df1f5128c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java @@ -61,9 +61,6 @@ public class TaxonomicEditorGeneralPreferences extends "Open search results in separate windows", getFieldEditorParent())); - addField(new BooleanFieldEditor(IPreferenceKeys.RESTORE_NAVIGATOR_STATE, - "Restore the last Taxon Navigator state.", - getFieldEditorParent())); }