Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ce2492d7 by tchemit at 2019-06-08T14:32:55Z Improve navigation icons + only let access to navigation menus if only possible - - - - - 12 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLandingAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookSampleAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineObsActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineProgramAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineTripAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineProgramAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineTripAction.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java ===================================== @@ -32,6 +32,10 @@ import io.ultreia.java4all.bean.AbstractJavaBean; public class NavigationTreeConfigBean extends AbstractJavaBean implements NavigationTreeConfig { + public static final String SHOW_SEINE_TRIP = "showSeineTrip"; + public static final String SHOW_REFERENTIAL = "showReferential"; + public static final String SHOW_LONGLINE_TRIP = "showLonglineTrip"; + public static final String SHOW_EMPTY_PROGRAM = "showEmptyProgram"; private boolean showSeineTrip = true; private boolean showLonglineTrip = true; private boolean showReferential = true; @@ -46,7 +50,7 @@ public class NavigationTreeConfigBean extends AbstractJavaBean implements Naviga public void setShowSeineTrip(boolean showSeineTrip) { boolean oldValue = isShowSeineTrip(); this.showSeineTrip = showSeineTrip; - firePropertyChange("showSeineTrip", oldValue, showSeineTrip); + firePropertyChange(SHOW_SEINE_TRIP, oldValue, showSeineTrip); } @Override @@ -58,7 +62,7 @@ public class NavigationTreeConfigBean extends AbstractJavaBean implements Naviga public void setShowLonglineTrip(boolean showLonglineTrip) { boolean oldValue = isShowLonglineTrip(); this.showLonglineTrip = showLonglineTrip; - firePropertyChange("showLonglineTrip", oldValue, showLonglineTrip); + firePropertyChange(SHOW_LONGLINE_TRIP, oldValue, showLonglineTrip); } @Override @@ -70,7 +74,7 @@ public class NavigationTreeConfigBean extends AbstractJavaBean implements Naviga public void setShowReferential(boolean showReferential) { boolean oldValue = isShowReferential(); this.showReferential = showReferential; - firePropertyChange("showReferential", oldValue, showReferential); + firePropertyChange(SHOW_REFERENTIAL, oldValue, showReferential); } @Override @@ -82,6 +86,6 @@ public class NavigationTreeConfigBean extends AbstractJavaBean implements Naviga public void setShowEmptyProgram(boolean showEmptyProgram) { boolean oldValue = isShowEmptyProgram(); this.showEmptyProgram = showEmptyProgram; - firePropertyChange("showEmptyProgram", oldValue, showEmptyProgram); + firePropertyChange(SHOW_EMPTY_PROGRAM, oldValue, showEmptyProgram); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.ui; import fr.ird.observe.client.ObserveRunner; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.configuration.NavigationTreeConfigBean; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.actions.main.ChangeFocusGlobalUIAction; @@ -428,12 +429,19 @@ public class ObserveMainUIInitializer { ui.getRootPane().getActionMap().put(ChangeFocusGlobalUIAction.ACTION_NAME, action); ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(action.getAcceleratorKey(), ChangeFocusGlobalUIAction.ACTION_NAME); + NavigationTreeConfigBean config = ui.getNavigationUI().getTreeModel().getConfig(); + ObserveSeineEditModel seineEditModel = ObserveSwingApplicationContext.get().getNavigationEdit().getSeine(); - seineEditModel.addPropertyChangeListener(ObserveSeineEditModel.PROPERTY_ENABLED, e -> updateNavigationSeine((Boolean) e.getNewValue())); + seineEditModel.addPropertyChangeListener(ObserveSeineEditModel.PROPERTY_ENABLED, e -> updateNavigationSeine(config.isShowSeineTrip() && Objects.equals(Boolean.TRUE, e.getNewValue()))); + config.addPropertyChangeListener(NavigationTreeConfigBean.SHOW_SEINE_TRIP, e -> updateNavigationSeine(seineEditModel.isEnabled() && Objects.equals(Boolean.TRUE, e.getNewValue()))); + ObserveLonglineEditModel longlineEditModel = ObserveSwingApplicationContext.get().getNavigationEdit().getLongline(); - longlineEditModel.addPropertyChangeListener(ObserveLonglineEditModel.PROPERTY_ENABLED, e -> updateNavigationLongline((Boolean) e.getNewValue())); - ui.getNavigationUI().getTreeModel().getConfig().addPropertyChangeListener("showReferential", e -> updateReferentialNavigation((Boolean) e.getNewValue())); - updateReferentialNavigation(ui.getNavigationUI().getTreeModel().getConfig().isShowReferential()); + longlineEditModel.addPropertyChangeListener(ObserveLonglineEditModel.PROPERTY_ENABLED, e -> updateNavigationLongline(config.isShowLonglineTrip() && Objects.equals(Boolean.TRUE, e.getNewValue()))); + config.addPropertyChangeListener(NavigationTreeConfigBean.SHOW_LONGLINE_TRIP, e -> updateNavigationLongline(longlineEditModel.isEnabled() && Objects.equals(Boolean.TRUE, e.getNewValue()))); + + config.addPropertyChangeListener(NavigationTreeConfigBean.SHOW_REFERENTIAL, e -> updateReferentialNavigation((Boolean) e.getNewValue())); + updateReferentialNavigation(config.isShowReferential()); + } private void updateReferentialNavigation(Boolean newValue) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLandingAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectLonglineLandingAction extends SelectEditDataAction { (int) 'F', t("observe.common.TripLonglineLandingDto.action.goToOpen.short"), t("observe.common.TripLonglineLandingDto.action.goToOpen.tip"), - "navigation.data.longline.LandingLongline"); + "navigation.data.ll.landing.LandingLongline"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookActivityAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectLonglineLogbookActivityAction extends SelectEditDataAction { (int) 'D', t("observe.common.ActivityLogbookDto.action.goToOpen.short"), t("observe.common.ActivityLogbookDto.action.goToOpen.tip"), - "navigation.data.longline.ActivityLonglineLogbook"); + "navigation.data.ll.logbook.ActivityLonglineLogbook"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookSampleAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectLonglineLogbookSampleAction extends SelectEditDataAction { (int) 'E', t("observe.common.TripLonglineSampleLogbookDto.action.goToOpen.short"), t("observe.common.TripLonglineSampleLogbookDto.action.goToOpen.tip"), - "navigation.data.longline.SampleLogbook"); + "navigation.data.ll.logbook.SampleLogbook"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineObsActivityAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectLonglineObsActivityAction extends SelectEditDataAction { (int) 'C', t("observe.common.ActivityObsDto.action.goToOpen.short"), t("observe.common.ActivityObsDto.action.goToOpen.tip"), - "navigation.data.longline.ActivityLonglineObs"); + "navigation.data.ll.observation.ActivityLonglineObs"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineProgramAction.java ===================================== @@ -39,6 +39,6 @@ public class SelectLonglineProgramAction extends SelectEditDataAction { super(mainUI, ObserveLonglineProgramEditNode.class, (int) 'A', t("observe.common.ProgramDto.action.goToOpen.short"), t("observe.common.ProgramDto.action.goToOpen.tip"), - "navigation.referential.Program"); + "navigation.referential.common.Program"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineTripAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectLonglineTripAction extends SelectEditDataAction { (int) 'B', t("observe.common.TripDto.action.goToOpen.short"), t("observe.common.TripDto.action.goToOpen.tip"), - "navigation.data.longline.TripLongline"); + "navigation.data.ll.common.TripLongline"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineActivityAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectSeineActivityAction extends SelectEditDataAction { (int) 'D', t("observe.common.ActivityDto.action.goToOpen.short"), t("observe.common.ActivityDto.action.goToOpen.tip"), - "navigation.data.seine.ActivitySeine"); + "navigation.data.ps.observation.ActivitySeine"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineProgramAction.java ===================================== @@ -41,6 +41,6 @@ public class SelectSeineProgramAction extends SelectEditDataAction { (int) 'A', t("observe.common.ProgramDto.action.goToOpen.short"), t("observe.common.ProgramDto.action.goToOpen.tip"), - "navigation.referential.Program"); + "navigation.referential.common.Program"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineRouteAction.java ===================================== @@ -41,6 +41,6 @@ public class SelectSeineRouteAction extends SelectEditDataAction { (int) 'C', t("observe.common.RouteDto.action.goToOpen.short"), t("observe.common.RouteDto.action.goToOpen.tip"), - "navigation.data.seine.Route"); + "navigation.data.ps.observation.Route"); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineTripAction.java ===================================== @@ -41,7 +41,7 @@ public class SelectSeineTripAction extends SelectEditDataAction { (int) 'B', t("observe.common.TripDto.action.goToOpen.short"), t("observe.common.TripDto.action.goToOpen.tip"), - "navigation.data.seine.TripSeine"); + "navigation.data.ps.common.TripSeine"); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ce2492d7c8c671762e8b0931454c... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ce2492d7c8c671762e8b0931454c... You're receiving this email because of your account on gitlab.com.