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

Commits:

8 changed files:

Changes:

  • client-core/src/main/i18n/getters/java.getter
    ... ... @@ -109,10 +109,6 @@ observe.action.test.remote
    109 109 
     observe.action.test.remote.tip
    110 110 
     observe.action.test.server
    111 111 
     observe.action.test.server.tip
    112 
    -observe.action.toFullScreen
    113 
    -observe.action.toFullScreen.tip
    114 
    -observe.action.toWindowScreen
    115 
    -observe.action.toWindowScreen.tip
    116 112 
     observe.action.translate
    117 113 
     observe.action.translate.tip
    118 114 
     observe.actions.consolidate
    ... ... @@ -389,7 +385,6 @@ observe.common.FloatlinesCompositionDto.table.lineType.tip
    389 385 
     observe.common.FloatlinesCompositionDto.table.proportion
    390 386 
     observe.common.FloatlinesCompositionDto.table.proportion.tip
    391 387 
     observe.common.GearUseFeatures.delete
    392 
    -observe.common.GearUseFeaturesLonglineDto.table.comment
    393 388 
     observe.common.GearUseFeaturesLonglineDto.table.comment.tip
    394 389 
     observe.common.GearUseFeaturesLonglineDto.table.gear
    395 390 
     observe.common.GearUseFeaturesLonglineDto.table.gear.tip

  • client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx
    ... ... @@ -52,8 +52,6 @@
    52 52 
         fr.ird.observe.client.ui.actions.main.menu.config.TranslateAction
    53 53 
         fr.ird.observe.client.ui.actions.main.menu.file.CloseApplicationAction
    54 54 
         fr.ird.observe.client.ui.actions.main.menu.file.ReloadApplicationAction
    55 
    -    fr.ird.observe.client.ui.actions.main.menu.file.ToFullScreenAction
    56 
    -    fr.ird.observe.client.ui.actions.main.menu.file.ToWindowScreenAction
    57 55 
         fr.ird.observe.client.ui.actions.main.menu.help.GotoSiteAction
    58 56 
         fr.ird.observe.client.ui.actions.main.menu.help.ShowAboutAction
    59 57 
         fr.ird.observe.client.ui.actions.main.menu.navigation.GotoOpenProgramAction
    ... ... @@ -152,8 +150,6 @@ protected void finalize() throws Throwable {
    152 150
    153 151 
         <JMenu id='menuFile'>
    154 152 
           <JMenuItem id='menuFileReloadApplication'/>
    155 
    -      <JMenuItem id='menuFileToFullScreen'/>
    156 
    -      <JMenuItem id='menuFileToWindowScreen'/>
    157 153 
           <JMenuItem id='menuFileCloseApplication' enabled="{menuFile.isShowing()}"/>
    158 154 
         </JMenu>
    159 155

  • client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss
    ... ... @@ -67,16 +67,6 @@ JSplitPane {
    67 67 
       enabled: {model.isFileEnabled()};
    68 68 
     }
    69 69
    70 
    -#menuFileToFullScreen {
    71 
    -  _observeAction:{ToFullScreenAction.ACTION_NAME};
    72 
    -  visible:{!model.isFullScreen()}
    73 
    -}
    74 
    -
    75 
    -#menuFileToWindowScreen {
    76 
    -  _observeAction:{ToWindowScreenAction.ACTION_NAME};
    77 
    -  visible:{model.isFullScreen()}
    78 
    -}
    79 
    -
    80 70 
     #menuConfigurationConfiguration {
    81 71 
       _observeAction:{ShowConfigAction.ACTION_NAME};
    82 72 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java deleted
    1 
    -package fr.ird.observe.client.ui.actions.main.menu.file;
    2 
    -
    3 
    -/*-
    4 
    - * #%L
    5 
    - * ObServe :: Client core
    6 
    - * %%
    7 
    - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    8 
    - * %%
    9 
    - * This program is free software: you can redistribute it and/or modify
    10 
    - * it under the terms of the GNU General Public License as
    11 
    - * published by the Free Software Foundation, either version 3 of the
    12 
    - * License, or (at your option) any later version.
    13 
    - *
    14 
    - * This program is distributed in the hope that it will be useful,
    15 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    - * GNU General Public License for more details.
    18 
    - *
    19 
    - * You should have received a copy of the GNU General Public
    20 
    - * License along with this program.  If not, see
    21 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    - * #L%
    23 
    - */
    24 
    -
    25 
    -import fr.ird.observe.client.ObserveSwingApplicationContext;
    26 
    -import fr.ird.observe.client.configuration.ClientConfig;
    27 
    -import fr.ird.observe.client.ui.ObserveMainUI;
    28 
    -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport;
    29 
    -
    30 
    -import java.awt.event.ActionEvent;
    31 
    -
    32 
    -import static io.ultreia.java4all.i18n.I18n.t;
    33 
    -
    34 
    -/**
    35 
    - * Created on 27/11/16.
    36 
    - *
    37 
    - * @author Tony Chemit - dev@tchemit.fr
    38 
    - * @since 6.0
    39 
    - */
    40 
    -public class ToFullScreenAction extends MenuActionSupport {
    41 
    -
    42 
    -    private static final long serialVersionUID = 3038774900992805790L;
    43 
    -
    44 
    -    public static final String ACTION_NAME = ToFullScreenAction.class.getName();
    45 
    -
    46 
    -    public ToFullScreenAction(ObserveMainUI ui) {
    47 
    -        super(ui, ACTION_NAME, t("observe.action.toFullScreen"), t("observe.action.toFullScreen.tip"), "full-screen", 'S');
    48 
    -    }
    49 
    -
    50 
    -    @Override
    51 
    -    protected void doActionPerformed(ActionEvent event) {
    52 
    -
    53 
    -        ClientConfig config = getMainUI().getConfig();
    54 
    -        config.setFullScreen(true);
    55 
    -
    56 
    -        getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config);
    57 
    -
    58 
    -    }
    59 
    -}

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java deleted
    1 
    -package fr.ird.observe.client.ui.actions.main.menu.file;
    2 
    -
    3 
    -/*-
    4 
    - * #%L
    5 
    - * ObServe :: Client core
    6 
    - * %%
    7 
    - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    8 
    - * %%
    9 
    - * This program is free software: you can redistribute it and/or modify
    10 
    - * it under the terms of the GNU General Public License as
    11 
    - * published by the Free Software Foundation, either version 3 of the
    12 
    - * License, or (at your option) any later version.
    13 
    - *
    14 
    - * This program is distributed in the hope that it will be useful,
    15 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    - * GNU General Public License for more details.
    18 
    - *
    19 
    - * You should have received a copy of the GNU General Public
    20 
    - * License along with this program.  If not, see
    21 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    - * #L%
    23 
    - */
    24 
    -
    25 
    -import fr.ird.observe.client.ObserveSwingApplicationContext;
    26 
    -import fr.ird.observe.client.configuration.ClientConfig;
    27 
    -import fr.ird.observe.client.ui.ObserveMainUI;
    28 
    -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport;
    29 
    -
    30 
    -import java.awt.event.ActionEvent;
    31 
    -
    32 
    -import static io.ultreia.java4all.i18n.I18n.t;
    33 
    -
    34 
    -/**
    35 
    - * Created on 27/11/16.
    36 
    - *
    37 
    - * @author Tony Chemit - dev@tchemit.fr
    38 
    - * @since 6.0
    39 
    - */
    40 
    -public class ToWindowScreenAction extends MenuActionSupport {
    41 
    -
    42 
    -    private static final long serialVersionUID = 3038774900992805790L;
    43 
    -
    44 
    -    public static final String ACTION_NAME = ToWindowScreenAction.class.getName();
    45 
    -
    46 
    -    public ToWindowScreenAction(ObserveMainUI ui) {
    47 
    -        super(ui, ACTION_NAME, t("observe.action.toWindowScreen"), t("observe.action.toWindowScreen.tip"), "window-screen", 'S');
    48 
    -    }
    49 
    -
    50 
    -    @Override
    51 
    -    protected void doActionPerformed(ActionEvent event) {
    52 
    -
    53 
    -        ClientConfig config = getMainUI().getConfig();
    54 
    -        config.setFullScreen(false);
    55 
    -        getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config);
    56 
    -
    57 
    -    }
    58 
    -}

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -144,10 +144,6 @@ observe.action.test.remote=Test connexion
    144 144 
     observe.action.test.remote.tip=Click here to validate remote connexion
    145 145 
     observe.action.test.server=Test connexion
    146 146 
     observe.action.test.server.tip=Click here to validate server connexion
    147 
    -observe.action.toFullScreen=Full screen mode
    148 
    -observe.action.toFullScreen.tip=Reload application in full screen mode
    149 
    -observe.action.toWindowScreen=Window screen mode
    150 
    -observe.action.toWindowScreen.tip=Reload application in wondow screen mode
    151 147 
     observe.action.translate=Translate
    152 148 
     observe.action.translate.tip=Translate application
    153 149 
     observe.action.validate.config.generateReport=Generate validation report

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -144,10 +144,6 @@ observe.action.test.remote=Comprobar la conexión
    144 144 
     observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto
    145 145 
     observe.action.test.server=Comprobar la conexión
    146 146 
     observe.action.test.server.tip=Pulsar para comprobar la conexión con el servidor
    147 
    -observe.action.toFullScreen=Modo pantalla completa
    148 
    -observe.action.toFullScreen.tip=Recargar la aplicación en modo pantalla completa
    149 
    -observe.action.toWindowScreen=Modo ventana
    150 
    -observe.action.toWindowScreen.tip=Recargar la aplicación en modo ventana
    151 147 
     observe.action.translate=Traducir
    152 148 
     observe.action.translate.tip=Traducir la aplicación
    153 149 
     observe.action.validate.config.generateReport=Generar un informe de verificación

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -144,10 +144,6 @@ observe.action.test.remote=Valider la connexion
    144 144 
     observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant
    145 145 
     observe.action.test.server=Valider la connexion
    146 146 
     observe.action.test.server.tip=Cliquer pour valider la connexion au serveur
    147 
    -observe.action.toFullScreen=Mode plein écran
    148 
    -observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran
    149 
    -observe.action.toWindowScreen=Mode fenêtre
    150 
    -observe.action.toWindowScreen.tip=Recharger l'application en mode fenêtre
    151 147 
     observe.action.translate=Traduire
    152 148 
     observe.action.translate.tip=Traduire l'application
    153 149 
     observe.action.validate.config.generateReport=Générer un rapport de validation

    • —
    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.