hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-23 20:14:05 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

high dpi:remove coresponding png files with same name with svg

Browse source 
close https://github.com/goldendict/goldendict/issues/1441
This commit is contained in:
yifang 2022-01-27 08:23:57 +08:00
parent 2c8848ffaf
commit d38daedc99
No known key found for this signature in database
GPG key ID: 8765B97BD0EC1AC4
33 changed files with 73 additions and 308 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
articleview.cc
View file

@ -1276,8 +1276,8 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref,
catch( std::exception & e )
{
emit statusBarMessage(
tr( "ERROR: %1" ).arg( e.what() ),
10000, QPixmap( ":/icons/error.png" ) );
tr("ERROR: %1").arg(e.what()),
10000, QPixmap(":/icons/error.svg"));
}
}
for( unsigned x = 0; x < activeDicts->size(); ++x )
@ -1312,8 +1312,8 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref,
catch( std::exception & e )
{
emit statusBarMessage(
tr( "ERROR: %1" ).arg( e.what() ),
10000, QPixmap( ":/icons/error.png" ) );
tr("ERROR: %1").arg(e.what()),
10000, QPixmap(":/icons/error.svg"));
}
}
}
@ -1546,8 +1546,8 @@ ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QUrl
if ( handler->isEmpty() ) // No requests were queued
{
emit statusBarMessage(
tr( "ERROR: %1" ).arg( tr( "The referenced resource doesn't exist." ) ),
10000, QPixmap( ":/icons/error.png" ) );
tr("ERROR: %1").arg(tr("The referenced resource doesn't exist.")),
10000, QPixmap(":/icons/error.svg"));
}
// Check already finished downloads
@ -2075,15 +2075,15 @@ void ArticleView::resourceDownloadFinished()
if ( resourceDownloadRequests.empty() )
{
emit statusBarMessage(
tr( "WARNING: %1" ).arg( tr( "The referenced resource failed to download." ) ),
10000, QPixmap( ":/icons/error.png" ) );
tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
10000, QPixmap(":/icons/error.svg"));
}
}
void ArticleView::audioPlayerError( QString const & message )
{
emit statusBarMessage( tr( "WARNING: Audio Player: %1" ).arg( message ),
10000, QPixmap( ":/icons/error.png" ) );
emit statusBarMessage(tr("WARNING: Audio Player: %1").arg(message),
10000, QPixmap(":/icons/error.svg"));
}
void ArticleView::pasteTriggered()
@ -2807,8 +2807,8 @@ void ResourceToSaveHandler::downloadFinished()
if ( file.error() )
{
emit statusBarMessage(
tr( "ERROR: %1" ).arg( tr( "Resource saving error: " ) + file.errorString() ),
10000, QPixmap( ":/icons/error.png" ) );
tr("ERROR: %1").arg(tr("Resource saving error: ") + file.errorString()),
10000, QPixmap(":/icons/error.svg"));
}
}
alreadyDone = true;
@ -2833,8 +2833,8 @@ void ResourceToSaveHandler::downloadFinished()
if( !alreadyDone )
{
emit statusBarMessage(
tr( "WARNING: %1" ).arg( tr( "The referenced resource failed to download." ) ),
10000, QPixmap( ":/icons/error.png" ) );
tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
10000, QPixmap(":/icons/error.svg"));
}
emit done();
deleteLater();

BIN
icons/1downarrow.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
icons/addtab.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
icons/book.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
icons/bookcase.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
icons/closetab.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
icons/configure.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
icons/fileopen.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
icons/filesave.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
icons/home.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
icons/hotkeys.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
icons/icon32_zoombase.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/icon32_zoomin.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4 KiB

BIN
icons/icon32_zoomout.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
icons/interface.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
icons/internet.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
icons/network.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
icons/next.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/playsound_color.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.7 KiB

BIN
icons/previous.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
icons/print.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 331 B

BIN
icons/programs.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
icons/pushpin.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 673 B

96
icons/readme.txt
View file

@ -1,52 +1,54 @@
some icons taken from
https://github.com/elementary/icons GPLv3
issue: https://github.com/goldendict/goldendict/issues/1441
lists:
network.png
star.png
star_blue.png
some icons taken from
https://github.com/zayronxio/Zafiro-icons GPLv3
lists:
error.png
https://github.com/yeyushengfan258/Win11-icon-theme GPLv3
lists:
clear.png
qt resources example
http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
list:
icons/print.png
icons/programs.png
http://tango.freedesktop.org/Tango_Desktop_Project
list:
internet.png
home.png
configure.png
system-search.png
fileopen.png
addtab.png
wizard.png
internet.svg
home.svg
configure.svg
system-search.svg
fileopen.svg
addtab.svg
wizard.svg
fulltext
text2speech
reload
icons/print.svg
icons/programs.svg
error
star.svg
star_blue.svg
network.svg
https://commons.wikimedia.org/wiki/GNOME_Desktop_icons GPLv3
lists:
windows-list.png
interface.png
closetab.png
icon32_sdict.png https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
folder.png
previous.png
next.png
reload.png
icon32_zoomin.png
icon32_zoomout.png
icon32_zoombase.png
hotkeys.png
filesave.png
playsound_color.png
windows-list.svg
interface.svg
closetab.svg
advanced
folder.svg
previous.svg
next.svg
reload.svg
icon32_zoomin.svg
icon32_zoomout.svg
icon32_zoombase.svg
hotkeys.svg
filesave.svg
playsound_color.svg
webdict
transliteration
clear.svg
https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
lists:
icon32_sdict.svg
https://freesvg.org/pushpin-vector-image public domain
lists:
pushbin
https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg license:public domain
lists:
1downarrow

210
icons/sound-dir.svg
View file

@ -1,210 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" enable-background="new">
<linearGradient id="c">
<stop offset="0" stop-color="#102134"/>
<stop offset="1" stop-color="#102134" stop-opacity="0"/>
</linearGradient>
<linearGradient id="b">
<stop offset="0" stop-color="#dbeef2"/>
<stop offset="1" stop-color="#dbeef2" stop-opacity="0"/>
</linearGradient>
<pattern id="t" patternTransform="translate(-2 -3) scale(.17732)" xlink:href="#a"/>
<pattern id="i" patternTransform="matrix(.06603 .24642 -.24642 .06603 -2 -3)" xlink:href="#a"/>
<linearGradient id="g" x1="10.5" x2="10.5" y1="964.362" y2="929.362" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#1a5187"/>
<stop offset="1" stop-color="#619de6"/>
</linearGradient>
<clipPath id="m">
<rect width="116" height="31.5" x="6" y="941.362" rx="4"/>
</clipPath>
<filter id="r" width="1.028" height="1.697" x="-.014" y="-.349" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".709"/>
</filter>
<filter id="j" color-interpolation-filters="sRGB">
<feBlend in="SourceGraphic" in2="BackgroundImage" mode="lighten"/>
</filter>
<linearGradient id="h" x1="10.5" x2="10.5" y1="984.362" y2="934.362" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#1a5187"/>
<stop offset="1" stop-color="#679ee0"/>
</linearGradient>
<linearGradient id="p" x1="77" x2="77" y1="921.362" y2="1049.362" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#aec7e7" stop-opacity="0"/>
<stop offset=".045" stop-color="#abc5e6" stop-opacity=".498"/>
<stop offset=".134" stop-color="#d6e3f3"/>
<stop offset=".929" stop-color="#80a7d9"/>
<stop offset="1" stop-color="#b5cce9"/>
</linearGradient>
<linearGradient id="w" x1="1" x2="1" y1="965.261" y2="950.017" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#34608f"/>
<stop offset="1" stop-color="#34608f" stop-opacity="0"/>
</linearGradient>
<linearGradient id="v" x1="122.012" x2="122.012" y1="963.51" y2="932.343" gradientUnits="userSpaceOnUse">
<stop offset="0"/>
<stop offset="1" stop-color="#34608f" stop-opacity="0"/>
</linearGradient>
<linearGradient id="q" x1="55" x2="55" y1="1036.413" y2="1032.482" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#003d7b"/>
<stop offset="1" stop-color="#003d7b" stop-opacity="0"/>
</linearGradient>
<radialGradient id="u" cx="45" cy="950.362" r="4" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
<filter id="s" width="1.083" height="3.514" x="-.042" y="-1.257">
<feGaussianBlur stdDeviation="2.095"/>
</filter>
<filter id="f" width="1.028" height="1.87" x="-.014" y="-.435">
<feGaussianBlur stdDeviation=".703"/>
</filter>
<linearGradient id="k" x1="83.801" x2="83.801" y2="21.125" gradientTransform="translate(-2 921.362)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff"/>
<stop offset="1" stop-color="#fff" stop-opacity="0"/>
</linearGradient>
<radialGradient id="x" cx="75.95" cy="28.881" r="57.906" fx="117.187" fy="39.988" gradientTransform="matrix(.99137 -.08203 .03048 .36833 -1.715 932.094)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff" stop-opacity=".6"/>
<stop offset="1" stop-color="#fff" stop-opacity="0"/>
</radialGradient>
<linearGradient id="o" x1="5.474" x2="8" y1="942.362" y2="932.934" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
<linearGradient id="l" x1="7.742" x2="10" y1="944.362" y2="935.934" gradientTransform="matrix(-1 0 0 1 126 4)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
<radialGradient id="z" cx="6.75" cy="936.112" r="2.075" fx="7.728" fy="935.547" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
<filter id="A">
<feGaussianBlur stdDeviation=".101"/>
</filter>
<radialGradient id="B" cx="4.75" cy="936.112" r="2.075" fx="5.728" fy="935.547" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
<linearGradient id="y" x1="77.839" x2="77.839" y1="933.146" y2="949.215" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
<filter id="n" width="1.129" height="1.268" x="-.065" y="-.134">
<feGaussianBlur stdDeviation="3.125"/>
</filter>
<linearGradient id="U" x1="123" x2="123" y1="1005.433" y2="1007.043" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#00438a"/>
<stop offset="1" stop-color="#00438a" stop-opacity="0"/>
</linearGradient>
<filter id="T" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".37"/>
</filter>
<filter id="Q" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".699"/>
</filter>
<filter id="O" width="1.147" height="1.278" x="-.073" y="-.139" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".732"/>
</filter>
<filter id="M" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".61"/>
</filter>
<filter id="K" width="1.245" height="1.355" x="-.123" y="-.178" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation="2.037"/>
</filter>
<radialGradient id="e" cx="23.784" cy="100" r="25.195" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#287f00"/>
<stop offset=".5" stop-color="#3cf000"/>
<stop offset="1" stop-color="#003a00"/>
</radialGradient>
<filter id="G" width="2.118" height="1.025" x="-.559" y="-.012" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".466"/>
</filter>
<filter id="D" width="1.123" height="1.321" x="-.061" y="-.16" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation=".179"/>
</filter>
<filter id="V">
<feGaussianBlur stdDeviation="1.46"/>
</filter>
<linearGradient id="d">
<stop offset="0"/>
<stop offset="1" stop-opacity="0"/>
</linearGradient>
<radialGradient id="C" cx="72.5" cy="103.75" r="3.5" gradientTransform="matrix(1 0 0 .35714 0 66.696)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
<linearGradient id="E" x1="40.117" x2="48.117" y1="49" y2="49" gradientTransform="matrix(.39947 0 0 .52023 34.12 58.704)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#2eb800"/>
<stop offset="1" stop-color="#003a00"/>
</linearGradient>
<linearGradient id="F" x1="44.143" x2="44.143" y1="3.493" y2="94.157" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#00a208"/>
<stop offset=".5" stop-color="#dfffa8"/>
<stop offset="1" stop-color="#8aff47" stop-opacity=".633"/>
</linearGradient>
<linearGradient id="H" x1="44.117" x2="44.117" y1="88.249" y2="83.653" gradientTransform="matrix(.35183 0 0 .42156 36.727 68.914)" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
<linearGradient id="W" x1=".117" x2="43.927" y1="101" y2="92.5" gradientTransform="matrix(.64333 0 0 .54322 37.044 32.23)" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
<linearGradient id="J" x1="3.989" x2="43.874" y1="100.013" y2="100.013" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#080"/>
<stop offset="1" stop-color="#0aa800" stop-opacity=".608"/>
</linearGradient>
<radialGradient id="L" cx="22.502" cy="91.357" r="14" fx="19.835" fy="86.024" gradientTransform="matrix(.68623 -.27888 .26073 .68336 -.067 33.863)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff"/>
<stop offset=".5" stop-color="#fff" stop-opacity=".709"/>
<stop offset="1" stop-color="#fff" stop-opacity="0"/>
</radialGradient>
<radialGradient id="N" cx="27.127" cy="113.894" r="11.99" gradientTransform="matrix(1 -.02649 .01396 .52712 18.168 52.583)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#c3ff6a"/>
<stop offset="1" stop-color="#a6ff88" stop-opacity="0"/>
</radialGradient>
<linearGradient id="P" x1="22.025" x2="21.786" y1="29.212" y2="7.973" gradientTransform="matrix(1 0 0 -1 39.758 128)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-opacity="0"/>
<stop offset="1" stop-color="#07631a"/>
</linearGradient>
<linearGradient id="R" x1="54.103" x2="32.584" y1="32.58" y2="31.296" gradientTransform="matrix(.555 0 0 .56689 32.346 54.645)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#008e00"/>
<stop offset=".229" stop-color="#008700"/>
<stop offset=".513" stop-color="#007800"/>
<stop offset=".823" stop-color="#005f00"/>
<stop offset="1" stop-color="#004d00"/>
</linearGradient>
<radialGradient id="S" cx="78.879" cy="28.174" r="16.493" gradientUnits="userSpaceOnUse">
<stop offset=".331" stop-color="#f0ff80"/>
<stop offset=".674" stop-color="#0f0" stop-opacity="0"/>
</radialGradient>
<linearGradient id="I" x1=".117" x2="43.927" y1="101" y2="92.5" gradientTransform="matrix(.64333 0 0 .54322 36.397 32.007)" gradientUnits="userSpaceOnUse" xlink:href="#e"/>
<linearGradient id="X" x1="100" x2="101.602" y1="1030.786" y2="1030.786" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#2f5d47"/>
<stop offset="1" stop-color="#2f5d47" stop-opacity="0"/>
</linearGradient>
<g transform="translate(0 -924.362)">
<path d="M5 1029.482h114c2.216 0 4 .865 4 1.94s-1.784 1.902-4 1.94c-36.945.633-74.703.778-114 0-2.216-.044-4-.865-4-1.94s1.784-1.94 4-1.94z" filter="url(#f)" opacity=".554"/>
<path fill="url(#g)" d="M7 932.362c-1.733 0-3 1.192-3 3v89.397a4.6 4.6 0 0 0 4.621 4.603h106.758a4.6 4.6 0 0 0 4.621-4.603v-81.794a4.6 4.6 0 0 0-4.621-4.603H39.035l-.035-3c-.018-1.551-1.4-3-3-3z"/>
<path fill="url(#h)" d="M7 932.362c-1.733 0-3 1.192-3 3v89.397a4.6 4.6 0 0 0 4.621 4.603h106.758a4.6 4.6 0 0 0 4.621-4.603v-81.794a4.6 4.6 0 0 0-4.621-4.603H39v-3c0-1.551-1.4-3-3-3z"/>
<path fill="url(#i)" d="M7 932.362c-1.733 0-3 1.192-3 3v89.397a4.6 4.6 0 0 0 4.621 4.603h106.758a4.6 4.6 0 0 0 4.621-4.603v-81.794a4.6 4.6 0 0 0-4.621-4.603H38.035l-.035-3c-.018-1.551-1.4-3-3-3z" filter="url(#j)" opacity=".183"/>
<path fill="url(#k)" d="M6.5 933.456c-1.226 0-2.406 1.114-2.406 2.406v88.876c0 1.955 2.565 3.53 4.531 3.53h106.75c1.966 0 3.507-1.575 3.531-3.53l1-81.282c.024-1.956-2.057-4-4.031-4H39.032c-.572-.005-1.09-.523-1.094-1.094l-.032-2c-.01-.904-.088-2.906-1.906-2.906zm0 .75H36c1.173 0 1.156.956 1.156 2.187l.032 2c.015.956.888 1.814 1.843 1.813h76.844c1.582 0 3.3 1.692 3.281 3.25l-1 81.281c-.019 1.558-1.214 2.781-2.781 2.781H7.625c-1.567 0-2.847-1.224-2.781-2.78v-88.876c0-.947.768-1.656 1.656-1.656z" opacity=".549"/>
<path fill="url(#l)" d="M116 938.362c1.662 0 4 2.338 4 4v25c0 1.662-1.338 3-3 3h-1c1.662 0 3-1.338 3-3v-25c0-1.662-2.338-4-4-4z" opacity=".486"/>
<path fill="#16375b" fill-opacity=".801" d="M45.035 954.603c0 2.54-2.06 4.584-4.621 4.584H5.9v47.175H122v-51.416c0-2.54-2.06-4.584-4.621-4.584h-67.88c-3.247 0-4.464 1.679-4.464 4.241z" clip-path="url(#m)" filter="url(#n)" transform="translate(-2 -3)"/>
<path fill="url(#o)" d="M7 932.362c-1.662 0-3 1.338-3 3v25c0 1.662 1.338 3 3 3h1c-1.662 0-3-1.338-3-3v-25c0-1.662 1.338-3 3-3z" opacity=".486"/>
<path fill="#6193cf" d="M48.499 949.362c-3.247 0-4.464 1.685-4.464 4.256 0 2.55-2.06 4.744-4.621 4.744H3.016c-1.161 0-2.016.783-2.016 2.016v68.975c0 1.779 1.28 3.01 2.988 3.01h115.98c2.133 0 3.032-1.358 3.032-2.97v-75.43c0-2.55-2.06-4.6-4.621-4.6z"/>
<path fill="url(#p)" d="M44.035 953.603c0 2.54-2.06 4.76-4.621 4.76H3.016c-1.266 0-2.016.88-2.016 2.003v69.996c-.36.48 1.067 2 4 2h115c2.122 0 3-1.614 3-2v-76.416c0-2.54-2.06-4.584-4.621-4.584h-69.88c-3.247 0-4.464 1.679-4.464 4.241z" opacity=".463"/>
<path fill="#d5f2f8" fill-opacity=".728" d="M47.982 949.362c-2.783.176-3.95 1.984-3.982 4.567-.03 2.385-2.198 4.433-4.494 4.433H2.988c-1.167 0-1.988.862-1.988 2 0-.74.916-1 2-1h36.506c2.828 0 5.494-2.4 5.494-5.433 0-2.442 1.12-3.541 2.982-3.567h70.393c2.296 0 4.619 1.73 4.619 4H123c0-2.81-1.797-5-4.625-5z" opacity=".566"/>
<rect width="122" height="4.392" x="3" y="1032.482" fill="url(#q)" filter="url(#r)" opacity=".577" rx="2.44" ry="2.196" transform="matrix(1 0 0 2.04918 -2 -1091.382)"/>
<path fill="#b8e6ff" d="M2.313 1027.862c-.192.285-.313.61-.313.938v.125c0 1.346 1.784 2.437 4 2.437h113c2.216 0 4-1.09 4-2.437v-.125c0-.328-.121-.653-.313-.938-.596.886-2.01-.5-3.687-.5H6c-1.677 0-3.091 1.386-3.688.5z" filter="url(#s)" opacity=".269"/>
<path fill="url(#t)" d="M50.499 949.362c-3.247 0-4.464 1.685-4.464 4.256 0 2.55-2.06 4.744-4.621 4.744H3.016c-1.161 0-2.016.783-2.016 2.016v68.975c0 1.779 1.28 3.01 2.988 3.01h115.98c2.133 0 3.032-1.358 3.032-2.97v-75.43c0-2.55-2.06-4.6-4.621-4.6z" filter="url(#j)" opacity=".486"/>
<path fill="#00438a" d="M1 1005.362v9h122v-9z" opacity=".4"/>
<path fill="url(#u)" d="M47.5 949.362a3.5 3.5 0 0 0-3.5 3.5c0 .168.008.339.031.5h1.032a2.476 2.476 0 0 1-.063-.5 2.5 2.5 0 0 1 2.5-2.5c.151 0 .294.037.438.063.02-.182.062-.373.062-.563 0-.158-.017-.316-.031-.469a3.606 3.606 0 0 0-.469-.03z" opacity=".937"/>
<path fill="url(#v)" d="M122.506 952.362c.274 0 .494.892.494 2v74c0 1.108-.22 2-.494 2-.273 0-.494-.892-.494-2v-74c0-1.108.22-2 .494-2z" opacity=".406"/>
<path fill="url(#w)" d="M1.5 959.362c.277 0 .5.223.5.5v70a.499.499 0 1 1-1 0v-70c0-.277.223-.5.5-.5z" opacity=".594"/>
<path fill="url(#x)" d="M6.5 933.456c-1.226 0-2.506 1.114-2.506 2.406v2.5l.1 62.656v23.72a3.518 3.518 0 0 0 3.531 3.53h107.75c1.966 0 3.507-1.575 3.531-3.53l1-81.282c.024-1.956-2.057-4-4.031-4H39.032c-.572-.005-1.09-.523-1.094-1.094l-.032-2c-.01-.904-2.088-2.906-3.906-2.906zm0 .75H34c1.173 0 3.156.956 3.156 2.187l.032 2c.015.956.888 1.814 1.843 1.813h76.844c1.582 0 3.3 1.692 3.281 3.25l-1 81.281c-.019 1.558-1.214 2.781-2.781 2.781H7.625a2.748 2.748 0 0 1-2.781-2.78v-23.72l-.1-62.656v-2.5c0-.947.868-1.656 1.756-1.656z"/>
<path fill="url(#y)" d="M6.5 932.456c-1.226 0-2.5 1.114-2.5 2.406v2.5l.031 19.019h.75l-.031-19.019v-2.5c0-.947.862-1.656 1.75-1.656H36c1.173 0 2.156.956 2.156 2.187l.032 2c.015.956.888 1.814 1.843 1.813h75.844c1.582 0 3.3 1.692 3.281 3.25l-.187 5.325h.75l.187-5.325c.024-1.956-2.057-4-4.031-4H40.032c-.572-.005-1.09-.523-1.094-1.094l-.032-2c-.01-.904-1.088-2.906-2.906-2.906z" opacity=".251"/>
<path fill="url(#z)" d="M8.625 935.362A2.625 2.625 0 0 0 6 937.987c0 .126.006.254.023.375h.774a1.858 1.858 0 0 1-.047-.375c0-1.035.84-1.875 1.875-1.875.113 0 .22.028.328.047.015-.136.047-.28.047-.422 0-.118-.013-.237-.023-.351a2.718 2.718 0 0 0-.352-.024z" filter="url(#A)" opacity=".937" transform="translate(-2 -2)"/>
<path fill="url(#B)" d="M6.625 935.362A2.625 2.625 0 0 0 4 937.987c0 .126.006.254.023.375h.774a1.858 1.858 0 0 1-.047-.375c0-1.035.84-1.875 1.875-1.875.113 0 .22.028.328.047.015-.136.047-.28.047-.422 0-.118-.013-.237-.023-.351a2.718 2.718 0 0 0-.352-.024z" filter="url(#A)" opacity=".937" transform="matrix(-1 0 0 1 42 -2)"/>
<path fill="url(#z)" d="M8.625 935.362A2.625 2.625 0 0 0 6 937.987c0 .126.006.254.023.375h.774a1.858 1.858 0 0 1-.047-.375c0-1.035.84-1.875 1.875-1.875.113 0 .22.028.328.047.015-.136.047-.28.047-.422 0-.118-.013-.237-.023-.351a2.718 2.718 0 0 0-.352-.024z" filter="url(#A)" opacity=".937" transform="matrix(-1 0 0 1 125 4)"/>
<path fill="url(#C)" d="M76 103.75c0 .69-1.567 1.25-3.5 1.25s-3.5-.56-3.5-1.25 1.567-1.25 3.5-1.25 3.5.56 3.5 1.25z" filter="url(#D)" opacity=".891" transform="matrix(2.36671 -.29884 0 2.36671 -67.625 813.331)"/>
<path fill="url(#E)" d="M50.145 58.704h2.97v52.477l-2.97-2.535z" transform="translate(61.355 917.073) scale(1.00997)"/>
<path fill="url(#F)" d="M43.117 3v90.657l2 .5V3z" filter="url(#G)" opacity=".7" transform="matrix(.83212 0 0 -.5481 76.121 1028.553)"/>
<path fill="url(#H)" d="M53.656 103.941c-.603-.852-1.319-.782-2.142-1.442a9.877 9.877 0 0 0-.673-.493v7.378l2.815 2.333z" opacity=".3" transform="translate(61.355 917.073) scale(1.00997)"/>
<path fill="url(#I)" d="M36.775 90.225c1.672 5.39 9.805 8.256 18.165 6.405 8.361-1.853 13.781-7.723 12.11-13.112-1.672-5.39-9.805-8.257-18.165-6.404-8.36 1.852-13.782 7.722-12.11 13.111z" transform="matrix(.74192 -.0893 .08746 .70544 57.563 973.783)"/>
<path fill="url(#J)" d="M43.576 95.141c-1.891-7.217-12.218-10.761-23.068-7.915C9.659 90.072 2.397 98.231 4.288 105.45c1.104 4.218 5.1 7.166 10.387 8.333-3.231-1.651-5.652-4.326-6.545-7.736-1.904-7.269 3.803-15.064 12.748-17.412 8.945-2.347 17.741 1.644 19.645 8.912.894 3.41.095 6.931-1.911 9.956 4.034-3.612 6.069-8.145 4.964-12.362z" filter="url(#K)" opacity=".9" transform="matrix(.50904 -.06127 .0475 .3832 87.33 993.276)"/>
<path fill="url(#L)" d="M34.448 87.55c-7.627 4.165-12.097 10.314-9.567 13.16 1.1 1.24 3.232 1.538 4.824 1.57 4.125.083 9.447-1.428 14.235-4.043 7.625-4.163 12.096-10.314 9.565-13.16-1.101-1.239-3.232-1.537-4.824-1.57-4.125-.082-9.446 1.429-14.233 4.043z" filter="url(#M)" opacity=".8" transform="matrix(.52512 -.0632 .05377 .4337 75.176 990.459)"/>
<path fill="url(#N)" d="M46.875 109c-7.172 1.882-12.588.601-11.925 3.134.273 1.045 1.302 1.832 2.116 2.308 2.24 1.311 6.43 2.239 11.47.917 7.172-1.882 10.927-6.96 10.264-9.492-.273-1.046-1.302-1.832-2.116-2.309-2.241-1.31-4.77 4.12-9.81 5.442z" filter="url(#O)" opacity=".6" transform="matrix(.53866 .024 -.0704 .55536 87.306 970.67)"/>
<path fill="url(#P)" d="M87.844 97.625c-.648 8.39-8.338 16.48-19.25 19.344-12.995 3.409-25.651-1.86-28.25-11.781-.233-.89-.377-1.79-.438-2.688a14.507 14.507 0 0 0 .438 4.688c2.599 9.92 15.255 15.19 28.25 11.78 11.777-3.09 19.783-12.268 19.25-21.343z" filter="url(#Q)" opacity=".8" transform="matrix(.45862 -.0552 .0475 .3832 70.11 995.348)"/>
<path fill="url(#R)" d="M58.402 68.185c-2.818-3.365-4.24-7.464-5.287-9.481l-.048 13.503c19.061 8.023 6.75 29.34 6.75 29.34 14.08-14.504 1.178-30.266-1.415-33.362z" transform="translate(61.355 917.073) scale(1.00997)"/>
<path fill="url(#S)" d="M73.284 31.834c-3.124-3.83-3.783-6.407-4.517-7.486 0 11.96 3.893 11.818.319 11.13C75.426 38.74 80.3 43.234 82.158 48c-2.084-7.847-6.24-12.937-8.874-16.166z" filter="url(#T)" transform="translate(58.744 959.72) scale(.83212)"/>
<rect width="122" height="1" x="1" y="1014.362" fill="#fff" opacity=".109" rx="0" ry="1"/>
<path fill="url(#U)" d="M1 1005.362v9h122v-9z" opacity=".4"/>
<path d="M13.219 4.844a.565.565 0 0 0-.375.5v118.312c.004.238.262.496.5.5h48.812c1.807 0 3.55.298 6.344-1.594.036-.037.077-.082.125-.124.084-.075.194-.185.313-.282.237-.193.516-.417.78-.625.207-.162.37-.269.5-.375a.315.315 0 0 1 .032-.062c.005-.004.027.004.031 0a.315.315 0 0 1 .031-.063c.005-.004.027.004.032 0 9.64-9.159 27.595-28.833 38.781-40.156 1.72-1.72 3.375-3.284 3.375-7.563V5.344c-.004-.238-.262-.496-.5-.5H13.344a.315.315 0 0 1-.031 0c-.022-.002-.041 0-.063 0z" filter="url(#V)" transform="matrix(1.01353 0 0 1.01327 -1.513 -1.307)"/>
<path fill="url(#C)" d="M76 103.75c0 .69-1.567 1.25-3.5 1.25s-3.5-.56-3.5-1.25 1.567-1.25 3.5-1.25 3.5.56 3.5 1.25z" filter="url(#D)" opacity=".891" transform="matrix(2.63774 -.33307 0 2.63774 -104.195 797.707)"/>
<path fill="url(#E)" d="M50.145 58.704l3.553-.04v52.414l-3.553-2.432z" transform="translate(39.555 913.329) scale(1.12563)"/>
<path fill="url(#F)" d="M43.117 3v90.657l2 .5V3z" filter="url(#G)" opacity=".7" transform="matrix(.92742 0 0 -.61088 56.013 1037.575)"/>
<path fill="url(#H)" d="M53.656 103.941c-.603-.852-1.319-.782-2.142-1.442a9.877 9.877 0 0 0-.673-.493v7.378l2.857 1.694z" opacity=".3" transform="translate(39.555 913.329) scale(1.12563)"/>
<path fill="url(#W)" d="M37.423 90.449c1.672 5.39 9.805 8.256 18.165 6.404s13.87-7.457 12.199-12.846c-1.672-5.389-9.894-8.522-18.254-6.67-8.36 1.853-13.782 7.723-12.11 13.112z" transform="matrix(.82688 -.09952 .09747 .78622 35.329 976.533)"/>
<path fill="url(#J)" d="M43.576 95.141c-1.891-7.217-12.218-10.761-23.068-7.915C9.659 90.072 2.397 98.231 4.288 105.45c1.104 4.218 5.1 7.166 10.387 8.333-3.231-1.651-5.652-4.326-6.545-7.736-1.904-7.269 3.803-15.064 12.748-17.412 8.945-2.347 17.741 1.644 19.645 8.912.894 3.41.095 6.931-1.911 9.956 4.034-3.612 6.069-8.145 4.964-12.362z" filter="url(#K)" opacity=".9" transform="matrix(.56733 -.06828 .05295 .42709 68.504 998.259)"/>
<path fill="url(#L)" d="M34.448 87.55c-7.627 4.165-12.097 10.314-9.567 13.16 1.1 1.24 3.232 1.538 4.824 1.57 4.125.083 9.447-1.428 14.235-4.043 7.625-4.163 12.096-10.314 9.565-13.16-1.101-1.239-3.232-1.537-4.824-1.57-4.125-.082-9.446 1.429-14.233 4.043z" filter="url(#M)" opacity=".8" transform="matrix(.58525 -.07044 .05993 .48338 54.959 995.119)"/>
<path fill="url(#N)" d="M46.875 109c-7.172 1.882-12.588.601-11.925 3.134.273 1.045 1.302 1.832 2.116 2.308 2.24 1.311 6.43 2.239 11.47.917 7.172-1.882 10.927-6.96 10.264-9.492-.273-1.046-1.302-1.832-2.116-2.309-2.241-1.31-4.77 4.12-9.81 5.442z" filter="url(#O)" opacity=".6" transform="matrix(.60034 .02675 -.07845 .61895 68.478 973.063)"/>
<path fill="url(#P)" d="M87.844 97.625c-.648 8.39-8.338 16.48-19.25 19.344-12.995 3.409-25.651-1.86-28.25-11.781-.233-.89-.377-1.79-.438-2.688a14.507 14.507 0 0 0 .438 4.688c2.599 9.92 15.255 15.19 28.25 11.78 11.777-3.09 19.783-12.268 19.25-21.343z" filter="url(#Q)" opacity=".8" transform="matrix(.51114 -.06152 .05295 .42709 49.314 1000.568)"/>
<path fill="url(#R)" d="M58.985 68.144c-2.817-3.365-4.24-7.463-5.287-9.48l-.048 13.502c19.062 8.023 6.75 29.34 6.75 29.34 14.08-14.503 1.178-30.265-1.415-33.362z" transform="translate(39.555 913.329) scale(1.12563)"/>
<path fill="url(#S)" d="M73.5 31.619c-3.125-3.83-3.783-6.408-4.517-7.487 0 11.96 3.892 11.818.319 11.131 6.34 3.261 11.213 7.754 13.072 12.521-2.085-7.847-6.24-12.937-8.874-16.165z" filter="url(#T)" transform="translate(36.645 960.86) scale(.92742)"/>
<path fill="url(#X)" d="M100 1024.062a10.002 10.002 0 0 1 1.602-.5v14.42c-.504.039-1.04.037-1.602 0z"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
icons/star.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
icons/star_blue.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/system-search.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
icons/windows-list.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
icons/wizard.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.2 KiB

16
mainwindow.cc
View file

@ -874,7 +874,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
#ifdef Q_OS_MAC
if( cfg.preferences.startWithScanPopupOn && !MacMouseOver::isAXAPIEnabled() )
mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
QPixmap( ":/icons/error.png" ) );
QPixmap( ":/icons/error.svg" ) );
#endif
wasMaximized = isMaximized();
@ -3226,7 +3226,7 @@ void MainWindow::scanEnableToggled( bool on )
#ifdef Q_OS_MAC
if( !MacMouseOver::isAXAPIEnabled() )
mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
QPixmap( ":/icons/error.png" ) );
QPixmap( ":/icons/error.svg" ) );
#endif
enableScanPopup->setIcon(QIcon(":/icons/wizard-selected.svg"));
}
@ -3964,7 +3964,7 @@ void MainWindow::on_exportHistory_triggered()
}
QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
}
// TODO: consider moving parts of this method into History class.
@ -4030,7 +4030,7 @@ void MainWindow::on_importHistory_triggered()
if( fileStream.status() >= QTextStream::ReadCorruptData )
{
errStr = QString ( tr( "Import error: invalid data in file" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
}
else
mainStatusBar->showMessage( tr( "History import complete" ), 5000 );
@ -4038,7 +4038,7 @@ void MainWindow::on_importHistory_triggered()
}
errStr = QString( tr( "Import error: " ) ) + file.errorString();
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
}
void MainWindow::on_exportFavorites_triggered()
@ -4079,7 +4079,7 @@ void MainWindow::on_exportFavorites_triggered()
}
QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
}
void MainWindow::on_ExportFavoritesToList_triggered()
@ -4128,7 +4128,7 @@ void MainWindow::on_ExportFavoritesToList_triggered()
}
QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
}
void MainWindow::on_importFavorites_triggered()
@ -4177,7 +4177,7 @@ void MainWindow::on_importFavorites_triggered()
errStr = QString( tr( "Data parsing error" ) );
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
}
void MainWindow::fillWordListFromHistory()

27
resources.qrc
View file

@ -1,21 +1,12 @@
<RCC>
<qresource prefix="/">
<file>version.txt</file>
<file>icons/print.png</file>
<file>icons/arrow.png</file>
<file>icons/prefix.png</file>
<file>icons/pushpin.png</file>
<file>icons/playsound.png</file>
<file>icons/closetab.png</file>
<file>icons/addtab.png</file>
<file>icons/next.png</file>
<file>icons/previous.png</file>
<file>icons/home.png</file>
<file>icons/reload.png</file>
<file>icons/programicon.png</file>
<file>icons/programicon_scan.png</file>
<file>icons/programs.png</file>
<file>icons/wizard.png</file>
<file>icons/warning.png</file>
<file>article-style.css</file>
<file>article-style-print.css</file>
@ -26,24 +17,11 @@
<file>icons/icon32_bgl.png</file>
<file>icons/icon32_dictd.png</file>
<file>icons/icon32_hunspell.png</file>
<file>icons/fileopen.png</file>
<file>icons/filesave.png</file>
<file>icons/icon32_wiki.png</file>
<file>icons/icon32_zoombase.png</file>
<file>icons/icon32_zoomin.png</file>
<file>icons/icon32_zoomout.png</file>
<file>icons/network.png</file>
<file>icons/hotkeys.png</file>
<file>icons/interface.png</file>
<file>icons/configure.png</file>
<file>icons/book.png</file>
<file>icons/bookcase.png</file>
<file>qt-style-st-lingvo.css</file>
<file>article-style-st-lingvo.css</file>
<file>icons/internet.png</file>
<file>icons/icon_dsl_native.png</file>
<file>icons/forvo.png</file>
<file>icons/windows-list.png</file>
<file>CREDITS.txt</file>
<file>icons/highlighter.png</file>
<file>icons/error.png</file>
@ -54,8 +32,6 @@
<file>icons/collapse_opt.png</file>
<file>article-style-st-babylon.css</file>
<file>qt-style-st-babylon.css</file>
<file>icons/1downarrow.png</file>
<file>icons/system-search.png</file>
<file>icons/menu_button.png</file>
<file>icons/clear.png</file>
<file>article-style-st-modern.css</file>
@ -74,14 +50,11 @@
<file>icons/collapse_article.png</file>
<file>icons/video.png</file>
<file>icons/programicon_old.png</file>
<file>icons/playsound_color.png</file>
<file>icons/playsound_full.png</file>
<file>icons/icon32_zim.png</file>
<file>icons/icon32_epwing.png</file>
<file>icons/icon32_slob.png</file>
<file>icons/icon32_gls.png</file>
<file>icons/star.png</file>
<file>icons/star_blue.png</file>
<file>icons/folder.png</file>
<file>icons/ontop.png</file>
<file>resources/jquery-3.6.0.slim.min.js</file>

4
wordlist.cc
View file

@ -114,8 +114,8 @@ void WordList::updateMatchResults( bool finished )
refreshTranslateLine();
if ( !wordFinder->getErrorString().isEmpty() )
emit statusBarMessage( tr( "WARNING: %1" ).arg( wordFinder->getErrorString() ),
20000 , QPixmap( ":/icons/error.png" ) );
emit statusBarMessage(tr("WARNING: %1").arg(wordFinder->getErrorString()),
20000, QPixmap(":/icons/error.svg"));
}
if( !results.empty() && results.front().first.isRightToLeft() )