Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

Changes:

  • client/datasource/editor/api/src/main/i18n/getters/java.getter
    ... ... @@ -275,6 +275,7 @@ observe.ui.datasource.storage.server.sessionExpire.reload
    275 275 
     observe.ui.datasource.storage.server.sessionExpire.title
    276 276 
     observe.ui.datasource.storage.serverConfiguration.presets.save
    277 277 
     observe.ui.datasource.storage.step.label
    278 
    +observe.ui.datepicker.show
    278 279 
     observe.ui.menu.navigation.ll
    279 280 
     observe.ui.menu.navigation.ps
    280 281 
     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;
    24 24
    25 25 
     import fr.ird.observe.client.WithClientUIContext;
    26 26 
     import fr.ird.observe.client.configuration.WithClientConfig;
    27 
    +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;
    27 28 
     import fr.ird.observe.client.datasource.editor.api.content.actions.GoToTab;
    28 29 
     import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane;
    29 30 
     import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI;
    ... ... @@ -43,6 +44,7 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
    43 44 
     import fr.ird.observe.dto.reference.DataDtoReference;
    44 45 
     import fr.ird.observe.dto.reference.ReferentialDtoReference;
    45 46 
     import io.ultreia.java4all.bean.JavaBean;
    47 
    +import io.ultreia.java4all.i18n.I18n;
    46 48 
     import io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox;
    47 49 
     import io.ultreia.java4all.jaxx.widgets.choice.BooleanEditor;
    48 50 
     import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor;
    ... ... @@ -56,6 +58,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
    56 58 
     import org.nuiton.jaxx.widgets.BeanUIUtil;
    57 59 
     import org.nuiton.jaxx.widgets.datetime.BeanDateEditor;
    58 60 
     import org.nuiton.jaxx.widgets.datetime.DateTimeEditor;
    61 
    +import org.nuiton.jaxx.widgets.datetime.ExtendedBasicDatePickerUI;
    59 62 
     import org.nuiton.jaxx.widgets.datetime.JAXXDatePicker;
    60 63 
     import org.nuiton.jaxx.widgets.datetime.TimeEditor;
    61 64 
     import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor;
    ... ... @@ -70,6 +73,7 @@ import org.nuiton.jaxx.widgets.text.NormalTextEditor;
    70 73 
     import org.nuiton.jaxx.widgets.text.UrlEditor;
    71 74
    72 75 
     import javax.swing.ActionMap;
    76 
    +import javax.swing.JButton;
    73 77 
     import javax.swing.JComboBox;
    74 78 
     import javax.swing.JComponent;
    75 79 
     import javax.swing.JLabel;
    ... ... @@ -409,6 +413,17 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup
    409 413 
         protected void init(JAXXDatePicker editor) {
    410 414 
             initializerContext.checkFirstPass();
    411 415 
             editor.setFormats("dd/MM/yyyy");
    416 
    +        ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() {
    417 
    +            @Override
    418 
    +            protected JButton createPopupButton() {
    419 
    +                JButton popupButton = super.createPopupButton();
    420 
    +                if (popupButton != null) {
    421 
    +                    popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN));
    422 
    +                }
    423 
    +                return popupButton;
    424 
    +            }
    425 
    +        };
    426 
    +        editor.setUI(ui);
    412 427 
         }
    413 428
    414 429 
         protected void init(BooleanEditor editor) {
    ... ... @@ -429,6 +444,18 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup
    429 444 
         protected void init(BeanDateEditor editor) {
    430 445 
             initializerContext.checkFirstPass();
    431 446 
             editor.setLocale(getClientConfig().getLocale());
    447 
    +        ExtendedBasicDatePickerUI ui = new ExtendedBasicDatePickerUI() {
    448 
    +            @Override
    449 
    +            protected JButton createPopupButton() {
    450 
    +                JButton popupButton = super.createPopupButton();
    451 
    +                if (popupButton != null) {
    452 
    +                    popupButton.setToolTipText(ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(I18n.t("observe.ui.datepicker.show"), ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN));
    453 
    +                }
    454 
    +                return popupButton;
    455 
    +            }
    456 
    +        };
    457 
    +        ui.setShowPopupButton(true);
    458 
    +        editor.setUI(ui);
    432 459 
             editor.init();
    433 460 
         }
    434 461

  • client/i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -1591,6 +1591,7 @@ observe.ui.datasource.storage.useRemoteStorage.config=Configure remote data sour
    1591 1591 
     observe.ui.datasource.storage.useRemoteStorage.description=Please configure connexion to remote data source\nYou must validate your connexion to continue.
    1592 1592 
     observe.ui.datasource.storage.useServerStorage.config=Configure remote server to use
    1593 1593 
     observe.ui.datasource.storage.useServerStorage.description=Please configure connexion to remote server\nYou must validate your connexion to continue.
    1594 
    +observe.ui.datepicker.show=To show date picker dialog
    1594 1595 
     observe.ui.menu.actions=Actions
    1595 1596 
     observe.ui.menu.configuration=Configuration
    1596 1597 
     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
    1591 1591 
     observe.ui.datasource.storage.useRemoteStorage.description=Configure la conexión a la base remota\nAntes de continuar, debe validar la conexión.
    1592 1592 
     observe.ui.datasource.storage.useServerStorage.config=Configurar el servidor remoto a utilizar
    1593 1593 
     observe.ui.datasource.storage.useServerStorage.description=Configure su conexión al servidor remoto\nAntes de que pueda continuar, tiene que validar la conexión.
    1594 
    +observe.ui.datepicker.show=To show date picker dialog \#TODO
    1594 1595 
     observe.ui.menu.actions=Acciones
    1595 1596 
     observe.ui.menu.configuration=Configuración
    1596 1597 
     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
    1591 1591 
     observe.ui.datasource.storage.useRemoteStorage.description=Veuillez configurer votre connexion à la base distante\nAvant de pouvoir poursuivre, vous devez valider la connexion.
    1592 1592 
     observe.ui.datasource.storage.useServerStorage.config=Configurer le serveur distant à utiliser
    1593 1593 
     observe.ui.datasource.storage.useServerStorage.description=Veuillez configurer votre connexion au serveur distant\nAvant de pouvoir poursuivre, vous devez valider la connexion.
    1594 
    +observe.ui.datepicker.show=Pour ouvrir l'éditeur de date
    1594 1595 
     observe.ui.menu.actions=Actions
    1595 1596 
     observe.ui.menu.configuration=Configuration
    1596 1597 
     observe.ui.menu.configuration.tip=Menu de configuration

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.