Author: kmorin Date: 2013-01-21 16:51:02 +0100 (Mon, 21 Jan 2013) New Revision: 239 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/239 Log: add message on import to warn the user that the protocol will only be saved when he clicks on the save button Added: trunk/tutti-ui-swing/src/main/resources/icons/action-warning.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-01-21 15:08:12 UTC (rev 238) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-01-21 15:51:02 UTC (rev 239) @@ -51,6 +51,17 @@ text: {getStringValue(model.getComment())}; } +#warningContainer { + background: {new java.awt.Color(245, 218, 88)}; + visible: {model.isImported()}; +} + +#importWarning { + text: "tutti.label.import.warning"; + actionIcon: warning; + border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; +} + #saveButton { enabled: {model.isModify() && model.isValid()}; action: {saveProtocolAction}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-21 15:08:12 UTC (rev 238) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-21 15:51:02 UTC (rev 239) @@ -168,7 +168,9 @@ </JTabbedPane> - + <JPanel id='warningContainer' layout='{new BorderLayout(10, 10)}' constraints='BorderLayout.NORTH'> + <JLabel id='importWarning' constraints='BorderLayout.CENTER'/> + </JPanel> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton'/> <JButton id='saveButton'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-21 15:08:12 UTC (rev 238) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-21 15:51:02 UTC (rev 239) @@ -210,6 +210,7 @@ ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.removeContextValue(ui); model.fromBean(protocol); + model.setImported(true); } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-21 15:08:12 UTC (rev 238) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-21 15:51:02 UTC (rev 239) @@ -55,6 +55,8 @@ public static final String PROPERTY_SAMPLE_CATEGORY_ORDER = "sampleCategoryOrder"; public static final String PROPERTY_REMOVE_SPECIES_ENABLED = "removeSpeciesEnabled"; + + public static final String PROPERTY_IMPORTED = "imported"; protected String name; @@ -72,6 +74,8 @@ SampleCategoryEnum.sex, SampleCategoryEnum.maturity, SampleCategoryEnum.age); + + protected boolean imported; /** * Can user remove a selected species? @@ -198,4 +202,15 @@ public boolean isNameAlreadyUsed() { return protocolNames.contains(getName()); } + + public boolean isImported() { + return imported; + } + + public void setImported(boolean imported) { + Object oldValue = isImported(); + this.imported = imported; + firePropertyChange(PROPERTY_IMPORTED, oldValue, imported); + } + } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-21 15:08:12 UTC (rev 238) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-21 15:51:02 UTC (rev 239) @@ -175,6 +175,7 @@ tutti.label.frequencyConfiguration.no.configuration=< Pas de configuration > tutti.label.frequencyConfiguration.rafaleStep=Classe de taille à incrémenter tutti.label.frequencyConfiguration.step=Pas de la classe de taille +tutti.label.import.warning=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.label.list.gear=Engin(s) tutti.label.list.headOfMission=Chef(s) de mission tutti.label.list.headOfSortRoom=Reponsable(s) de salle de tri Added: trunk/tutti-ui-swing/src/main/resources/icons/action-warning.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-warning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream