Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67b3e882 by Tony Chemit at 2020-12-13T01:11:36+01:00 Déploiement du calendrier - Closes #1643 - - - - - 5 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -275,6 +275,7 @@ observe.ui.datasource.storage.server.sessionExpire.reload observe.ui.datasource.storage.server.sessionExpire.title observe.ui.datasource.storage.serverConfiguration.presets.save observe.ui.datasource.storage.step.label +observe.ui.datepicker.show observe.ui.menu.navigation.ll observe.ui.menu.navigation.ps observe.ui.message.db.closed ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.api.content; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.configuration.WithClientConfig; +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.actions.GoToTab; import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; @@ -43,6 +44,7 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox; import io.ultreia.java4all.jaxx.widgets.choice.BooleanEditor; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; @@ -56,6 +58,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.widgets.BeanUIUtil; import org.nuiton.jaxx.widgets.datetime.BeanDateEditor; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; +import org.nuiton.jaxx.widgets.datetime.ExtendedBasicDatePickerUI; import org.nuiton.jaxx.widgets.datetime.JAXXDatePicker; import org.nuiton.jaxx.widgets.datetime.TimeEditor; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; @@ -70,6 +73,7 @@ import org.nuiton.jaxx.widgets.text.NormalTextEditor; import org.nuiton.jaxx.widgets.text.UrlEditor; import javax.swing.ActionMap; +import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; @@ -409,6 +413,17 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(JAXXDatePicker editor) { initializerContext.checkFirstPass(); editor.setFormats("dd/MM/yyyy"); + ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() { + @Override + protected JButton createPopupButton() { + JButton popupButton = super.createPopupButton(); + if (popupButton != null) { + popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN)); + } + return popupButton; + } + }; + editor.setUI(ui); } protected void init(BooleanEditor editor) { @@ -429,6 +444,18 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(BeanDateEditor editor) { initializerContext.checkFirstPass(); editor.setLocale(getClientConfig().getLocale()); + ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() { + @Override + protected JButton createPopupButton() { + JButton popupButton = super.createPopupButton(); + if (popupButton != null) { + popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN)); + } + return popupButton; + } + }; + ui.setShowPopupButton(true); + editor.setUI(ui); editor.init(); } ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configure remote data sour observe.ui.datasource.storage.useRemoteStorage.description=Please configure connexion to remote data source\nYou must validate your connexion to continue. observe.ui.datasource.storage.useServerStorage.config=Configure remote server to use observe.ui.datasource.storage.useServerStorage.description=Please configure connexion to remote server\nYou must validate your connexion to continue. +observe.ui.datepicker.show=To show date picker dialog observe.ui.menu.actions=Actions observe.ui.menu.configuration=Configuration observe.ui.menu.configuration.tip=To configure application ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configurar la base remota observe.ui.datasource.storage.useRemoteStorage.description=Configure la conexión a la base remota\nAntes de continuar, debe validar la conexión. observe.ui.datasource.storage.useServerStorage.config=Configurar el servidor remoto a utilizar observe.ui.datasource.storage.useServerStorage.description=Configure su conexión al servidor remoto\nAntes de que pueda continuar, tiene que validar la conexión. +observe.ui.datepicker.show=To show date picker dialog \#TODO observe.ui.menu.actions=Acciones observe.ui.menu.configuration=Configuración observe.ui.menu.configuration.tip=Menú de configuración ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configurer la base distant observe.ui.datasource.storage.useRemoteStorage.description=Veuillez configurer votre connexion à la base distante\nAvant de pouvoir poursuivre, vous devez valider la connexion. observe.ui.datasource.storage.useServerStorage.config=Configurer le serveur distant à utiliser observe.ui.datasource.storage.useServerStorage.description=Veuillez configurer votre connexion au serveur distant\nAvant de pouvoir poursuivre, vous devez valider la connexion. +observe.ui.datepicker.show=Pour ouvrir l'éditeur de date observe.ui.menu.actions=Actions observe.ui.menu.configuration=Configuration observe.ui.menu.configuration.tip=Menu de configuration View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67b3e8822a805060e8532361c5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67b3e8822a805060e8532361c5... You're receiving this email because of your account on gitlab.com.