MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-04-13 20:53:41 +02:00
parent 8e64f3eba2
commit 08b7d4af56
8 changed files with 134 additions and 14 deletions

View File

@ -172,10 +172,8 @@ public class MnGroupeMethodeEvaluer {
if(listeDesNodesTabStop.isStyleTab(nod)) { if(listeDesNodesTabStop.isStyleTab(nod)) {
if(nod.getAttributs().get("style:type")==null) {
mnGroupeMethodeEvaluer.addSeparator(); mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvalTabAlignementGauche.menu()); mnGroupeMethodeEvaluer.add(mnEvalTabAlignementGauche.menu());
}
if(nod.getAttributs().get("style:leader-text")==null) { if(nod.getAttributs().get("style:leader-text")==null) {
mnGroupeMethodeEvaluer.addSeparator(); mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(new actEvalTabDefautStyleLeader()); mnGroupeMethodeEvaluer.add(new actEvalTabDefautStyleLeader());

Binary file not shown.

4
bin/.gitignore vendored
View File

@ -497,3 +497,7 @@
/evalPiedPagePasActivefalsemini.png /evalPiedPagePasActivefalsemini.png
/evalPiedPagePasActivetrue.png /evalPiedPagePasActivetrue.png
/evalPiedPagePasActivetruemini.png /evalPiedPagePasActivetruemini.png
/evaltabalgngauchefalse.png
/evaltabalgngauchefalsemini.png
/evaltabalgngauchetrue.png
/evaltabalgngauchetruemini.png

View File

@ -9,7 +9,7 @@
id="svg5" id="svg5"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="evaltabaligngauche.svg" sodipodi:docname="evaltabaligngauche.svg"
inkscape:export-filename="evaltabalgngauchemini.png" inkscape:export-filename="evaltabalgngauchefalsemini.png"
inkscape:export-xdpi="51.200001" inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001" inkscape:export-ydpi="51.200001"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@ -29,7 +29,7 @@
showgrid="false" showgrid="false"
inkscape:zoom="11.912965" inkscape:zoom="11.912965"
inkscape:cx="22.496498" inkscape:cx="22.496498"
inkscape:cy="22.496498" inkscape:cy="19.05487"
inkscape:window-width="1920" inkscape:window-width="1920"
inkscape:window-height="1009" inkscape:window-height="1009"
inkscape:window-x="-8" inkscape:window-x="-8"
@ -47,6 +47,21 @@
orientation="0,-1" orientation="0,-1"
id="guide2" id="guide2"
inkscape:locked="false" /> inkscape:locked="false" />
<sodipodi:guide
position="11.016009,9.8407483"
orientation="1,0"
id="guide3"
inkscape:locked="false" />
<sodipodi:guide
position="0.99943631,0.86803121"
orientation="0,-1"
id="guide4"
inkscape:locked="false" />
<sodipodi:guide
position="4.6196167,11.084491"
orientation="0,-1"
id="guide5"
inkscape:locked="false" />
</sodipodi:namedview> </sodipodi:namedview>
<defs <defs
id="defs2" /> id="defs2" />
@ -60,16 +75,57 @@
width="4.1581998" width="4.1581998"
height="1.5137306" height="1.5137306"
x="0" x="0"
y="3.3843317" y="5.6992869"
ry="0" /> ry="0" />
<path <path
style="fill:none;stroke:#ff0000;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none" style="fill:none;stroke:#ff0000;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
d="M 6.4379146,1.071159 V 7.7461638 L 11.03382,7.7279261" d="M 6.4379146,3.6478166 V 10.322821 L 11.03382,10.304584"
id="path2" /> id="path2" />
<path <path
style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.899999;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none" style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.899999;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
d="M 6.4379146,4.4086614 3.1918736,0.23222401 V 7.8373525 Z" d="M 6.4379146,6.4561523 3.1918736,2.2797149 v 7.6051285 z"
id="path3" id="path3"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<g
id="g919"
transform="matrix(1.0777571,0,0,1.1015764,5.8876045,-3.9390944)"
style="fill:#0000ff;stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(1.0781672,0,0,1.1004826,5.8856531,12.660987)"
style="fill:#0000ff;stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -9,7 +9,7 @@
id="svg5" id="svg5"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="evaltabaligngauche.svg" sodipodi:docname="evaltabaligngauche.svg"
inkscape:export-filename="evaltabalgngauchemini.png" inkscape:export-filename="evaltabalgngauchefalsemini.png"
inkscape:export-xdpi="51.200001" inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001" inkscape:export-ydpi="51.200001"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@ -29,7 +29,7 @@
showgrid="false" showgrid="false"
inkscape:zoom="11.912965" inkscape:zoom="11.912965"
inkscape:cx="22.496498" inkscape:cx="22.496498"
inkscape:cy="22.496498" inkscape:cy="19.05487"
inkscape:window-width="1920" inkscape:window-width="1920"
inkscape:window-height="1009" inkscape:window-height="1009"
inkscape:window-x="-8" inkscape:window-x="-8"
@ -47,6 +47,21 @@
orientation="0,-1" orientation="0,-1"
id="guide2" id="guide2"
inkscape:locked="false" /> inkscape:locked="false" />
<sodipodi:guide
position="11.016009,9.8407483"
orientation="1,0"
id="guide3"
inkscape:locked="false" />
<sodipodi:guide
position="0.99943631,0.86803121"
orientation="0,-1"
id="guide4"
inkscape:locked="false" />
<sodipodi:guide
position="4.6196167,11.084491"
orientation="0,-1"
id="guide5"
inkscape:locked="false" />
</sodipodi:namedview> </sodipodi:namedview>
<defs <defs
id="defs2" /> id="defs2" />
@ -60,16 +75,57 @@
width="4.1581998" width="4.1581998"
height="1.5137306" height="1.5137306"
x="0" x="0"
y="3.3843317" y="5.6992869"
ry="0" /> ry="0" />
<path <path
style="fill:none;stroke:#ff0000;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none" style="fill:none;stroke:#ff0000;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
d="M 6.4379146,1.071159 V 7.7461638 L 11.03382,7.7279261" d="M 6.4379146,3.6478166 V 10.322821 L 11.03382,10.304584"
id="path2" /> id="path2" />
<path <path
style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.899999;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none" style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.899999;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
d="M 6.4379146,4.4086614 3.1918736,0.23222401 V 7.8373525 Z" d="M 6.4379146,6.4561523 3.1918736,2.2797149 v 7.6051285 z"
id="path3" id="path3"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<g
id="g919"
transform="matrix(1.0777571,0,0,1.1015764,5.8876045,-3.9390944)"
style="fill:#0000ff;stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(1.0781672,0,0,1.1004826,5.8856531,12.660987)"
style="fill:#0000ff;stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -666,7 +666,7 @@ public final class create extends JFrame {
} }
if(listeDesNodesTabStop.isStyleTab(nod)) { if(listeDesNodesTabStop.isStyleTab(nod)) {
btnevalTABAlignementAGauchetrue.setEnabled(true); btnevalTABAlignementAGauchetrue.setEnabled(true);
btnevalTABAlignementAGauchetrue.setEnabled(true); btnevalTABAlignementAGauchefalse.setEnabled(true);
} }
} }
} }

View File

@ -374,6 +374,10 @@ public class descriptionNode {
descriptionNode = descriptionNode + "<p>Ce node est celui de l'arrière plan de type image d'une page, ou d'un cadre, etc.</p>"; descriptionNode = descriptionNode + "<p>Ce node est celui de l'arrière plan de type image d'une page, ou d'un cadre, etc.</p>";
return descriptionNode; return descriptionNode;
} }
case "style:tab-stops": {
descriptionNode = descriptionNode + "<p>Ce node est celui de toutes les tabulations d'un style de paragraphe.</p>";
return descriptionNode;
}
} }

View File

@ -10,7 +10,9 @@ public class listeDesNodesTabStop {
* @return * @return
*/ */
public static Boolean isStyleTab(node nod) { public static Boolean isStyleTab(node nod) {
if(nod.getNomElt().equals("style:tab-stop")) return true; if(nod.getNomElt().equals("style:tab-stop")) {
if(nod.getAttributs().get("style:type")==null) return true;
}
return false; return false;
} }
} }