Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
4d8a433a
by Tony CHEMIT at 2017-03-30T08:57:21+02:00
5 changed files:
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss
- application-swing/src/main/resources/i18n/application-swing_en_GB.properties
- application-swing/src/main/resources/i18n/application-swing_es_ES.properties
- application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
Changes:
| ... | ... | @@ -34,7 +34,10 @@ |
| 34 | 34 |
<JTextArea id='comment2'
|
| 35 | 35 |
onKeyReleased='if (!comment2.getText().isEmpty() || model.getComment() != null) { model.setComment(comment2.getText().isEmpty() ? null : comment2.getText()); }'/>
|
| 36 | 36 |
<JPanel id="columnHeader" layout="{new BorderLayout()}">
|
| 37 |
- <JLabel constraints='BorderLayout.WEST' text="{getTitle()}"/>
|
|
| 37 |
+ <JPanel layout="{new BorderLayout(3, 3)}" constraints='BorderLayout.WEST'>
|
|
| 38 |
+ <JLabel id='titleLabel' constraints='BorderLayout.WEST'/>
|
|
| 39 |
+ <JLabel id='infoLabel' constraints='BorderLayout.CENTER'/>
|
|
| 40 |
+ </JPanel>
|
|
| 38 | 41 |
<JToolBar constraints='BorderLayout.EAST'>
|
| 39 | 42 |
<JButton id="resetComment" styleClass='resetButton' onActionPerformed="model.setComment(null)"/>
|
| 40 | 43 |
</JToolBar>
|
| ... | ... | @@ -12,3 +12,13 @@ |
| 12 | 12 |
#resetComment {
|
| 13 | 13 |
toolTipText:"observe.action.resetComment.tip";
|
| 14 | 14 |
}
|
| 15 |
+ |
|
| 16 |
+ |
|
| 17 |
+#titleLabel {
|
|
| 18 |
+ text: {getTitle()};
|
|
| 19 |
+}
|
|
| 20 |
+ |
|
| 21 |
+#infoLabel {
|
|
| 22 |
+ actionIcon:information;
|
|
| 23 |
+ toolTipText:"observe.action.comment.tip";
|
|
| 24 |
+}
|
|
| \ No newline at end of file |
| ... | ... | @@ -44,6 +44,7 @@ observe.action.close.route.tip=Close road |
| 44 | 44 |
observe.action.close.storage=Close storage
|
| 45 | 45 |
observe.action.close.storage.tip=Close current storage
|
| 46 | 46 |
observe.action.close.synchro.tip=close window
|
| 47 |
+observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator <b>Ctrl + Tab</b></li><li>To focus on previous widget, use accelerator <b>Ctrl + Shift + Tab</b></body></html>
|
|
| 47 | 48 |
observe.action.config.export.required.read.referentiel=Read permission is required on referential for this operation
|
| 48 | 49 |
observe.action.config.export.required.write.data=Write permission is required on data for this operation
|
| 49 | 50 |
observe.action.configuration=Preferences
|
| ... | ... | @@ -44,6 +44,7 @@ observe.action.close.route.tip=Cierre de la ruta abierta |
| 44 | 44 |
observe.action.close.storage=Cerrar la fuente de datos
|
| 45 | 45 |
observe.action.close.storage.tip=Cerrar la fuente de datos usado actualmente
|
| 46 | 46 |
observe.action.close.synchro.tip=Cerrar la ventana
|
| 47 |
+observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator <b>Ctrl + Tab</b></li><li>To focus on previous widget, use accelerator <b>Ctrl + Shift + Tab</b></body></html> \#TODO
|
|
| 47 | 48 |
observe.action.config.export.required.read.referentiel=Debe tener derechos de lectura sobre el referencial de datos para esta operación
|
| 48 | 49 |
observe.action.config.export.required.write.data=Debe tener derechos de escritura sobre los datos para esta operación
|
| 49 | 50 |
observe.action.configuration=Configuración
|
| ... | ... | @@ -45,6 +45,7 @@ observe.action.close.route.tip=Clôturer la route ouverte |
| 45 | 45 |
observe.action.close.storage=Fermer la source de données
|
| 46 | 46 |
observe.action.close.storage.tip=Fermer la source de données actuellement utilisée
|
| 47 | 47 |
observe.action.close.synchro.tip=Fermer la fenêtre
|
| 48 |
+observe.action.comment.tip=<html><body><ul><li>Pour accéder au composant suivant, utilisez les raccourci clavier <b>Ctrl + Tab</b></li><li>Pour accéder au composant précédent, utilisez les raccourci clavier <b>Ctrl + Shift + Tab</b></body></html>
|
|
| 48 | 49 |
observe.action.config.export.required.read.referentiel=Lecture sur le référentiel requis pour cette opération
|
| 49 | 50 |
observe.action.config.export.required.write.data=Écriture sur les données requis pour cette opération
|
| 50 | 51 |
observe.action.configuration=Configuration
|