Merge branch 'staged' into dev

This commit is contained in:
YiFang Xiao 2023-09-05 00:08:41 +08:00
commit 0c549ca3a1
12 changed files with 348 additions and 107 deletions

View file

@ -227,6 +227,7 @@ jobs:
AppImage: Ubuntu-20.04
macOS: macOS-12 and macOS-13
Windows: Visual studio 2019
based on: ${{github.ref}}

View file

@ -242,6 +242,7 @@ jobs:
AppImage: Ubuntu-20.04
macOS: macOS-12 and macOS-13
Windows: Visual studio 2019
based on: ${{github.ref}}

View file

@ -202,6 +202,7 @@ jobs:
AppImage: Ubuntu-20.04
macOS: macOS-12 and macOS-13
Windows: Visual studio 2019
based on: ${{github.ref}}
#### Changes

View file

@ -189,6 +189,7 @@ jobs:
AppImage: Ubuntu-20.04
macOS: macOS-12 and macOS-13
Windows: Visual studio 2019
based on: ${{github.ref}}
#### Changes

View file

@ -261,7 +261,7 @@ jobs:
AppImage: Ubuntu-20.04
macOS: macOS-12 and macOS-13
Windows: Visual studio 2019
based on: ${{github.ref}}
#### Changes

View file

@ -238,6 +238,7 @@ jobs:
AppImage: Ubuntu-20.04
macOS: macOS-12 and macOS-13
Windows: Visual studio 2019
based on: ${{github.ref}}

View file

@ -10,7 +10,6 @@
sodipodi:docname="programdict.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
@ -18,18 +17,91 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
id="defs3"><linearGradient
id="linearGradient12512"><stop
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective58" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient6719"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
inkscape:collect="always"
id="linearGradient5060">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop5062" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5064" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient6717"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
id="linearGradient5048">
<stop
style="stop-color:black;stop-opacity:0;"
offset="0"
id="stop5050" />
<stop
id="stop5056"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5052" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5048"
id="linearGradient6715"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
x1="302.85715"
y1="366.64789"
x2="302.85715"
y2="609.50507" />
<linearGradient
id="linearGradient12512">
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop12513" /><stop
id="stop12513" />
<stop
style="stop-color:#fff520;stop-opacity:0.89108908;"
offset="0.50000000"
id="stop12517" /><stop
id="stop12517" />
<stop
style="stop-color:#fff300;stop-opacity:0.0000000;"
offset="1.0000000"
id="stop12514" /></linearGradient><radialGradient
id="stop12514" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient12512"
id="radialGradient278"
@ -38,44 +110,65 @@
cy="125.00000"
fx="55.000000"
fy="125.00000"
r="14.375000" /><linearGradient
r="14.375000" />
<linearGradient
inkscape:collect="always"
id="linearGradient21644"><stop
id="linearGradient21644">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop21646" /><stop
id="stop21646" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop21648" /></linearGradient><linearGradient
id="stop21648" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2116"><stop
id="linearGradient2116">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2118" /><stop
id="stop2118" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2120" /></linearGradient><linearGradient
id="linearGradient2094"><stop
style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop2096" /><stop
id="stop2120" />
</linearGradient>
<linearGradient
id="linearGradient2094">
<stop
style="stop-color:#c771ca;stop-opacity:1;"
offset="0"
id="stop2096" />
<stop
style="stop-color:#95b1cf;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2098" /></linearGradient><linearGradient
id="linearGradient2803"><stop
id="stop2098" />
</linearGradient>
<linearGradient
id="linearGradient2803">
<stop
id="stop2805"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" /><stop
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop2807"
offset="1.0000000"
style="stop-color:#cbcbcb;stop-opacity:1.0000000;" /></linearGradient><linearGradient
id="linearGradient2795"><stop
style="stop-color:#cbcbcb;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient2795">
<stop
id="stop2797"
offset="0.0000000"
style="stop-color:#000000;stop-opacity:0.068627454;" /><stop
style="stop-color:#000000;stop-opacity:0.068627454;" />
<stop
id="stop2799"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" /></linearGradient><linearGradient
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="4.9530048"
x2="41.219128"
@ -84,7 +177,8 @@
gradientTransform="matrix(0.254000,0.000000,1.822151e-16,3.759813,0.788629,0.148567)"
id="linearGradient2801"
xlink:href="#linearGradient2795"
inkscape:collect="always" /><linearGradient
inkscape:collect="always" />
<linearGradient
gradientUnits="userSpaceOnUse"
y2="84.287079"
x2="10.219901"
@ -93,16 +187,18 @@
gradientTransform="matrix(2.262742,0.000000,0.000000,0.441942,1.000000,-0.875000)"
id="linearGradient2813"
xlink:href="#linearGradient2803"
inkscape:collect="always" /><linearGradient
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2094"
id="linearGradient2100"
gradientTransform="matrix(0.957750,0.000000,0.000000,1.027989,1.000000,-0.571911)"
x1="6.5871811"
y1="22.132999"
x2="14.511404"
y2="22.132999"
gradientUnits="userSpaceOnUse" /><linearGradient
x1="22.276054"
y1="19.897472"
x2="41.274776"
y2="26.604053"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2116"
id="linearGradient2112"
@ -111,7 +207,8 @@
y1="26.652197"
x2="-2.7582901"
y2="21.270376"
gradientUnits="userSpaceOnUse" /><radialGradient
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient21644"
id="radialGradient21650"
@ -121,23 +218,8 @@
fy="36.75"
r="15.75"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.595238,-6.245005e-16,14.87500)"
gradientUnits="userSpaceOnUse" /><linearGradient
id="linearGradient3264"><stop
id="stop3266"
offset="0"
style="stop-color:#c9c9c9;stop-opacity:1;" /><stop
style="stop-color:#f8f8f8;stop-opacity:1;"
offset="0.25"
id="stop3276" /><stop
style="stop-color:#e2e2e2;stop-opacity:1;"
offset="0.5"
id="stop3272" /><stop
id="stop3274"
offset="0.75"
style="stop-color:#b0b0b0;stop-opacity:1;" /><stop
id="stop3268"
offset="1"
style="stop-color:#c9c9c9;stop-opacity:1;" /></linearGradient><radialGradient
gradientUnits="userSpaceOnUse" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.315315,0,26.81305)"
r="19.622213"
@ -146,7 +228,8 @@
cy="39.161163"
cx="25.455845"
id="radialGradient3262"
xlink:href="#linearGradient21644" /><linearGradient
xlink:href="#linearGradient5060" />
<linearGradient
gradientTransform="matrix(1.241935,0,0,1.241935,-5.027508,-7.208988)"
y2="39.684914"
x2="34.534348"
@ -154,16 +237,41 @@
x1="14.462892"
gradientUnits="userSpaceOnUse"
id="linearGradient3281"
xlink:href="#linearGradient3264" /></defs><sodipodi:namedview
xlink:href="#linearGradient3264" />
<linearGradient
id="linearGradient3264">
<stop
id="stop3266"
offset="0"
style="stop-color:#c9c9c9;stop-opacity:1;" />
<stop
style="stop-color:#f8f8f8;stop-opacity:1;"
offset="0.25"
id="stop3276" />
<stop
style="stop-color:#e2e2e2;stop-opacity:1;"
offset="0.5"
id="stop3272" />
<stop
id="stop3274"
offset="0.75"
style="stop-color:#b0b0b0;stop-opacity:1;" />
<stop
id="stop3268"
offset="1"
style="stop-color:#c9c9c9;stop-opacity:1;" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="0.27843137"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6568542"
inkscape:cx="20.948039"
inkscape:cy="24.483573"
inkscape:zoom="0.70710678"
inkscape:cx="-48.083261"
inkscape:cy="103.9447"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
@ -175,67 +283,150 @@
fill="#ef2929"
stroke="#cc0000"
inkscape:showpageshadow="false"
inkscape:window-maximized="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1" /><metadata
id="metadata4"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:date /><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>address</rdf:li><rdf:li>contact</rdf:li><rdf:li>book</rdf:li><rdf:li>office</rdf:li></rdf:Bag></dc:subject><cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/2.0/"><cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
rdf:resource="http://web.resource.org/cc/Notice" /><cc:requires
rdf:resource="http://web.resource.org/cc/Attribution" /><cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" /></cc:License></rdf:RDF></metadata><g
inkscape:deskcolor="#d1d1d1"
inkscape:window-maximized="1" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:date />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source>http://jimmac.musichall.cz</dc:source>
<dc:subject>
<rdf:Bag>
<rdf:li>address</rdf:li>
<rdf:li>contact</rdf:li>
<rdf:li>book</rdf:li>
<rdf:li>office</rdf:li>
</rdf:Bag>
</dc:subject>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"><path
sodipodi:type="arc"
style="opacity:1;color:#000000;fill:url(#radialGradient21650);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="path21642"
sodipodi:cx="25.125"
sodipodi:cy="36.75"
sodipodi:rx="15.75"
sodipodi:ry="9.375"
d="M 40.875 36.75 A 15.75 9.375 0 1 1 9.375,36.75 A 15.75 9.375 0 1 1 40.875 36.75 z"
transform="matrix(1.150794,0.000000,0.000000,1.000000,-4.913690,0.625000)" /><path
inkscape:groupmode="layer">
<path
style="opacity:1;color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 33.096456,4.6520202 L 40.521077,4.6520202 C 41.228184,4.6520202 41.758513,4.8287969 41.93529,5.71268 L 42.819174,12.606972 C 42.907562,13.667632 42.443523,14.021185 41.493349,14.021185 L 32.919679,14.021185 L 33.096456,4.6520202 z "
id="path21630"
sodipodi:nodetypes="ccccccc" />
<path
sodipodi:nodetypes="ccccccc"
id="path21632"
d="M 34.10295,5.638875 L 40.463507,5.638875 C 40.771656,5.638875 40.940266,5.669037 40.986054,5.960473 L 41.777489,12.344449 C 41.847258,12.775421 41.959897,13.019804 41.637211,13.034341 L 33.963412,13.034341 L 34.10295,5.638875 z "
style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="ccccccc"
id="path21634"
d="M 35.596456,12.40202 L 43.021077,12.40202 C 43.728184,12.40202 44.258513,12.578797 44.43529,13.46268 L 45.319174,20.356972 C 45.407562,21.417632 44.943523,21.771185 43.993349,21.771185 L 35.419679,21.771185 L 35.596456,12.40202 z "
style="opacity:1;color:#000000;fill:#9db029;fill-opacity:1;fill-rule:evenodd;stroke:#727e0a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 36.60295,13.388875 L 42.963507,13.388875 C 43.271656,13.388875 43.440266,13.419037 43.486054,13.710473 L 44.277489,20.094449 C 44.347258,20.525421 44.459897,20.769804 44.137211,20.784341 L 36.463412,20.784341 L 36.60295,13.388875 z "
id="path21636"
sodipodi:nodetypes="ccccccc" />
<path
style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#cc0000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 36.06451,20.776498 L 44.50992,20.776498 C 45.314245,20.776498 45.917487,20.995896 46.118569,22.092882 L 47.123975,30.649381 C 47.224515,31.965765 46.696677,32.40456 45.615866,32.40456 L 35.863428,32.40456 L 36.06451,20.776498 z "
id="path21638"
sodipodi:nodetypes="ccccccc" />
<path
sodipodi:nodetypes="ccccccc"
id="path21640"
d="M 37.209384,21.763574 L 44.444435,21.763574 C 44.79495,21.763574 44.986742,21.801928 45.038825,22.172513 L 45.939072,30.290267 C 46.018433,30.838284 46.146559,31.149038 45.779508,31.167522 L 37.050661,31.167522 L 37.209384,21.763574 z "
style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<g
style="display:inline"
transform="matrix(2.105461e-2,0,0,2.086758e-2,42.85172,40.44648)"
id="g6707">
<rect
style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="rect6709"
width="1339.6335"
height="478.35718"
x="-1559.2523"
y="-150.69685" />
<path
style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
id="path6711"
sodipodi:nodetypes="cccc" />
<path
sodipodi:nodetypes="cccc"
id="path6713"
d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
</g>
<path
style="color:#000000;fill:#5b6b94;fill-opacity:1;fill-rule:nonzero;stroke:#364878;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 6.3643222,5.5185897 C 6.4551049,3.6036003 7.3719758,2.5542814 9.0788784,2.549044 L 38.405776,2.4590577 C 38.652361,2.4583011 38.974317,2.6592071 38.999012,2.9089888 L 42.257491,35.867228 L 40.942189,35.923862 L 41.571429,42.369516 C 41.632441,42.994499 41.390059,43.52882 40.5,43.533035 L 9.7893046,43.678474 C 7.25676,43.690468 4.6538454,41.59976 4.7759337,39.024403 L 6.3643222,5.5185897 z "
id="rect1408"
sodipodi:nodetypes="csssccsssss" /><path
sodipodi:nodetypes="csssccsssss" />
<path
id="path2489"
d="M 40.125,34.875 L 10.9375,35 C 9.3809819,35.177868 8.125,36.39612 8.125,38 C 8.125,39.60388 9.3809819,40.822132 10.9375,41 L 40.125,41.125 L 40.125,41.0625 C 38.469378,40.984348 37.125,39.674851 37.125,38 C 37.125,36.325149 38.469378,35.015652 40.125,34.9375 L 40.125,34.875 z "
style="color:#000000;fill:url(#linearGradient2813);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
style="color:#000000;fill:url(#linearGradient2813);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<path
sodipodi:nodetypes="ccccccssc"
id="path2784"
d="M 9.6875,2.8125 C 7.9805897,2.8125 7.050103,3.8215062 6.96875,5.6738658 L 5.3125,37.825772 C 5.22054,40.904199 7.1393732,42.654485 9.125,43.15625 C 4.875,41.525579 5.4375,34.164455 10.75,34.195222 L 41.648286,34.195222 L 38.335786,3.2432432 C 38.310025,3.0025304 37.987878,2.8125 37.742036,2.8125 L 9.6875,2.8125 z "
style="color:#000000;fill:url(#linearGradient2100);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><rect
style="color:#000000;fill:url(#linearGradient2100);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
<rect
y="3.968539"
x="9.7886267"
height="29.604792"
width="2"
id="rect2793"
style="opacity:0.48044691;color:#000000;fill:url(#linearGradient2801);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.60818715;visibility:visible;display:inline;overflow:visible"
transform="matrix(1.000000,0.000000,-3.582731e-2,0.999358,0.000000,0.000000)" /><path
transform="matrix(1.000000,0.000000,-3.582731e-2,0.999358,0.000000,0.000000)" />
<path
style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2112);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
d="M 9.8751008,3.3336831 C 8.1912014,3.3336831 7.5384236,4.0658459 7.4581673,5.887831 L 6.1592633,35.777198 C 7.0925916,34.170451 8.5988591,33.594437 11.011665,33.594437 L 40.963081,33.594437 L 38.137179,3.7573631 C 38.114727,3.5203092 37.793961,3.3336831 37.551434,3.3336831 L 9.8751008,3.3336831 z "
id="path2104"
sodipodi:nodetypes="cccscssc" /><g
sodipodi:nodetypes="cccscssc" />
<g
id="layer1-6"
transform="matrix(0.53009019,0,0,0.4975302,20.296504,20.285242)"><path
transform="matrix(0.50257673,0,0,0.49016701,12.571112,6.8493735)">
<path
transform="translate(-0.883885,2.474874)"
d="m 45.078058,39.161163 a 19.622213,6.187185 0 1 1 -39.2444265,0 19.622213,6.187185 0 1 1 39.2444265,0 z"
d="m 45.078058,39.161163 a 19.622213,6.1871851 0 1 1 -39.2444265,0 19.622213,6.1871851 0 1 1 39.2444265,0 z"
id="path3254"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.409091;fill:url(#radialGradient3262);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.409091;fill:url(#radialGradient3262);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
<path
id="path3243"
d="M 23.25,0.46875 C 22.784561,0.50059628 22.332166,0.57268469 21.875,0.625 H 21.84375 L 20.75,6.59375 C 18.967275,6.9997399 17.290091,7.6887415 15.78125,8.625 L 10.875,5.09375 C 9.5487118,6.1234406 8.3418016,7.3243453 7.28125,8.625 l 3.40625,4.96875 c -1.0342329,1.580515 -1.8119683,3.385224 -2.25,5.28125 -7.5e-5,0.009 -6.09e-5,0.02969 0,0.03125 L 2.5,19.84375 c -0.1085533,0.886633 -0.15625,1.802939 -0.15625,2.71875 10e-8,0.7493 0.020689,1.488589 0.09375,2.21875 l 5.9375,1.0625 c 0.422279,2.061892 1.2244587,3.987512 2.34375,5.6875 L 7.1875,36.375 c 1.0113261,1.255518 2.1788917,2.398616 3.4375,3.40625 l 5,-3.4375 c 1.747433,1.114717 3.698083,1.896374 5.8125,2.28125 l 0.9375,5.90625 c 0.666183,0.06064 1.349349,0.0625 2.03125,0.0625 0.962685,-10e-7 1.882237,-0.03648 2.8125,-0.15625 l 1.125,-6.03125 C 30.351311,37.906649 32.237219,37.03996 33.875,35.875 l 4.8125,3.5 c 1.248028,-1.061797 2.389277,-2.282256 3.375,-3.59375 l -3.5,-5.0625 c 0.947853,-1.63699 1.604629,-3.443141 1.9375,-5.375 l 5.90625,-0.9375 c 0.05179,-0.616346 0.0625,-1.214087 0.0625,-1.84375 0,-1.094214 -0.127182,-2.167084 -0.28125,-3.21875 l -6,-1.09375 C 39.717306,16.513776 38.945824,14.893898 37.96875,13.4375 L 41.5,8.59375 C 40.405427,7.2551429 39.156822,6.0185688 37.78125,4.96875 l -5.09375,3.5 C 31.223504,7.6029126 29.648037,6.9385679 27.9375,6.5625 L 27,0.625 C 26.146701,0.52462461 25.286379,0.46875 24.40625,0.46875 c -0.237872,10e-9 -0.482684,-0.007485 -0.71875,0 -0.115083,0.003649 -0.228966,-0.006695 -0.34375,0 -0.03109,0.001813 -0.06272,-0.002123 -0.09375,0 z m 0.8125,15.1875 c 0.114166,-0.0058 0.228152,0 0.34375,0 3.699127,0 6.71875,3.019624 6.71875,6.71875 1e-6,3.699126 -3.019624,6.6875 -6.71875,6.6875 -3.699125,1e-6 -6.6875,-2.988374 -6.6875,-6.6875 1e-6,-3.583527 2.8046,-6.539158 6.34375,-6.71875 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3281);fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3281);fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
<path
transform="matrix(0.606518,0,0,0.606518,10.15021,7.936835)"
d="m 36.239223,23.781593 a 12.727922,12.727922 0 1 1 -25.455844,0 12.727922,12.727922 0 1 1 25.455844,0 z"
id="path3283"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.647727;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.64876;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.647727;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.64876;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.346591;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
d="M 22.557788,1.6501132 21.679599,7.4291233 C 20.008601,7.8096689 16.934874,8.9735344 15.520595,9.8511162 L 10.848562,6.3639293 C 9.6053938,7.3290873 9.5201391,7.3945394 8.5260544,8.6136804 l 3.3780526,5.0099536 c -0.969415,1.481461 -2.1338039,4.121495 -2.5518734,6.008088 0,0 -5.9194088,0.997841 -5.9194088,0.997841 -0.1017499,0.831066 -0.05285,2.609798 0.015632,3.294198 l 5.6542436,1.018588 c 0.395814,1.932669 1.8770306,5.043588 2.9261736,6.637034 l -3.575576,4.724044 c 0.9479445,1.176832 1.1376642,1.284521 2.317393,2.229005 l 4.781168,-3.50282 c 1.637918,1.044855 4.889033,2.315886 6.870935,2.676641 l 0.784687,5.706254 c 0.624432,0.05684 2.349481,0.216281 3.221443,0.10402 l 0.878188,-5.940154 c 1.881743,-0.468289 5.13316,-1.80296 6.668298,-2.89491 l 4.776055,3.450808 c 1.169811,-0.995251 1.180292,-1.145216 2.104238,-2.374516 l -3.539198,-5.030701 c 0.888449,-1.534398 2.037228,-4.535223 2.349237,-6.346009 l 5.794642,-0.961463 c 0.04855,-0.577719 0.05091,-2.188789 -0.0935,-3.174545 L 39.463105,19.226449 C 39.022378,17.599038 37.509894,14.666467 36.594056,13.301345 L 40.346408,8.5773019 C 39.320436,7.3225876 38.938964,7.150431 37.649602,6.1664065 L 32.707289,9.7056032 C 31.335043,8.8940304 28.598675,7.6568558 26.995341,7.3043568 L 26.122266,1.6501132 c -0.799821,-0.094085 -3.107395,-0.052306 -3.564478,0 z"
id="path3285" /></g></g></svg>
id="path3285" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View file

@ -3326,7 +3326,7 @@ Wenn diese Option deaktiviert ist, dann wird das zuoberst erscheinende Wörterbu
</message>
<message>
<source>Definition field...</source>
<translation>Definitionsfeld...</translation>
<translation>Definitions Feld...</translation>
</message>
<message>
<source>Sentence</source>
@ -3334,7 +3334,7 @@ Wenn diese Option deaktiviert ist, dann wird das zuoberst erscheinende Wörterbu
</message>
<message>
<source>Sentence field (can be empty)...</source>
<translation>Satzfeld (kann leer sein)...</translation>
<translation>Satz Feld (kann auch leer bleiben)...</translation>
</message>
<message>
<source>Some sites detect GoldenDict via HTTP headers and block the requests.
@ -3393,15 +3393,15 @@ clears its network cache from disk during exit.</source>
</message>
<message>
<source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
<translation>Wenn bei aufeinanderfolgenden Suchvorgängen ein Wörterbuch manuell reduziert wird, bleibt es auch bei der nächsten Suche reduziert</translation>
<translation>Wenn ein Wörterbuch bei aufeinanderfolgenden Suchvorgängen manuell eingeklappt wird, bleibt es auch bei der nächsten Suche eingeklappt.</translation>
</message>
<message>
<source>Session collapse</source>
<translation>Zusammenbruch der Sitzung</translation>
<translation>Suchvorgang einklappen</translation>
</message>
<message>
<source>On a new search, focus the main or popup window even if it&apos;s visible</source>
<translation>Fokussieren Sie bei einer neuen Suche das Haupt- oder Popup-Fenster, auch wenn es&apos;sichtbar ist</translation>
<translation>Bei neuer Suche immer den Fokus auf Haupt- oder PopUp-Fenster setzen, unabhängig ob schon gesetzt ist</translation>
</message>
<message>
<source>Favorites</source>
@ -3729,7 +3729,7 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
</message>
<message>
<source>A dictionary lookup program.</source>
<translation>Ein Wörterbuch-Suchprogramm.</translation>
<translation>Ein Wörterbuch-Nachschlag-Programm.</translation>
</message>
<message>
<source>Word or sentence to query.</source>
@ -3737,7 +3737,7 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
</message>
<message>
<source>Save debug messages to gd_log.txt in the config folder.</source>
<translation>Speichern Sie Debug-Meldungen in gd_log.txt im Konfigurationsordner.</translation>
<translation>Speichere Debug Meldungen zu &quot;gd_log.txt&quot;, innerhalb des Config Ordners.</translation>
</message>
<message>
<source>Reset window state.</source>
@ -3749,15 +3749,15 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
</message>
<message>
<source>Change the group of main window.</source>
<translation>Ändern Sie die Gruppe des Hauptfensters.</translation>
<translation>Wechsle Gruppen im Hauptfenster.</translation>
</message>
<message>
<source>Change the group of popup.</source>
<translation>Ändern Sie die Popup-Gruppe.</translation>
<translation>Wechsle Gruppen im Popup.</translation>
</message>
<message>
<source>Toggle scan popup.</source>
<translation>Scan-Popup umschalten.</translation>
<translation>Wechsle Scan Popup.</translation>
</message>
<message>
<source>Print version and diagnosis info.</source>
@ -3873,7 +3873,7 @@ es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translat
<name>SearchPanel</name>
<message>
<source>&amp;Previous</source>
<translation>&amp;Vorherige</translation>
<translation>&amp;Vorheriger</translation>
</message>
<message>
<source>Ctrl+Shift+G</source>
@ -3881,7 +3881,7 @@ es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translat
</message>
<message>
<source>&amp;Next</source>
<translation>&amp;Nächste</translation>
<translation>&amp;Nächster</translation>
</message>
<message>
<source>Ctrl+G</source>
@ -3897,7 +3897,7 @@ es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translat
</message>
<message>
<source>Find:</source>
<translation>Finden:</translation>
<translation>Suche:</translation>
</message>
</context>
<context>
@ -3977,7 +3977,7 @@ Standardisiert als ISO 3602.
</message>
<message>
<source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
<translation>Alle externen Programme. Eine Zeichenfolge %GDWORD% wird durch das Abfragewort ersetzt. In der Suchleiste wird die Zeichenfolge %GDSEARCH% durch den Text ersetzt. Wenn beide Parameter nicht angegeben werden, wird das Stichwort in die Standardeingabe eingegeben.</translation>
<translation>Für externe Programme. Der String %GDWORD% wird mit dem Suchwort ersetzt. Falls eine solche Zeichenkette nicht vorhanden ist, wird das Wort an die Standardeingabe geschickt..</translation>
</message>
<message>
<source>Lingua Libre</source>
@ -4001,7 +4001,7 @@ Standardisiert als ISO 3602.
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Holen Sie sich Ihren eigenen Schlüssel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;hier&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bekomme deinen eigenen Schlüssel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;unter&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>The most widely used method of transcription of Japanese,

View file

@ -604,6 +604,27 @@ div.xdxf {
display: inline;
}
.epwing_article h3 {
color: #0f2fa0;
}
.epwing_text b {
color: #0089a2;
}
.epwing_text i {
color: #ae4500;
}
.epwing_text a {
text-decoration: none;
cursor: pointer;
color: #859aad;
}
.epwing_text {
line-height: 1.5em;
}
/************* Websites *****************/
.website_padding {

View file

@ -379,6 +379,8 @@ void ArticleView::showDefinition( QString const & word,
if ( currentWord.isEmpty() )
return;
historyMode = false;
//clear founded dicts.
currentActiveDictIds.clear();
// first, let's stop the player
audioPlayer->stop();
@ -2205,7 +2207,11 @@ void ArticleView::highlightFTSResults()
void ArticleView::setActiveDictIds( const ActiveDictIds & ad )
{
if ( ( ad.word == currentWord && ad.groupId == getCurrentGroup() ) || historyMode ) {
auto groupId = ad.groupId;
if ( groupId == 0 ) {
groupId = Instances::Group::AllGroupId;
}
if ( ( ad.word == currentWord && groupId == getCurrentGroup() ) || historyMode ) {
// ignore all other signals.
qDebug() << "receive dicts, current word:" << currentWord << ad.word << ":" << ad.dictIds;
currentActiveDictIds << ad.dictIds;
@ -2216,8 +2222,12 @@ void ArticleView::setActiveDictIds( const ActiveDictIds & ad )
void ArticleView::dictionaryClear( const ActiveDictIds & ad )
{
auto groupId = ad.groupId;
if ( groupId == 0 ) {
groupId = Instances::Group::AllGroupId;
}
// ignore all other signals.
if ( ad.word == currentWord && ad.groupId == getCurrentGroup() ) {
if ( ad.word == currentWord && groupId == getCurrentGroup() ) {
qDebug() << "clear current dictionaries:" << currentWord;
currentActiveDictIds.clear();
}

View file

@ -123,6 +123,7 @@ void DictHeadwords::setup( Dictionary::Class * dict_ )
QApplication::setOverrideCursor( Qt::WaitCursor );
dict = dict_;
sortedWords.clear();
setWindowTitle( QString::fromUtf8( dict->getName().c_str() ) );

View file

@ -1700,6 +1700,19 @@ download page.</string>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>