This is an automated email from the git hooks/post-receive script. New commit to branch feature/ReplaceComboByList in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 99739cb50b5e49a667db73b0c4cf0dd0428e4c22 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Jun 9 10:48:06 2016 +0200 Improve style --- .../ui/swing/content/demande/DemandeUI.css | 6 +++++ .../ui/swing/content/demande/DemandeUI.jaxx | 28 +++++++++++----------- .../i18n/faxtomail-ui-swing_fr_FR.properties | 3 +++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css index 31b1a9a..4883c83 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css @@ -72,6 +72,12 @@ JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment, Bu #clientLabel { text: "faxtomail.demande.clientCode.label"; + toolTipText: "faxtomail.demande.clientCode.tip"; +} + +#countClient { + width: 60; + toolTipText: "faxtomail.demande.countClient.tip"; } /*#clientField { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx index 54d8d90..4ce17f0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx @@ -104,7 +104,7 @@ <cell> <JLabel id='receivedDateLabel'/> </cell> - <cell columns="4"> + <cell columns="3"> <JLabel id='receivedDateField'/> </cell> </row> @@ -112,7 +112,7 @@ <cell> <JLabel id='senderLabel'/> </cell> - <cell columns="2"> + <cell columns="3"> <JLabel id='senderField'/> </cell> </row> @@ -120,7 +120,7 @@ <cell> <JLabel id='objectLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <JTextField id='objectField' onKeyReleased='handler.setText(event, "object")'/> </cell> @@ -153,7 +153,7 @@ <cell> <JLabel id='docTypeLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <BeanFilterableComboBox id='docTypeComboBox' constructorParams='this' genericType="DemandType"/> @@ -163,7 +163,7 @@ <cell> <JLabel id='priorityLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <BeanFilterableComboBox id='priorityComboBox' constructorParams='this' genericType="Priority"/> @@ -173,7 +173,7 @@ <cell> <JLabel id='projectReferenceLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <JTextField id='projectReferenceField' onKeyReleased='handler.setText(event, "projectReference")'/> </cell> @@ -182,7 +182,7 @@ <cell> <JLabel id='companyReferenceLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <JTextField id='companyReferenceField' onKeyReleased='handler.setText(event, "companyReference")'/> </cell> @@ -191,7 +191,7 @@ <cell> <JLabel id='waitingStateLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <BeanFilterableComboBox id='waitingStateComboBox' constructorParams='this' genericType="WaitingState"/> @@ -201,7 +201,7 @@ <cell> <JLabel id='statusLabel'/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <JPanel layout="{new BorderLayout()}"> <JLabel id='statusField' constraints='BorderLayout.NORTH'/> <BeanFilterableComboBox id='statusComboBox' @@ -215,19 +215,19 @@ <cell> <JLabel id="takenByLabel"/> </cell> - <cell weightx='1' columns="2"> + <cell weightx='1' columns="3"> <JLabel id="takenByField"/> </cell> </row> <row> - <cell columns="3" insets="10"> + <cell columns="4" insets="10"> <JSeparator/> </cell> </row> <row> - <cell columns='3'> + <cell columns='4'> <JPanel styleClass="text-row"> <JLabel id="firstOpenedLabel"/> <JLabel id="firstOpenedByLabel"/> @@ -238,7 +238,7 @@ </cell> </row> <row> - <cell columns='3'> + <cell columns='4'> <JPanel styleClass="text-row"> <JLabel id="lastModifiedLabel"/> <JLabel id="lastModifiedByLabel"/> @@ -249,7 +249,7 @@ </cell> </row> <row> - <cell columns='3'> + <cell columns='4'> <JPanel id="lastAttachmentOpeningPanel" styleClass="text-row"> <JLabel id="lastAttachmentOpeningLabel"/> diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index a71c22c..b1983bc 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -1,5 +1,6 @@ \ X\ = \ |\ = +(0)= /= \:= application.action.create.error= @@ -117,9 +118,11 @@ faxtomail.demande.ccRecipients.label=Copie à \: faxtomail.demande.client.label=Client faxtomail.demande.clientBrand.label=Marque faxtomail.demande.clientCode.label=Client +faxtomail.demande.clientCode.tip=Saisissez le code ou le nom du client et appuyez sur entrée pour lancer la recherche. faxtomail.demande.commandNb.label=Numéro de commande/devis faxtomail.demande.comment.label=Message faxtomail.demande.companyReference.label=Notre référence +faxtomail.demande.countClient.tip=Au maximun les 15 premiers éléments sont affichés sur le nombre indiqué. faxtomail.demande.demandStatus.label=Statut faxtomail.demande.demandType.label=Type faxtomail.demande.docType.label=Type -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.