Project

General

Profile

« Previous | Next » 

Revision e398666b

Added by Katja Luther about 4 years ago

fix problems in preferences views

View differences:

eu.etaxonomy.taxeditor.store/plugin.xml
577 577 
         id="eu.etaxonomy.taxeditor.preferences.generalPreferences"
578 578 
         name="%page.name.50">
579 579 
   </page>
580 
 <!--  <page
580 
  <page
581 581 
         category="eu.etaxonomy.taxeditor.preferences.namePreferences"
582 582 
         class="eu.etaxonomy.taxeditor.preference.NameDetailsViewConfiguration"
583 583 
         id="eu.etaxonomy.taxeditor.preferences.nameDetails"
584 584 
         name="%page.name.36">
585 
   </page>-->
585 
   </page>
586 586 
   <page
587 587 
         category="eu.etaxonomy.taxeditor.preference.UIPreferences"
588 588 
         class="eu.etaxonomy.taxeditor.preference.NameDetailsViewConfiguration"
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())){
81 
            Label label = new Label(composite, SWT.NONE);
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.");
80 83 

  		




  81
  
  
    
        if (isAllowOverride || isAdminPreference){


  		




  
  84
  
    
         }else{


  		




  82
  85
  
    
            Composite activateComp = createComposite(composite);


  		




  83
  86
  
    
            Label separator= new Label(activateComp, SWT.HORIZONTAL | SWT.SEPARATOR);


  		




  84
  87
  
    
            GridData sepGrid = createTextGridData();


  		




  ......




  95
  98
  
    
                    if(!isAdminPreference){


  		




  96
  99
  
    
                        overrideActivated = true;


  		




  97
  100
  
    
                    }


  		




  
  101
  
    
                    child.setEnabled(isEditorActivated);


  		




  
  102
  
    
                    PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);


  		




  98
  103
  
    

  		




  99
  
  
    
                    if(isEditorActivated){


  		




  100
  
  
    
                        child.setVisible(true);


  		




  101
  
  
    
                        child.setEnabled(true);


  		




  102
  
  
    
                    }else{


  		




  103
  
  
    
                        child.setVisible(false);


  		




  104
  
  
    
                        child.setEnabled(false);


  		




  105
  
  
    
                    }


  		




  106
  104
  
    

  		




  107
  105
  
    
                }


  		




  108
  106
  
    
            });


  		




  ......




  130
  128
  
    

  		




  131
  129
  
    
            child  = createComposite(composite);


  		




  132
  130
  
    

  		




  133
  
  
    
            child.setVisible(isEditorActivated);


  		




  
  131
  
    
            child.setEnabled(isEditorActivated);


  		




  134
  132
  
    
            separator= new Label(child, SWT.HORIZONTAL | SWT.SEPARATOR);


  		




  135
  133
  
    
            sepGrid = createTextGridData();


  		




  136
  134
  
    

  		




  ......




  210
  208
  
    
                }


  		




  211
  209
  
    
            }


  		




  212
  210
  
    

  		




  213
  
  
    
            final Button ownDescription = new Button(child, SWT.CHECK);


  		




  214
  
  
    
            ownDescription.setText(Messages.ChecklistEditorGeneralPreference_own_Description);


  		




  215
  
  
    
            ownDescription.setToolTipText(Messages.ChecklistEditorGeneralPreference_own_DescriptionToolTip);


  		




  216
  
  
    
            ownDescription.setSelection(ownDescriptionForDistributionEditor);


  		




  217
  
  
    
            ownDescription.addSelectionListener(new SelectionAdapter(){


  		




  218
  
  
    
                @Override


  		




  219
  
  
    
                public void widgetSelected(SelectionEvent e) {


  		




  220
  
  
    
                    setApply(true);


  		




  221
  
  
    
                    ownDescriptionForDistributionEditor = ownDescription.getSelection();


  		




  222
  
  
    
                 }


  		




  223
  
  
    
            });


  		




  224
  
  
    
            Button allowOverrideDescription = createAllowOverrideButton(child);


  		




  225
  
  
    
            if (isAdminPreference){


  		




  226
  
  
    
                allowOverrideDescription.setSelection(allowOverrideOwnDescriptionForDistributionEditor);


  		




  227
  
  
    
                allowOverrideDescription.addSelectionListener(new SelectionAdapter(){


  		




  228
  
  
    
                    @Override


  		




  229
  
  
    
                    public void widgetSelected(SelectionEvent e) {


  		




  230
  
  
    
                        setApply(true);


  		




  231
  
  
    
                        allowOverrideOwnDescriptionForDistributionEditor = allowOverrideDescription.getSelection();


  		




  232
  
  
    
                    }


  		




  233
  
  
    
                });


  		




  234
  
  
    
            }else{


  		




  235
  
  
    
                allowOverrideDescription.setSelection(overrideOwnDescriptionForDistributionEditor);


  		




  236
  
  
    
                allowOverrideDescription.addSelectionListener(new SelectionAdapter(){


  		




  237
  
  
    
                    @Override


  		




  238
  
  
    
                    public void widgetSelected(SelectionEvent e) {


  		




  239
  
  
    
                        setApply(true);


  		




  240
  
  
    
                        overrideOwnDescriptionForDistributionEditor = allowOverrideDescription.getSelection();


  		




  241
  
  
    
                    }


  		




  242
  
  
    
                });


  		




  243
  
  
    
                if (!allowOverrideOwnDescriptionForDistributionEditor){


  		




  244
  
  
    
                    ownDescription.setEnabled(false);


  		




  245
  
  
    
                    allowOverrideDescription.setEnabled(false);


  		




  246
  
  
    
                }


  		




  247
  
  
    
            }


  		




  
  211
  
    
//            final Button ownDescription = new Button(child, SWT.CHECK);


  		




  
  212
  
    
//            ownDescription.setText(Messages.ChecklistEditorGeneralPreference_own_Description);


  		




  
  213
  
    
//            ownDescription.setToolTipText(Messages.ChecklistEditorGeneralPreference_own_DescriptionToolTip);


  		




  
  214
  
    
//            ownDescription.setSelection(ownDescriptionForDistributionEditor);


  		




  
  215
  
    
//            ownDescription.addSelectionListener(new SelectionAdapter(){


  		




  
  216
  
    
//                @Override


  		




  
  217
  
    
//                public void widgetSelected(SelectionEvent e) {


  		




  
  218
  
    
//                    setApply(true);


  		




  
  219
  
    
//                    ownDescriptionForDistributionEditor = ownDescription.getSelection();


  		




  
  220
  
    
//                 }


  		




  
  221
  
    
//            });


  		




  
  222
  
    
//            Button allowOverrideDescription = createAllowOverrideButton(child);


  		




  
  223
  
    
//            if (isAdminPreference){


  		




  
  224
  
    
//                allowOverrideDescription.setSelection(allowOverrideOwnDescriptionForDistributionEditor);


  		




  
  225
  
    
//                allowOverrideDescription.addSelectionListener(new SelectionAdapter(){


  		




  
  226
  
    
//                    @Override


  		




  
  227
  
    
//                    public void widgetSelected(SelectionEvent e) {


  		




  
  228
  
    
//                        setApply(true);


  		




  
  229
  
    
//                        allowOverrideOwnDescriptionForDistributionEditor = allowOverrideDescription.getSelection();


  		




  
  230
  
    
//                    }


  		




  
  231
  
    
//                });


  		




  
  232
  
    
//            }else{


  		




  
  233
  
    
//                allowOverrideDescription.setSelection(overrideOwnDescriptionForDistributionEditor);


  		




  
  234
  
    
//                allowOverrideDescription.addSelectionListener(new SelectionAdapter(){


  		




  
  235
  
    
//                    @Override


  		




  
  236
  
    
//                    public void widgetSelected(SelectionEvent e) {


  		




  
  237
  
    
//                        setApply(true);


  		




  
  238
  
    
//                        overrideOwnDescriptionForDistributionEditor = allowOverrideDescription.getSelection();


  		




  
  239
  
    
//                    }


  		




  
  240
  
    
//                });


  		




  
  241
  
    
//                if (!allowOverrideOwnDescriptionForDistributionEditor){


  		




  
  242
  
    
//                    ownDescription.setEnabled(false);


  		




  
  243
  
    
//                    allowOverrideDescription.setEnabled(false);


  		




  
  244
  
    
//                }


  		




  
  245
  
    
//            }


  		




  248
  246
  
    

  		




  249
  247
  
    

  		




  250
  248
  
    
            separator= new Label(child, SWT.HORIZONTAL | SWT.SEPARATOR);


  		




  ......




  408
  406
  
    
                   button_openStatusWizard.setButtonEnabled(false);


  		




  409
  407
  
    
               }


  		




  410
  408
  
    
            }


  		




  411
  
  
    
        }else{


  		




  412
  
  
    
           Label label = new Label(composite, SWT.NONE);


  		




  413
  
  
    
           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.");


  		




  414
  
  
    

  		




  415
  409
  
    
        }


  		




  
  410
  
    
        PreferencesUtil.recursiveSetEnabled(child, isEditorActivated);


  		




  416
  411
  
    
        setValid(true);


  		




  417
  412
  
    
        return composite;


  		




  418
  413
  
    
    }


  		




  ......




  498
  493
  
    

  		




  499
  494
  
    
        if (distributionEditorPref != null){


  		




  500
  495
  
    
            isAllowOverride = distributionEditorPref.isAllowOverride();


  		




  501
  
  
    
            boolean test = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());


  		




  502
  
  
    
            if (isAllowOverride && PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey())){


  		




  
  496
  
    

  		




  
  497
  
    
            if (isAllowOverride && PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()))){


  		




  503
  498
  
    
                isEditorActivated = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());


  		




  
  499
  
    
                overrideActivated = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()));


  		




  504
  500
  
    
            }else{


  		




  505
  501
  
    
                isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());


  		




  506
  502
  
    
            }


  		




  507
  503
  
    
        }else{


  		




  508
  504
  
    
            isEditorActivated = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());


  		




  509
  505
  
    
            isAllowOverride = true;


  		




  
  506
  
    
            overrideActivated = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()));


  		




  510
  507
  
    
        }


  		




  511
  508
  
    

  		




  512
  509
  
    
        CdmPreference prefStatus = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);


  		




  ......




  520
  517
  
    
            this.allowOverrideAreaDisplay = pref.isAllowOverride();


  		




  521
  518
  
    
            if (allowOverrideAreaDisplay){


  		




  522
  519
  
    
                displayArea = PreferencesUtil.displayAreaInChecklistEditor();


  		




  
  520
  
    
                overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()));


  		




  523
  521
  
    
            }else{


  		




  524
  522
  
    
                displayArea = pref.getValue();


  		




  525
  523
  
    
            }


  		




  526
  524
  
    
        }else{


  		




  527
  525
  
    
            displayArea = PreferencesUtil.displayAreaInChecklistEditor();;


  		




  528
  526
  
    
            this.allowOverrideAreaDisplay = true;


  		




  
  527
  
    
            overrideAreaDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()));


  		




  529
  528
  
    
        }


  		




  530
  529
  
    

  		




  531
  530
  
    
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.DisplayOfStatus);


  		




  ......




  533
  532
  
    
            this.allowOverrideStatusDisplay = pref.isAllowOverride();


  		




  534
  533
  
    
            if (allowOverrideStatusDisplay){


  		




  535
  534
  
    
                displayStatus = PreferencesUtil.displayStatusInChecklistEditor();


  		




  
  535
  
    
                overrideStatusDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfStatus.getKey()));


  		




  536
  536
  
    
            }else{


  		




  537
  537
  
    
                this.displayStatus = pref.getValue();


  		




  538
  538
  
    
            }


  		




  539
  539
  
    
        }else{


  		




  540
  540
  
    
            displayStatus = PreferencesUtil.displayStatusInChecklistEditor();


  		




  541
  541
  
    
            this.allowOverrideStatusDisplay = true;


  		




  
  542
  
    
            overrideStatusDisplay = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfStatus.getKey()));


  		




  542
  543
  
    
        }


  		




  543
  544
  
    

  		




  544
  545
  
    
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.AreasSortedByIdInVocabulary);


  		




  ......




  547
  548
  
    
            this.allowOverrideOrderAreas = pref.isAllowOverride();


  		




  548
  549
  
    
            if (allowOverrideOrderAreas){


  		




  549
  550
  
    
                isSortByVocabularyOrder = PreferencesUtil.isSortNamedAreaByOrderInVocabulary();


  		




  
  551
  
    
                overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedByIdInVocabulary.getKey()));


  		




  550
  552
  
    
            }else{


  		




  551
  553
  
    
                this.isSortByVocabularyOrder = Boolean.valueOf(pref.getValue().toString());


  		




  552
  554
  
    
            }


  		




  553
  555
  
    
        }else{


  		




  554
  556
  
    
            isSortByVocabularyOrder = PreferencesUtil.isSortNamedAreaByOrderInVocabulary();


  		




  555
  557
  
    
            this.allowOverrideOrderAreas = true;


  		




  
  558
  
    
            overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedByIdInVocabulary.getKey()));


  		




  556
  559
  
    
        }


  		




  557
  560
  
    

  		




  558
  561
  
    
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.ShowRankInDistributionEditor);


  		




  ......




  561
  564
  
    
            allowOverrideRank = pref.isAllowOverride();


  		




  562
  565
  
    
            if (allowOverrideRank){


  		




  563
  566
  
    
                isShowRank = PreferencesUtil.isShowRankInChecklistEditor();


  		




  
  567
  
    
                overrideRank = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey()));


  		




  564
  568
  
    
            }else{


  		




  565
  569
  
    
                this.isShowRank = Boolean.valueOf(pref.getValue().toString());


  		




  566
  570
  
    
            }


  		




  567
  571
  
    
        }else{


  		




  568
  572
  
    
            isShowRank = PreferencesUtil.isShowRankInChecklistEditor();


  		




  569
  573
  
    
            this.allowOverrideRank = true;


  		




  
  574
  
    
            overrideRank = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey()));


  		




  570
  575
  
    
        }


  		




  571
  576
  
    

  		




  572
  577
  
    
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.OwnDescriptionForDistributionEditor);


  		




  ......




  581
  586
  
    
        }else{


  		




  582
  587
  
    
            ownDescriptionForDistributionEditor = PreferencesUtil.isShowRankInChecklistEditor();


  		




  583
  588
  
    
            ownDescriptionForDistributionEditor = true;


  		




  
  589
  
    
            overrideOwnDescriptionForDistributionEditor = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey()));


  		




  584
  590
  
    
        }


  		




  585
  591
  
    

  		




  586
  592
  
    

  		




  ......




  589
  595
  
    

  		




  590
  596
  
    

  		




  591
  597
  
    
    }


  		




  
  598
  
    

  		




  
  599
  
    

  		




  592
  600
  
    
}


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
    
  





  56
  56
  
    
            description.setText(Messages.NameDetailsViewConfiguration_description);


  		




  57
  57
  
    

  		




  58
  58
  
    
            Composite title  = createComposite(parent);


  		




  59
  
  
    
            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);


  		




  
  59
  
    
            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(!isAdminPreference);


  		




  60
  60
  
    
            if (nameDetailsConfig == null){


  		




  61
  61
  
    
                nameDetailsConfig = new NameDetailsConfigurator(false);


  		




  62
  62
  
    
            }


  		












Also available in:  Unified diff