/trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1383-1416 |
Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1209-1382 |
/trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/HashMapComposants.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/HashMapComposants.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/InfoLogger.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/InfoLogger.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/InfoLogger.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/AproposFenetre.java |
---|
27,11 → 27,13 |
private Params aproposParams = null; |
private String contributeurTpl = null; |
private Params contributeurParams = null; |
private String licenceTpl = null; |
private Params licenceParams = null; |
public AproposFenetre() { |
i18nC = Mediateur.i18nC; |
setSize(500, 300); |
setSize(600, 500); |
setPlain(true); |
setHeading(i18nC.aproposTitre()); |
setIcon(Images.ICONES.information()); |
42,6 → 44,7 |
HtmlContainer aproposConteneurDuHtml = formaterSquelette(aproposTpl, aproposParams); |
HtmlContainer contributeurConteneurDuHtml = formaterSquelette(contributeurTpl, contributeurParams); |
HtmlContainer licenceConteneurDuHtml = formaterSquelette(licenceTpl, licenceParams); |
TabPanel aproposOnglets = new TabPanel(); |
57,6 → 60,12 |
contributeurOnglet.setScrollMode(Scroll.AUTO); |
aproposOnglets.add(contributeurOnglet); |
TabItem licenceOnglet = new TabItem(i18nC.aproposTitreLicence()); |
licenceOnglet.add(licenceConteneurDuHtml); |
licenceOnglet.setBorders(false); |
licenceOnglet.setScrollMode(Scroll.AUTO); |
aproposOnglets.add(licenceOnglet); |
add(aproposOnglets, new FitData(4)); |
} |
76,6 → 85,7 |
private void initialiserSquelettes() { |
initialiserSqueletteApropos(); |
initialiserSqueletteContributeur(); |
initialiserSqueletteLicence(); |
} |
private void initialiserSqueletteApropos() { |
87,6 → 97,7 |
" <span class='{css_label}'>{i18n_version}{label_separateur}</span> {version}<br />"+ |
" <span class='{css_label}'>{i18n_version_nom}{label_separateur}</span> {version_nom}<br />"+ |
" <span class='{css_label}'>{i18n_revision}{label_separateur}</span> {revision}<br />"+ |
" <span class='{css_label}'>{i18n_revision_jrest}{label_separateur}</span> {revision_jrest}<br />"+ |
" <span class='{css_label}'>{i18n_licence}{label_separateur}</span> {licence}"+ |
" </p>"+ |
" <hr />"+ |
116,13 → 127,23 |
" <p>"+ |
" <span class='{css_label}'>{i18n_developpeur}{label_separateur}</span> {developpeur}<br />"+ |
" <span class='{css_label}'>{i18n_traducteur}{label_separateur}</span> {traducteur}<br />"+ |
" <span class='{css_label}'>{i18n_testeur}{label_separateur}</span> {testeur}"+ |
" </p>"+ |
"</div>"; |
} |
private void initialiserSqueletteLicence() { |
licenceTpl = |
"<div class='{css_corps}'>"+ |
" <h2>{i18n_titre_licence}</h2>"+ |
" <div>{licence}</div>"+ |
"</div>"; |
} |
private void initialiserParams() { |
initialiserParamApropos(); |
initialiserParamContributeur(); |
initialiserParamLicence(); |
} |
private void initialiserParamApropos() { |
132,6 → 153,7 |
aproposParams.set("i18n_version", i18nC.aproposVersion()); |
aproposParams.set("i18n_version_nom", i18nC.aproposVersionNom()); |
aproposParams.set("i18n_revision", i18nC.aproposRevision()); |
aproposParams.set("i18n_revision_jrest", i18nC.aproposRevisionJrest()); |
aproposParams.set("i18n_licence", i18nC.aproposLicence()); |
aproposParams.set("i18n_titre_compilation", i18nC.aproposTitreCompilation()); |
aproposParams.set("i18n_compilation_date", i18nC.aproposCompilationDate()); |
147,6 → 169,7 |
aproposParams.set("version", (String) Registry.get(RegistreId.APPLI_VERSION)); |
aproposParams.set("version_nom", (String) Registry.get(RegistreId.APPLI_VERSION_NOM)); |
aproposParams.set("revision", (String) Registry.get(RegistreId.APPLI_REVISION)); |
aproposParams.set("revision_jrest", (String) Registry.get(RegistreId.JREST_REVISION)); |
aproposParams.set("licence", (String) Registry.get(RegistreId.APPLI_LICENCE)); |
aproposParams.set("compilation_date", (String) Registry.get(RegistreId.APPLI_COMPILATION_DATE_HEURE)); |
aproposParams.set("version_java", (String) Registry.get(RegistreId.APPLI_COMPILATION_JAVA_VERSION)); |
161,8 → 184,18 |
contributeurParams.set("i18n_titre_contributeur", i18nC.aproposTitreContributeur()); |
contributeurParams.set("i18n_developpeur", i18nC.aproposDeveloppeur()); |
contributeurParams.set("i18n_traducteur", i18nC.aproposTraducteur()); |
contributeurParams.set("i18n_testeur", i18nC.aproposTesteur()); |
contributeurParams.set("developpeur", (String) Registry.get(RegistreId.APPLI_DEVELOPPEURS)); |
contributeurParams.set("traducteur", (String) Registry.get(RegistreId.APPLI_TRADUCTEURS)); |
contributeurParams.set("testeur", (String) Registry.get(RegistreId.APPLI_TESTEURS)); |
} |
private void initialiserParamLicence() { |
licenceParams = new Params(); |
licenceParams.set("i18n_titre_licence", i18nC.aproposTitreLicence()); |
licenceParams.set("licence", i18nC.licence()); |
} |
} |
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/AproposFenetre.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1383-1416 |
Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1209-1382 |
/trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1383-1416 |
Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1209-1382 |
/trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/pagination/Proxy.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/Proxy.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/AideFenetre.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/composants/AideFenetre.java:r1209-1382 |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/AideFenetre.java:r1383-1416 |
/trunk/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java:r1383-1416 |