Project

General

Profile

« Previous | Next » 

Revision 42aae678

Added by Katja Luther about 5 years ago

ref #7849: fix problems in preferences

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
77 77
        getValues();
78 78
        Composite composite = new Composite(parent, SWT.NULL);
79 79
        composite.setLayout(new GridLayout());
80
        if(!isAdminPreference && !Boolean.valueOf(distributionEditorPref.getValue()) && !distributionEditorPref.isAllowOverride()){
80
        if(!isAdminPreference && !isEditorActivated && !overrideActivated){
81 81
            Label label = new Label(composite, SWT.NONE);
82 82
            label.setText("The CDM settings don't allow to set the preferences for using the distribution editor locally. If you need to make local settings, please ask an administrator.");
83 83

  
......
398 398
            }else{
399 399
                child.setEnabled(false);
400 400
            }
401

  
402
            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
401 403
            if (!isAdminPreference){
402
               if (!allowOverrideAreaVoc){
403
                   button_openSelectAreas.setButtonEnabled(false);
404
                if (!allowOverrideAreaVoc){
405
                    button_openSelectAreas.setButtonEnabled(false);
406
                 }
407
                if (!allowOverrideStatus){
408
                    button_openStatusWizard.setButtonEnabled(false);
404 409
                }
405
               if (!allowOverrideStatus){
406
                   button_openStatusWizard.setButtonEnabled(false);
407
               }
408
            }
409
            PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);
410
             }
410 411
        }
411 412

  
412 413

  
......
587 588
            }
588 589
        }else{
589 590
            ownDescriptionForDistributionEditor = PreferencesUtil.isShowRankInChecklistEditor();
590
            ownDescriptionForDistributionEditor = true;
591
            allowOverrideOwnDescriptionForDistributionEditor = true;
591 592
            overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey()));
592 593
        }
593 594

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java
9 9
package eu.etaxonomy.taxeditor.preference;
10 10

  
11 11
import org.eclipse.jface.preference.BooleanFieldEditor;
12
import org.eclipse.swt.SWT;
13
import org.eclipse.swt.layout.GridData;
14
import org.eclipse.swt.widgets.Composite;
15
import org.eclipse.swt.widgets.Control;
16
import org.eclipse.swt.widgets.Label;
12 17

  
13 18
import eu.etaxonomy.taxeditor.l10n.Messages;
14
import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4;
19
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
15 20

  
16 21
/**
17 22
 * @author pplitzner
18 23
 * @date 13.02.2014
19 24
 *
20 25
 */
21
public class MediaPreferences extends FieldEditorPreferencePageE4 {
26
public class MediaPreferences extends CdmPreferencePage {
27

  
28
    BooleanFieldEditor advanced;
29
    BooleanFieldEditor preview;
22 30

  
23 31
    @Override
24
    protected void createFieldEditors() {
32
    protected Control createContents(Composite parent) {
33
       Composite top = new Composite(parent, SWT.LEFT);
25 34

  
26
       addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION),
27
                Messages.MediaPreferences_advanced,
28
                getFieldEditorParent()));
29 35

  
30
        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_MEDIA_PREVIEW),
36
       top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
37
       Label mediaDetailsView = new Label(top, SWT.NULL);
38
       mediaDetailsView.setText("Details View");
39
       advanced = new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION),
40
                Messages.MediaPreferences_advanced,
41
                top);
42
       advanced.setPreferenceStore(getPreferenceStore());
43
       advanced.load();
44
       Label mediaView = new Label(top, SWT.NULL);
45
       mediaView.setText("Media View");
46
       preview = new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_MEDIA_PREVIEW),
31 47
                Messages.MediaPreferences_preview,
32
                getFieldEditorParent()));
48
                top);
49
       preview.setPreferenceStore(getPreferenceStore());
50
       preview.load();
51
       return top;
33 52

  
34 53
    }
35 54

  
36 55

  
56

  
57

  
37 58
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
50 50
    @Override
51 51
    protected Control createContents(Composite parent) {
52 52

  
53
        if (isAllowOverride || isAdminPreference){
53
        if (isAllowOverride || isAdminPreference ){
54 54

  
55 55
            final CLabel description = new CLabel(parent, SWT.NULL);
56 56
            description.setText(Messages.NameDetailsViewConfiguration_description);
......
366 366
    public void init(){
367 367
        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.NameDetailsView);
368 368
        isAdminPreference = false;
369
        isAllowOverride = false;
369
        isAllowOverride = true;
370 370
        if (nameDetailsPref != null){
371 371
            isAllowOverride = nameDetailsPref.isAllowOverride();
372 372
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
306 306
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
307 307

  
308 308
        isShowSpecimenRelatedIssues = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowSpecimen.getKey());
309

  
309 310
        allowOverrideShowSpecimenRelatedIssues = cache.get(EditorPreferencePredicate.ShowSpecimen.getKey())!= null ? cache.get(EditorPreferencePredicate.ShowSpecimen.getKey()).isAllowOverride():true;
311

  
310 312
        overrideShowSpecimenRelatedIssues = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(EditorPreferencePredicate.ShowSpecimen.getKey()));
311 313

  
312 314
        isShowCollectingAreaInGeneralSection = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.ShowCollectingAreasInGeneralSection.getKey());

Also available in: Unified diff