Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5032d7a0 by tchemit at 2019-02-01T14:07:21Z Le mode plein écran est disponible (?) et pose des problèmes : le retirer - Closes #1207 - - - - - 8 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -109,10 +109,6 @@ observe.action.test.remote observe.action.test.remote.tip observe.action.test.server observe.action.test.server.tip -observe.action.toFullScreen -observe.action.toFullScreen.tip -observe.action.toWindowScreen -observe.action.toWindowScreen.tip observe.action.translate observe.action.translate.tip observe.actions.consolidate @@ -389,7 +385,6 @@ observe.common.FloatlinesCompositionDto.table.lineType.tip observe.common.FloatlinesCompositionDto.table.proportion observe.common.FloatlinesCompositionDto.table.proportion.tip observe.common.GearUseFeatures.delete -observe.common.GearUseFeaturesLonglineDto.table.comment observe.common.GearUseFeaturesLonglineDto.table.comment.tip observe.common.GearUseFeaturesLonglineDto.table.gear observe.common.GearUseFeaturesLonglineDto.table.gear.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx ===================================== @@ -52,8 +52,6 @@ fr.ird.observe.client.ui.actions.main.menu.config.TranslateAction fr.ird.observe.client.ui.actions.main.menu.file.CloseApplicationAction fr.ird.observe.client.ui.actions.main.menu.file.ReloadApplicationAction - fr.ird.observe.client.ui.actions.main.menu.file.ToFullScreenAction - fr.ird.observe.client.ui.actions.main.menu.file.ToWindowScreenAction fr.ird.observe.client.ui.actions.main.menu.help.GotoSiteAction fr.ird.observe.client.ui.actions.main.menu.help.ShowAboutAction fr.ird.observe.client.ui.actions.main.menu.navigation.GotoOpenProgramAction @@ -152,8 +150,6 @@ protected void finalize() throws Throwable { <JMenu id='menuFile'> <JMenuItem id='menuFileReloadApplication'/> - <JMenuItem id='menuFileToFullScreen'/> - <JMenuItem id='menuFileToWindowScreen'/> <JMenuItem id='menuFileCloseApplication' enabled="{menuFile.isShowing()}"/> </JMenu> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== @@ -67,16 +67,6 @@ JSplitPane { enabled: {model.isFileEnabled()}; } -#menuFileToFullScreen { - _observeAction:{ToFullScreenAction.ACTION_NAME}; - visible:{!model.isFullScreen()} -} - -#menuFileToWindowScreen { - _observeAction:{ToWindowScreenAction.ACTION_NAME}; - visible:{model.isFullScreen()} -} - #menuConfigurationConfiguration { _observeAction:{ShowConfigAction.ACTION_NAME}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToFullScreenAction.java deleted ===================================== @@ -1,59 +0,0 @@ -package fr.ird.observe.client.ui.actions.main.menu.file; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; - -import java.awt.event.ActionEvent; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Created on 27/11/16. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 6.0 - */ -public class ToFullScreenAction extends MenuActionSupport { - - private static final long serialVersionUID = 3038774900992805790L; - - public static final String ACTION_NAME = ToFullScreenAction.class.getName(); - - public ToFullScreenAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, t("observe.action.toFullScreen"), t("observe.action.toFullScreen.tip"), "full-screen", 'S'); - } - - @Override - protected void doActionPerformed(ActionEvent event) { - - ClientConfig config = getMainUI().getConfig(); - config.setFullScreen(true); - - getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); - - } -} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/file/ToWindowScreenAction.java deleted ===================================== @@ -1,58 +0,0 @@ -package fr.ird.observe.client.ui.actions.main.menu.file; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; - -import java.awt.event.ActionEvent; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Created on 27/11/16. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 6.0 - */ -public class ToWindowScreenAction extends MenuActionSupport { - - private static final long serialVersionUID = 3038774900992805790L; - - public static final String ACTION_NAME = ToWindowScreenAction.class.getName(); - - public ToWindowScreenAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, t("observe.action.toWindowScreen"), t("observe.action.toWindowScreen.tip"), "window-screen", 'S'); - } - - @Override - protected void doActionPerformed(ActionEvent event) { - - ClientConfig config = getMainUI().getConfig(); - config.setFullScreen(false); - getMainUI().getInitializer().reloadUI(ObserveSwingApplicationContext.get(), config); - - } -} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -144,10 +144,6 @@ observe.action.test.remote=Test connexion observe.action.test.remote.tip=Click here to validate remote connexion observe.action.test.server=Test connexion observe.action.test.server.tip=Click here to validate server connexion -observe.action.toFullScreen=Full screen mode -observe.action.toFullScreen.tip=Reload application in full screen mode -observe.action.toWindowScreen=Window screen mode -observe.action.toWindowScreen.tip=Reload application in wondow screen mode observe.action.translate=Translate observe.action.translate.tip=Translate application 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 observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto observe.action.test.server=Comprobar la conexión observe.action.test.server.tip=Pulsar para comprobar la conexión con el servidor -observe.action.toFullScreen=Modo pantalla completa -observe.action.toFullScreen.tip=Recargar la aplicación en modo pantalla completa -observe.action.toWindowScreen=Modo ventana -observe.action.toWindowScreen.tip=Recargar la aplicación en modo ventana observe.action.translate=Traducir observe.action.translate.tip=Traducir la aplicación 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 observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant observe.action.test.server=Valider la connexion observe.action.test.server.tip=Cliquer pour valider la connexion au serveur -observe.action.toFullScreen=Mode plein écran -observe.action.toFullScreen.tip=Recharcher l'application en mode plein écran -observe.action.toWindowScreen=Mode fenêtre -observe.action.toWindowScreen.tip=Recharger l'application en mode fenêtre observe.action.translate=Traduire observe.action.translate.tip=Traduire l'application observe.action.validate.config.generateReport=Générer un rapport de validation View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5032d7a0b96f83e93d13072fa0c5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5032d7a0b96f83e93d13072fa0c5... You're receiving this email because of your account on gitlab.com.