Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
886d303e
by Tony Chemit at 2022-03-12T11:40:53+01:00
3 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss
Changes:
| ... | ... | @@ -40,6 +40,7 @@ import fr.ird.observe.client.ui.util.BooleanEditor; |
| 40 | 40 | import fr.ird.observe.client.ui.util.UIHelper;
|
| 41 | 41 | import fr.ird.observe.client.ui.util.time.UnlimitedTimeEditor;
|
| 42 | 42 | import fr.ird.observe.client.ui.util.tripMap.ObserveMapPane;
|
| 43 | +import fr.ird.observe.client.ui.util.tripMap.TripMapUI;
|
|
| 43 | 44 | import fr.ird.observe.client.validation.ObserveSwingValidator;
|
| 44 | 45 | import fr.ird.observe.dto.I18nEnumHelper;
|
| 45 | 46 | import fr.ird.observe.dto.IdDto;
|
| ... | ... | @@ -633,16 +634,15 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> |
| 633 | 634 | protected void init(JComponent editor, Set<String> notBlockingComponents) {
|
| 634 | 635 | final Boolean propertyName = (Boolean) editor.getClientProperty(CLIENT_PROPERTY_NOT_BLOCKING);
|
| 635 | 636 | if (propertyName != null) {
|
| 636 | - |
|
| 637 | 637 | if (editor instanceof FilterableDoubleList) {
|
| 638 | - |
|
| 639 | 638 | notBlockingComponents.add("universeListPane");
|
| 640 | 639 | notBlockingComponents.add("selectedListPane");
|
| 641 | - |
|
| 640 | + } else if (editor instanceof TripMapUI) {
|
|
| 641 | + notBlockingComponents.add("zoomIt");
|
|
| 642 | + notBlockingComponents.add("zoomOut");
|
|
| 643 | + notBlockingComponents.add("zoomPlus");
|
|
| 642 | 644 | } else {
|
| 643 | - |
|
| 644 | 645 | notBlockingComponents.add(editor.getName());
|
| 645 | - |
|
| 646 | 646 | }
|
| 647 | 647 | }
|
| 648 | 648 | }
|
| ... | ... | @@ -102,6 +102,10 @@ |
| 102 | 102 | enabled:{!model.isCreatingMode()}
|
| 103 | 103 | }
|
| 104 | 104 | |
| 105 | +#tripMap {
|
|
| 106 | + _notBlocking: true;
|
|
| 107 | +}
|
|
| 108 | + |
|
| 105 | 109 | #reopen {
|
| 106 | 110 | _toolTipText:{t("observe.common.TripDto.action.reopen.tip")};
|
| 107 | 111 | }
|
| ... | ... | @@ -147,6 +147,10 @@ NumberEditor { |
| 147 | 147 | enabled:{!model.isCreatingMode()}
|
| 148 | 148 | }
|
| 149 | 149 | |
| 150 | +#tripMap {
|
|
| 151 | + _notBlocking: true;
|
|
| 152 | +}
|
|
| 153 | + |
|
| 150 | 154 | #reopen {
|
| 151 | 155 | _toolTipText:{t("observe.common.TripDto.action.reopen.tip")};
|
| 152 | 156 | }
|