Adding the Absolute entry for monitor rendering intent + icons updated

This commit is contained in:
Hombre
2015-12-28 14:43:37 +01:00
parent 4ecf463f9f
commit 0daea66597
17 changed files with 182 additions and 151 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 464 B

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 898 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 944 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 1012 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 827 B

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 445 B

After

Width:  |  Height:  |  Size: 674 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 847 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 882 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 779 B

After

Width:  |  Height:  |  Size: 1007 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 868 B

After

Width:  |  Height:  |  Size: 915 B

View File

@@ -81,6 +81,7 @@ private:
intentBox = Gtk::manage(bt); intentBox = Gtk::manage(bt);
intentBox->addEntry("intent-relative.png", M("PREFERENCES_INTENT_RELATIVE")); intentBox->addEntry("intent-relative.png", M("PREFERENCES_INTENT_RELATIVE"));
intentBox->addEntry("intent-perceptual.png", M("PREFERENCES_INTENT_PERCEPTUAL")); intentBox->addEntry("intent-perceptual.png", M("PREFERENCES_INTENT_PERCEPTUAL"));
intentBox->addEntry("intent-absolute.png", M("PREFERENCES_INTENT_ABSOLUTE"));
intentBox->setSelected(0); intentBox->setSelected(0);
intentConn = intentBox->signal_changed().connect (sigc::mem_fun (this, &MonitorProfileSelector::updateIntent)); intentConn = intentBox->signal_changed().connect (sigc::mem_fun (this, &MonitorProfileSelector::updateIntent));
intentBox->show(); intentBox->show();
@@ -135,9 +136,12 @@ private:
std::uint8_t supportedIntents = rtengine::iccStore->getProofIntents (profile); std::uint8_t supportedIntents = rtengine::iccStore->getProofIntents (profile);
const bool supportsPerceptual = supportedIntents & 1 << INTENT_PERCEPTUAL; const bool supportsPerceptual = supportedIntents & 1 << INTENT_PERCEPTUAL;
const bool supportsRelativeColorimetric = supportedIntents & 1 << INTENT_RELATIVE_COLORIMETRIC; const bool supportsRelativeColorimetric = supportedIntents & 1 << INTENT_RELATIVE_COLORIMETRIC;
const bool supportsAbsoluteColorimetric = supportedIntents & 1 << INTENT_ABSOLUTE_COLORIMETRIC;
if (supportsPerceptual && supportsRelativeColorimetric) { if (supportsPerceptual && (supportsRelativeColorimetric || supportsAbsoluteColorimetric)) {
intentBox->set_sensitive (true); intentBox->set_sensitive (true);
intentBox->setItemSensitivity(0, supportsRelativeColorimetric);
intentBox->setItemSensitivity(2, supportsAbsoluteColorimetric);
} }
else { else {
bool wasBlocked = intentConn.block(true); bool wasBlocked = intentConn.block(true);
@@ -148,7 +152,7 @@ private:
softProof->set_sensitive(true); softProof->set_sensitive(true);
} }
rtengine::eRenderingIntent intent = intentBox->getSelected() > 0 ? rtengine::RI_PERCEPTUAL : rtengine::RI_RELATIVE; rtengine::eRenderingIntent intent = intentBox->getSelected() > 0 ? (intentBox->getSelected() == 1 ? rtengine::RI_PERCEPTUAL : rtengine::RI_ABSOLUTE) : rtengine::RI_RELATIVE;
if (!processor) { if (!processor) {
return; return;
@@ -206,7 +210,7 @@ public:
profileConn.block(wasBlocked); profileConn.block(wasBlocked);
#endif #endif
wasBlocked = intentConn.block(true); wasBlocked = intentConn.block(true);
intentBox->setSelected(options.rtSettings.monitorIntent == rtengine::RI_PERCEPTUAL ? 0 : 1); intentBox->setSelected(options.rtSettings.monitorIntent == rtengine::RI_RELATIVE ? 0 : options.rtSettings.monitorIntent == rtengine::RI_PERCEPTUAL ? 1 : 2);
intentConn.block(wasBlocked); intentConn.block(wasBlocked);
updateParameters(); updateParameters();

View File

@@ -54,6 +54,7 @@ public:
void setButtonHint(); void setButtonHint();
void show (); void show ();
void set_tooltip_text (const Glib::ustring &text); void set_tooltip_text (const Glib::ustring &text);
void setItemSensitivity (int i, bool isSensitive);
private: private:
type_signal_changed message; type_signal_changed message;
@@ -69,7 +70,6 @@ private:
bool hasMenu; bool hasMenu;
void showMenu(GdkEventButton* event); void showMenu(GdkEventButton* event);
void setItemSensitivity (int i, bool isSensitive);
protected: protected:
void entrySelected (int i); void entrySelected (int i);

View File

@@ -28,8 +28,8 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.28397906" inkscape:zoom="0.28397906"
inkscape:cx="443.36338" inkscape:cx="497.94487"
inkscape:cy="-4.6332449" inkscape:cy="-71.539587"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="svg2" inkscape:current-layer="svg2"
showguides="true" showguides="true"
@@ -1294,6 +1294,24 @@
y1="1004.7048" y1="1004.7048"
x2="1694.8438" x2="1694.8438"
y2="1004.7048" /> y2="1004.7048" />
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath7774">
<path
inkscape:connector-curvature="0"
id="path7776"
d="m -48.208488,-24.69248 0,219.02655 896.416978,0 0,-219.02655 -896.416978,0 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
</clipPath>
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath7778">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -48.208488,-24.69248 0,219.02655 896.416978,0 0,-219.02655 -896.416978,0 z"
id="path7780"
inkscape:connector-curvature="0" />
</clipPath>
</defs> </defs>
<metadata <metadata
id="metadata7"> id="metadata7">
@@ -1303,7 +1321,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -1329,50 +1347,56 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(464.16179,164.03236)" /> transform="translate(464.16179,164.03236)" />
<g
id="g5953"
transform="translate(5.0000006e-7,1)">
<path <path
sodipodi:nodetypes="cc" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:"
inkscape:connector-curvature="0" d="M 39.826701,350 760.1733,350"
id="path5059" id="path5059"
d="m 39.8267,349 720.3466,0" inkscape:connector-curvature="0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> sodipodi:nodetypes="cc" />
<path <path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cc"
d="m 39.8267,251 720.3466,0" inkscape:connector-curvature="0"
id="path5941" id="path5941"
inkscape:connector-curvature="0" d="M 39.826701,252 760.1733,252"
sodipodi:nodetypes="cc" /> style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:" />
<path <path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cc"
d="m 39.8267,449 720.3466,0" inkscape:connector-curvature="0"
id="path5943" id="path5943"
inkscape:connector-curvature="0" d="M 39.826701,450 760.1733,450"
sodipodi:nodetypes="cc" /> style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:" />
<path <path
sodipodi:nodetypes="cc" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:"
inkscape:connector-curvature="0" d="M 39.826701,550 760.1733,550"
id="path5945" id="path5945"
d="m 39.8267,549 720.3466,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 39.826699,649 410.464591,0"
id="path5947"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="cc" />
<path <path
sodipodi:nodetypes="cc" sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path5949" id="path5947"
d="m 39.826699,149 410.464591,0" d="m 39.8267,850 410.46459,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path <path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 39.826699,49 450.29129,49" d="m 39.8267,150 105.23229,0 c 130.8764,0 259.04498,91.55605 259.04498,91.55605"
id="path5951" id="path5949"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" /> sodipodi:nodetypes="ccc"
</g> clip-path="url(#clipPath7774)" />
<path
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
id="path5951"
d="m 39.8267,50 85.23229,0 c 246.53532,0 441.16519,190.15487 441.16519,190.15487"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
clip-path="url(#clipPath7778)" />
<path
clip-path="url(#clipPath7774)"
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
id="path7782"
d="m 39.8267,150 105.23229,0 c 130.8764,0 259.04498,91.55605 259.04498,91.55605"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:49.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
transform="matrix(1,0,0,-1,3.8344425e-6,799.33407)" />
</svg> </svg>

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

@@ -15,7 +15,7 @@
id="svg2" id="svg2"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
sodipodi:docname="intent-relative.svg" sodipodi:docname="intent-perceptual.svg"
inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/distorsion.png" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/distorsion.png"
inkscape:export-xdpi="1.98" inkscape:export-xdpi="1.98"
inkscape:export-ydpi="1.98" inkscape:export-ydpi="1.98"
@@ -28,8 +28,8 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.28397906" inkscape:zoom="0.28397906"
inkscape:cx="443.36338" inkscape:cx="-22.166458"
inkscape:cy="-4.6332449" inkscape:cy="-89.632823"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="svg2" inkscape:current-layer="svg2"
showguides="true" showguides="true"
@@ -1329,38 +1329,34 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(464.16179,164.03236)" /> transform="translate(464.16179,164.03236)" />
<g <path
id="g5071" inkscape:connector-curvature="0"
transform="translate(-141.16519,-7.3847)"> id="path5053"
d="m 760.1733,510.93684 -121.71091,0 c -127.6624,0 -331.24534,140.12632 -482.7059,140.12632 l -115.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc" />
<path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,432.93684 -121.71091,0 c -144.38758,0 -332.10229,60.12632 -482.7059,60.12632 l -115.92979,0"
id="path5055"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:"
d="m 39.8267,349 720.3466,0"
id="path5059"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 901.33849,514.32154 -241.71091,0 -242.7059,140.12632 -235.92979,0" d="m 760.1733,189.06316 -121.71091,0 c -127.6624,0 -331.24534,-140.12632 -482.7059,-140.12632 l -115.92979,0"
id="path5053" id="path5970"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path5055" id="path5972"
d="m 901.33849,440.32154 -241.71091,0 -242.7059,60.12632 -235.92979,0" d="m 760.1733,267.06316 -121.71091,0 c -144.38758,0 -332.10229,-60.12632 -482.7059,-60.12632 l -115.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path5059"
d="m 180.99189,356.3847 720.3466,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path5061"
d="m 901.33849,200.44786 -241.71091,0 -242.7059,-140.12632 -235.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 901.33849,274.44786 -241.71091,0 -242.7059,-60.12632 -235.92979,0"
id="path5063"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

@@ -15,7 +15,7 @@
id="svg2" id="svg2"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.91 r13725" inkscape:version="0.91 r13725"
sodipodi:docname="intent-perceptual.svg" sodipodi:docname="intent-relative.svg"
inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/distorsion.png" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/distorsion.png"
inkscape:export-xdpi="1.98" inkscape:export-xdpi="1.98"
inkscape:export-ydpi="1.98" inkscape:export-ydpi="1.98"
@@ -27,9 +27,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.28397906" inkscape:zoom="0.20080352"
inkscape:cx="443.36338" inkscape:cx="1490.3375"
inkscape:cy="-4.6332449" inkscape:cy="469.77917"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="svg2" inkscape:current-layer="svg2"
showguides="true" showguides="true"
@@ -1294,6 +1294,16 @@
y1="1004.7048" y1="1004.7048"
x2="1694.8438" x2="1694.8438"
y2="1004.7048" /> y2="1004.7048" />
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath6854">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 598.46289,22.904297 c -87.59389,0 -146.16779,16.456372 -202.69531,31.953125 C 339.24006,70.354175 284.48457,85.03125 195.75586,85.03125 l -155.929688,0 0,-170 155.929688,0 c 94.38338,0 156.45082,-16.38672 213.23242,-31.95313 56.7816,-15.5664 108.6213,-40.17355 189.47461,-30.17382 l 161.71094,0 0,169.999997 z"
id="path6856"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssccsssccs" />
</clipPath>
</defs> </defs>
<metadata <metadata
id="metadata7"> id="metadata7">
@@ -1307,6 +1317,13 @@
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<path
inkscape:connector-curvature="0"
id="path6827"
d="m 760.1733,90.03158 -161.71091,0 c -169.06322,0 -219.59381,-42.12632 -402.7059,-42.12632 l -155.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc"
clip-path="url(#clipPath6854)" />
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer2" id="layer2"
@@ -1332,43 +1349,37 @@
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path5053" id="path5053"
d="m 760.1733,587.90526 -241.71091,0 -242.7059,62.12632 -235.92979,0" d="m 760.1733,587.90526 -161.71091,0 c -169.06322,0 -219.59381,62.12632 -402.7059,62.12632 l -155.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path6814"
d="m 39.8267,49.96842 244.95944,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,487.90526 -241.71091,0 -242.7059,62.12632 -235.92979,0" d="m 760.1733,487.90526 -161.71091,0 c -169.06322,0 -219.59381,62.12632 -402.7059,62.12632 l -155.92979,0"
id="path6816" id="path6763"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path6818" id="path6819"
d="m 760.1733,387.90526 -241.71091,0 -242.7059,62.12632 -235.92979,0" d="m 760.1733,387.90526 -161.71091,0 c -169.06322,0 -219.59381,62.12632 -402.7059,62.12632 l -155.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,287.90526 -241.71091,0 -242.7059,62.12632 -235.92979,0" d="m 760.1733,287.90526 -161.71091,0 c -169.06322,0 -219.59381,62.12632 -402.7059,62.12632 l -155.92979,0"
id="path6820" id="path6821"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path6822" id="path6823"
d="m 760.1733,187.90526 -241.71091,0 -242.7059,62.12632 -235.92979,0" d="m 760.1733,187.90526 -161.71091,0 c -169.06322,0 -219.59381,62.12632 -402.7059,62.12632 l -155.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,87.90526 -241.71091,0 -242.7059,62.12632 -235.92979,0" d="m 760.1733,87.90526 -161.71091,0 c -169.06322,0 -219.59381,62.12632 -402.7059,62.12632 l -155.92979,0"
id="path6824" id="path6825"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

@@ -27,9 +27,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="0.10040176" inkscape:zoom="0.28397906"
inkscape:cx="2047.3204" inkscape:cx="432.87769"
inkscape:cy="-1169.7659" inkscape:cy="408.60409"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="svg2" inkscape:current-layer="svg2"
showguides="true" showguides="true"
@@ -1303,7 +1303,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -1329,38 +1329,34 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(464.16179,164.03236)" /> transform="translate(464.16179,164.03236)" />
<g
id="g5087"
transform="translate(0,-8.03158)">
<path <path
sodipodi:nodetypes="cccc" inkscape:connector-curvature="0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,226.93684 -241.71091,0 -242.7059,140.12632 -235.92979,0"
id="path5053" id="path5053"
inkscape:connector-curvature="0" /> d="m 760.1733,218.90526 -121.71091,0 c -221.87529,0 -362.5136,140.12632 -482.7059,140.12632 l -115.92979,0"
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path5055"
d="m 760.1733,152.93684 -241.71091,0 -242.7059,60.12632 -235.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path5059"
d="m 39.8267,69 720.3466,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path5083"
d="m 760.1733,306.93684 -241.71091,0 -242.7059,200.12632 -235.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,144.90526 -121.71091,0 c -228.89012,0 -324.24351,60.12632 -482.7059,60.12632 l -115.92979,0"
id="path5055"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:"
d="m 39.8267,60.96842 720.3466,0"
id="path5059"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 760.1733,386.93684 -241.71091,0 -242.7059,260.12632 -235.92979,0" d="m 760.1733,298.90526 -121.71091,0 C 384.76259,309.46942 275.5354,499.03158 155.75649,499.03158 l -115.92979,0"
id="path5085" id="path5083"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</g> <path
inkscape:connector-curvature="0"
id="path5085"
d="m 760.1733,378.90526 -121.71091,0 c -179.59071,0 -309.85922,260.12632 -482.7059,260.12632 l -115.92979,0"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cccc" />
</svg> </svg>

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

@@ -1337,7 +1337,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -1369,7 +1369,7 @@
d="m 95.191608,588.78944 0,-496.118075" d="m 95.191608,588.78944 0,-496.118075"
style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:30;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4687)" /> style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:30;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4687)" />
<path <path
style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="opacity:0.6;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 677.80647,409.58595 294.45396,576.85181 C 275.08633,562.76627 218.74415,483.77438 194.09445,307.70506 169.44474,131.63574 192.33375,55.925935 224.02623,45.361775 255.71871,34.797617 344.76208,95.207855 403.61694,150.76405 Z" d="M 677.80647,409.58595 294.45396,576.85181 C 275.08633,562.76627 218.74415,483.77438 194.09445,307.70506 169.44474,131.63574 192.33375,55.925935 224.02623,45.361775 255.71871,34.797617 344.76208,95.207855 403.61694,150.76405 Z"
id="path4370" id="path4370"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB