Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

Add new Falkon icon

Browse Source
This commit is contained in:
David Rosca 2018-02-23 12:57:42 +01:00
parent c6aefbbed3
commit 86d3ebebc7
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
38 changed files with 163 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/applications/org.kde.falkon.desktop
View File

@ -21,7 +21,7 @@ Name[uk]=Falkon
Name[x-test]=xxFalkonxx
Name[zh_CN]=Falkon
Type=Application
Icon=qupzilla
Icon=falkon
Categories=Network;WebBrowser;
Comment=A fast and secure web browser
Comment[ar]=متصفّح وبّ سريع وآمن

4
linux/build-appimage.sh
View File

@ -281,8 +281,8 @@ for LNKS in {libssl.so,libssl.so.10,libssl.so.1.0.0} ; do
done
cp ../linux/applications/org.kde.falkon.desktop bundle_build_dir
cp ../linux/pixmaps/qupzilla.png bundle_build_dir
ln -s qupzilla.png bundle_build_dir/.DirIcon
cp ../linux/pixmaps/falkon.png bundle_build_dir
ln -s falkon.png bundle_build_dir/.DirIcon
pushd bundle_build_dir
mv bin/falkon ./ && rm -fr bin

BIN
linux/hicolor/128-apps-falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
linux/hicolor/128-apps-qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.4 KiB

BIN
linux/hicolor/16-apps-falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 965 B

BIN
linux/hicolor/16-apps-qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 709 B

BIN
linux/hicolor/256-apps-falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

BIN
linux/hicolor/256-apps-qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
linux/hicolor/32-apps-falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
linux/hicolor/32-apps-qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
linux/hicolor/48-apps-falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
linux/hicolor/48-apps-qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
linux/hicolor/64-apps-falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
linux/hicolor/64-apps-qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

50
linux/hicolor/sc-apps-falkon.svg Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
<title>Icon-128</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="148.794275%" y1="-26.5643443%" x2="-21.1415871%" y2="99.3029307%" id="linearGradient-1">
<stop stop-color="#D446FF" offset="0%"></stop>
<stop stop-color="#A0D8FF" offset="100%"></stop>
</linearGradient>
<linearGradient x1="41.8083357%" y1="20.866645%" x2="95.5956597%" y2="-8.31097281%" id="linearGradient-2">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#DADADA" offset="100%"></stop>
</linearGradient>
<linearGradient x1="52.2801818%" y1="70.5577815%" x2="2.53678786%" y2="8.97706744%" id="linearGradient-3">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#DADADA" offset="100%"></stop>
</linearGradient>
<linearGradient x1="98.684398%" y1="12.9995489%" x2="35.2678133%" y2="40.863838%" id="linearGradient-4">
<stop stop-color="#D0D0D0" offset="0%"></stop>
<stop stop-color="#FFFFFF" offset="100%"></stop>
</linearGradient>
<linearGradient x1="34.2841787%" y1="31.6476155%" x2="-40.2132134%" y2="123.398162%" id="linearGradient-5">
<stop stop-color="#FFDC68" offset="0%"></stop>
<stop stop-color="#CE4300" offset="100%"></stop>
</linearGradient>
<linearGradient x1="95.7086811%" y1="2.33776624%" x2="-10.5474304%" y2="34.7418529%" id="linearGradient-6">
<stop stop-color="#FFDC68" offset="0%"></stop>
<stop stop-color="#CE4300" offset="100%"></stop>
</linearGradient>
<linearGradient x1="55.2222258%" y1="39.6484627%" x2="-63.5655829%" y2="222.055577%" id="linearGradient-7">
<stop stop-color="#FFDC68" offset="0%"></stop>
<stop stop-color="#CE4300" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Icon-128">
<g id="Group-2-Copy" transform="translate(0.605678, 1.413249)">
<ellipse id="ellipse4650-0-7-2-3-4-4" stroke="#A3A3A3" stroke-width="0.557663734" fill="url(#linearGradient-1)" fill-rule="nonzero" cx="63.6290019" cy="62.531089" rx="63.6097878" ry="62.458775"></ellipse>
<path d="M22.2404038,123.591854 C22.2404038,123.591854 42.118723,54.0331205 119.497852,62.8779003 C119.497852,62.8779003 70.3205552,33.6848555 22.5795432,73.0413426 C8.48012114,105.700321 22.2404038,123.591854 22.2404038,123.591854 Z" id="path4652-2-7-9-7-2-7" fill="url(#linearGradient-2)"></path>
<path d="M28.158405,114.79361 C28.158405,114.79361 48.8999369,64.7867155 104.26559,63.9078965 C62.1798763,74.1607975 104.334637,110.509042 104.334637,110.509042 C104.334637,110.509042 71.0440782,140.672888 28.158405,114.79361 Z" id="path4654-1-7-7-4-4-6" fill="url(#linearGradient-3)"></path>
<path d="M16.610241,76.4594877 C16.610241,76.4594877 58.0382082,30.888742 119.90398,62.373976 C118.799203,53.8122297 111.480268,44.145706 98.3614183,41.3838334 C95.4614713,40.0029073 74.1950991,7.13670662 28.4862587,26.0555104 C42.5480681,27.150395 48.5816934,29.1201009 48.9240631,30.6125527 C24.606183,26.4332517 17.3978246,61.0403937 16.610241,76.4594877 Z" id="path4656-5-6-43-8-0-8" fill="url(#linearGradient-4)"></path>
<path d="M76.024853,37.8021552 C76.024853,37.8021552 86.6240606,34.0061678 88.0044215,45.2955659 C77.5531205,46.2815899 76.024853,37.8021552 76.024853,37.8021552 Z" id="path4658-6-9-5-0-2-9" fill="#202020"></path>
<path d="M21.9626397,123.818135 C21.9626397,123.818135 40.0833413,64.7076341 100.667256,62.4206738 C100.667256,62.4206738 51.5059886,53.4510032 16.7850397,108.451977 C16.592535,116.233307 21.9626397,123.818135 21.9626397,123.818135 Z" id="path4660-5-1-6-0-7-6" fill="url(#linearGradient-5)"></path>
<path d="M28.5370953,26.0612442 C28.5370953,26.0612442 43.6479192,26.9400833 49.0428972,30.6506498 C51.2954549,30.1872454 53.2080656,28.6449666 53.5331937,26.5444341 C51.6002524,25.7444744 33.9076644,24.3036063 28.5370953,26.0612442 Z" id="path4662-0-1-1-1-2-3" fill="url(#linearGradient-6)"></path>
<path d="M16.7464984,76.5380845 C16.7464984,76.5380845 35.6647773,53.8154599 73.8572719,51.1008505 C73.8572719,51.1008505 21.8654284,53.4505792 17.5007697,68.1317148 C16.2873338,71.6619912 16.7464984,76.5380845 16.7464984,76.5380845 Z" id="path4442-5-0-9-4-6-0-96" fill="url(#linearGradient-7)"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
linux/pixmaps/falkon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
linux/pixmaps/qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

6
src/lib/app/mainapplication.cpp
View File

@ -112,7 +112,7 @@ MainApplication::MainApplication(int &argc, char** argv)
setApplicationName(QLatin1String("falkon"));
setOrganizationDomain(QLatin1String("org.kde"));
setWindowIcon(QIcon::fromTheme(QSL("qupzilla"), QIcon(QSL(":icons/exeicons/qupzilla-window.png"))));
setWindowIcon(QIcon::fromTheme(QSL("falkon"), QIcon(QSL(":icons/falkon.svg"))));
setDesktopFileName(QSL("org.kde.falkon"));
#ifdef GIT_REVISION
@ -1240,8 +1240,8 @@ void MainApplication::createJumpList()
void MainApplication::initPulseSupport()
{
qputenv("PULSE_PROP_OVERRIDE_application.name", "Falkon");
qputenv("PULSE_PROP_OVERRIDE_application.icon_name", "qupzilla");
qputenv("PULSE_PROP_OVERRIDE_media.icon_name", "qupzilla");
qputenv("PULSE_PROP_OVERRIDE_application.icon_name", "falkon");
qputenv("PULSE_PROP_OVERRIDE_media.icon_name", "falkon");
}
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)

6
src/lib/data/icons.qrc
View File

@ -1,7 +1,8 @@
<RCC>
<qresource prefix="/">
<file>icons/qupzilla.png</file>
<file>qupzilla.png</file>
<file>icons/falkon.svg</file>
<file>icons/falkon-black.svg</file>
<file>icons/falkon-white.svg</file>
<file>icons/menu/history.svg</file>
<file>icons/menu/history_entry.svg</file>
<file>icons/menu/tab-new.svg</file>
@ -31,7 +32,6 @@
<file>icons/browsers/ie.png</file>
<file>icons/browsers/ie@2x.png</file>
<file>icons/browsers/html.svg</file>
<file>icons/exeicons/qupzilla-window.png</file>
<file>icons/sites/duck.png</file>
<file>icons/sites/google.png</file>
<file>icons/sites/translate.png</file>

BIN
src/lib/data/icons/exeicons/falkon.icns Normal file
View File

Binary file not shown.

BIN
src/lib/data/icons/exeicons/falkon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 KiB

BIN
src/lib/data/icons/exeicons/page_os2.ico
View File

Binary file not shown.

BIN
src/lib/data/icons/exeicons/qupzilla-window.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
src/lib/data/icons/exeicons/qupzilla.icns
View File

Binary file not shown.

BIN
src/lib/data/icons/exeicons/qupzilla.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 122 KiB

BIN
src/lib/data/icons/exeicons/qupzilla_os2.ico
View File

Binary file not shown.

23
src/lib/data/icons/falkon-black.svg Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
<title>Icon-32</title>
<desc>Created with Sketch.</desc>
<defs>
<ellipse id="path-1" cx="16.0020253" cy="15.6805873" rx="15.9527711" ry="15.6641073"></ellipse>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Icon-32">
<g id="Group-Copy" transform="translate(0.000000, 0.303797)">
<g id="ellipse4650-0-7-2-3-8-3" fill-rule="nonzero">
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
<ellipse stroke="#090909" stroke-width="0.506329114" cx="16.0020253" cy="15.6805873" rx="15.6996066" ry="15.4109428"></ellipse>
</g>
<path d="M5.62212658,30.9940709 C5.62212658,30.9940709 10.6074329,13.549357 30.0134329,15.7675494 C30.0134329,15.7675494 17.6802025,8.44619241 5.70717975,18.3164506 C2.17116962,26.5070329 5.62212658,30.9940709 5.62212658,30.9940709 Z" id="path4652-2-7-9-7-1-5" fill="#0B0B0B"></path>
<path d="M7.10630886,28.7875494 C7.10630886,28.7875494 12.3081013,16.2462633 26.1933165,16.0258633 C15.6385924,18.5972 26.2106329,27.7130177 26.2106329,27.7130177 C26.2106329,27.7130177 17.8616557,35.277843 7.10630886,28.7875494 Z" id="path4654-1-7-7-4-6-3" fill="#0B0B0B"></path>
<path d="M4.21013165,19.1736911 C4.21013165,19.1736911 14.5998987,7.7449519 30.1152861,15.6411696 C29.8382177,13.4939595 28.0026937,11.069681 24.7126025,10.3770278 C23.9853215,10.0307038 18.6519038,1.7881519 7.18853165,6.53282025 C10.7151089,6.80740759 12.2282886,7.30139241 12.3141519,7.67568608 C6.21544304,6.62755443 4.40765063,15.306719 4.21013165,19.1736911 Z" id="path4656-5-6-43-8-8-7" fill="#0B0B0B"></path>
<path d="M19.1107899,9.47877468 C19.1107899,9.47877468 21.7689772,8.52677468 22.1151595,11.3580557 C19.4940658,11.6053418 19.1107899,9.47877468 19.1107899,9.47877468 Z" id="path4658-6-9-5-0-0-3" fill="#FFFFFF"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

18
src/lib/data/icons/falkon-white.svg Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
<title>Icon-32</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Icon-32">
<g id="Group-3-Copy" transform="translate(0.100946, 0.353312)">
<ellipse id="ellipse4650-0-7-2-3-8" stroke="#A3A3A3" stroke-width="0.5" fill="#1E1E1E" fill-rule="nonzero" cx="15.9373375" cy="15.6299659" rx="15.9024469" ry="15.6146938"></ellipse>
<path d="M5.59018297,30.8951571 C5.59018297,30.8951571 10.5597628,13.5054738 29.9045451,15.7166688 C29.9045451,15.7166688 17.6102208,8.41840757 5.67496782,18.2575293 C2.1501123,26.4222738 5.59018297,30.8951571 5.59018297,30.8951571 Z" id="path4652-2-7-9-7-1" fill="#FFFFFF"></path>
<path d="M7.06968328,28.6955962 C7.06968328,28.6955962 12.2550662,16.1938726 26.0964795,15.9741678 C15.5750511,18.5373931 26.1137413,27.6244543 26.1137413,27.6244543 C26.1137413,27.6244543 17.7911016,35.1654158 7.06968328,28.6955962 Z" id="path4654-1-7-7-4-6" fill="#FFFFFF"></path>
<path d="M4.18264227,19.1120656 C4.18264227,19.1120656 14.5396341,7.71937918 30.006077,15.5906877 C29.7298826,13.4502511 27.9001489,11.0336202 24.6204366,10.3431521 C23.8954498,9.9979205 18.5788568,1.78137035 7.15164669,6.51107129 C10.6670991,6.78479243 12.1755054,7.27721893 12.2610978,7.65033186 C6.18162776,6.60550662 4.37953817,15.2572921 4.18264227,19.1120656 Z" id="path4656-5-6-43-8-8" fill="#FFFFFF"></path>
<path d="M19.0362953,9.44773249 C19.0362953,9.44773249 21.6860972,8.49873565 22.0311874,11.3210852 C19.4183621,11.5675912 19.0362953,9.44773249 19.0362953,9.44773249 Z" id="path4658-6-9-5-0-0" fill="#1E1E1E"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

50
src/lib/data/icons/falkon.svg Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
<title>Icon-32</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="148.794275%" y1="-26.5643443%" x2="-21.1415871%" y2="99.3029307%" id="linearGradient-1">
<stop stop-color="#D446FF" offset="0%"></stop>
<stop stop-color="#A0D8FF" offset="100%"></stop>
</linearGradient>
<linearGradient x1="41.8083357%" y1="20.866645%" x2="95.5956597%" y2="-8.31097281%" id="linearGradient-2">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#DADADA" offset="100%"></stop>
</linearGradient>
<linearGradient x1="52.2801818%" y1="70.5577815%" x2="2.53678786%" y2="8.97706744%" id="linearGradient-3">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#DADADA" offset="100%"></stop>
</linearGradient>
<linearGradient x1="98.684398%" y1="12.9995489%" x2="35.2678133%" y2="40.863838%" id="linearGradient-4">
<stop stop-color="#D0D0D0" offset="0%"></stop>
<stop stop-color="#FFFFFF" offset="100%"></stop>
</linearGradient>
<linearGradient x1="34.2841787%" y1="31.6476155%" x2="-40.2132134%" y2="123.398162%" id="linearGradient-5">
<stop stop-color="#FFDC68" offset="0%"></stop>
<stop stop-color="#CE4300" offset="100%"></stop>
</linearGradient>
<linearGradient x1="95.7086811%" y1="2.33776624%" x2="-10.5474304%" y2="34.7418529%" id="linearGradient-6">
<stop stop-color="#FFDC68" offset="0%"></stop>
<stop stop-color="#CE4300" offset="100%"></stop>
</linearGradient>
<linearGradient x1="55.2222258%" y1="39.6484627%" x2="-63.5655829%" y2="222.055577%" id="linearGradient-7">
<stop stop-color="#FFDC68" offset="0%"></stop>
<stop stop-color="#CE4300" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Icon-32">
<g id="Group-2-Copy" transform="translate(0.151420, 0.353312)">
<ellipse id="ellipse4650-0-7-2-3-4-4" stroke="#A3A3A3" stroke-width="0.5" fill="url(#linearGradient-1)" fill-rule="nonzero" cx="15.9072505" cy="15.6327722" rx="15.9024469" ry="15.6146938"></ellipse>
<path d="M5.56010095,30.8979634 C5.56010095,30.8979634 10.5296808,13.5082801 29.8744631,15.7194751 C29.8744631,15.7194751 17.5801388,8.42121388 5.6448858,18.2603356 C2.12003028,26.4250801 5.56010095,30.8979634 5.56010095,30.8979634 Z" id="path4652-2-7-9-7-2-7" fill="url(#linearGradient-2)"></path>
<path d="M7.03960126,28.6984025 C7.03960126,28.6984025 12.2249842,16.1966789 26.0663975,15.9769741 C15.5449691,18.5401994 26.0836593,27.6272606 26.0836593,27.6272606 C26.0836593,27.6272606 17.7610196,35.1682221 7.03960126,28.6984025 Z" id="path4654-1-7-7-4-4-6" fill="url(#linearGradient-3)"></path>
<path d="M4.15256025,19.1148719 C4.15256025,19.1148719 14.5095521,7.72218549 29.975995,15.593494 C29.6998006,13.4530574 27.8700669,11.0364265 24.5903546,10.3459584 C23.8653678,10.0007268 18.5487748,1.78417666 7.12156467,6.5138776 C10.637017,6.78759874 12.1454233,7.28002524 12.2310158,7.65313817 C6.15154574,6.60831293 4.34945615,15.2600984 4.15256025,19.1148719 Z" id="path4656-5-6-43-8-0-8" fill="url(#linearGradient-4)"></path>
<path d="M19.0062132,9.4505388 C19.0062132,9.4505388 21.6560151,8.50154196 22.0011054,11.3238915 C19.3882801,11.5703975 19.0062132,9.4505388 19.0062132,9.4505388 Z" id="path4658-6-9-5-0-2-9" fill="#202020"></path>
<path d="M5.49065994,30.9545338 C5.49065994,30.9545338 10.0208353,16.1769085 25.1668139,15.6051685 C25.1668139,15.6051685 12.8764972,13.3627508 4.19625994,27.1129943 C4.14813375,29.0583268 5.49065994,30.9545338 5.49065994,30.9545338 Z" id="path4660-5-1-6-0-7-6" fill="url(#linearGradient-5)"></path>
<path d="M7.13427382,6.51531104 C7.13427382,6.51531104 10.9119798,6.73502082 12.2607243,7.66266246 C12.8238637,7.54681136 13.3020164,7.16124164 13.3832984,6.63610852 C12.9000631,6.43611861 8.47691609,6.07590158 7.13427382,6.51531104 Z" id="path4662-0-1-1-1-2-3" fill="url(#linearGradient-6)"></path>
<path d="M4.18662461,19.1345211 C4.18662461,19.1345211 8.91619432,13.453865 18.464318,12.7752126 C18.464318,12.7752126 5.4663571,13.3626448 4.37519243,17.0329287 C4.07183344,17.9154978 4.18662461,19.1345211 4.18662461,19.1345211 Z" id="path4442-5-0-9-4-6-0-96" fill="url(#linearGradient-7)"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
src/lib/data/icons/qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 466 B

BIN
src/lib/data/qupzilla.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

54
src/lib/data/qupzilla.svg
View File

@ -1,54 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" height="256" width="256" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<metadata id="license" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#">
<rdf:RDF>
<cc:Work rdf:about="qupzilla.svg">
<dc:description>qupzilla icon</dc:description>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:format>image/svg+xml</dc:format>
<dc:date>2018-01-10</dc:date>
<dc:creator>Konstantin Savun</dc:creator>
<cc:license rdf:resource="https://creativecommons.org/licenses/by-sa/4.0/legalcode"/>
<cc:attributionName rdf:resource="Konstantin Savun"/>
<cc:attributionURL rdf:resource="diablopc@linuxforum.tech"/>
</cc:Work>
</rdf:RDF>
</metadata>
<defs>
<linearGradient id="a">
<stop stop-color="#42baea" stop-opacity=".682" offset="0"/>
<stop stop-color="#42baea" stop-opacity="0" offset="1"/>
</linearGradient>
<radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="48.769" cx="111.56" gradientTransform="matrix(1.1114 -.01165 .016029 1.5292 -90.789 168.09)" r="30.678"/>
<radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="48.769" cx="111.56" gradientTransform="matrix(.83416 -.01258 .020275 1.3444 -60.063 177.2)" r="30.678"/>
<radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="48.769" cx="111.56" gradientTransform="matrix(.29588 .004193 -.0060614 .42772 1.2707 220.04)" r="30.678"/>
<filter id="h" style="color-interpolation-filters:sRGB" height="1.1531" width="1.0471" y="-.076546" x="-.023534">
<feGaussianBlur stdDeviation="0.54905952"/>
</filter>
<filter id="g" style="color-interpolation-filters:sRGB" height="1.0925" width="1.0589" y="-.046262" x="-.029464">
<feGaussianBlur stdDeviation="0.63799783"/>
</filter>
<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="48.463" cx="121.38" gradientTransform="matrix(1.0945 .20251 -.055937 .30232 -86.001 223.44)" r="27.996">
<stop stop-color="#f9fdfe" offset="0"/>
<stop stop-color="#f9fdfe" stop-opacity="0" offset="1"/>
</radialGradient>
<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="241.19" cx="33.78" gradientTransform="matrix(1 0 0 .61683 -.52917 92.416)" r="14.299">
<stop stop-color="#90d7f3" offset="0"/>
<stop stop-color="#90d7f3" stop-opacity="0" offset="1"/>
</radialGradient>
</defs>
<g transform="matrix(3.7665 0 0 3.7665 -4.5912 -863.44)">
<circle cy="263.1" cx="33.415" r="30.678" fill="#205ba0"/>
<circle cy="263.1" cx="33.415" r="30.678" fill="url(#b)"/>
<circle cy="263.1" cx="33.415" r="30.678" fill="url(#b)"/>
<circle cy="263.1" cx="33.415" r="30.678" fill="url(#e)"/>
<circle cy="263.1" cx="33.415" r="30.678" fill="url(#d)"/>
<ellipse opacity=".522" rx="14.299" ry="8.8203" cy="241.19" cx="33.251" fill="url(#c)"/>
<path opacity="0.762" d="m12.573 278.48c29.116-15.988 25.548 9.3595 55.993 0.32262-21.848-5.1627-24.909-19.769-49.116-13.798z" filter="url(#h)" fill="#424242"/>
<path fill="#7ed1f3" d="m11.794 277.83c29.116-15.988 25.548 9.3595 55.993 0.32263-21.848-5.1627-24.909-19.769-49.116-13.798z"/>
<path fill="url(#f)" d="m11.794 277.83c29.116-15.988 25.548 9.3595 55.993 0.32263-21.848-5.1627-24.909-19.769-49.116-13.798z"/>
<path opacity=".894" d="m12.072 278.58c10.706-11.287 22.16-21.931 47.892-20.289-15.759-6.2652-31.938-18.25-48.003-10.016-6.3997 13.964-4.0728 22.692 0.1109 30.306z" filter="url(#g)" fill="#5c5c5c"/>
<path fill="#fff" d="m11.561 277.93c10.706-11.287 22.16-21.931 47.892-20.289-15.759-6.2652-31.938-18.25-48.003-10.016-6.3997 13.964-4.0728 22.692 0.1109 30.306z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.7 KiB

2
src/lib/navigation/navigationbar.cpp
View File

@ -54,7 +54,7 @@ static QString titleForUrl(QString title, const QUrl &url)
static QIcon iconForPage(const QUrl &url, const QIcon &sIcon)
{
QIcon icon;
icon.addPixmap(url.scheme() == QL1S("falkon") ? QIcon(QSL(":icons/qupzilla.png")).pixmap(16) : IconProvider::iconForUrl(url).pixmap(16));
icon.addPixmap(IconProvider::iconForUrl(url).pixmap(16));
icon.addPixmap(sIcon.pixmap(16), QIcon::Active);
return icon;
}

2
src/lib/other/updater.cpp
View File

@ -148,7 +148,7 @@ void Updater::downCompleted()
Version updated(html);
if (current.isValid && updated.isValid && current < updated) {
mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzilla.png"), tr("Update available"), tr("New version of Falkon is ready to download."));
mApp->desktopNotifications()->showNotification(QIcon(":icons/falkon.svg").pixmap(48), tr("Update available"), tr("New version of Falkon is ready to download."));
}
}

17
src/main/CMakeLists.txt
View File

@ -20,7 +20,7 @@ if (APPLE)
set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/main/Info.plist)
set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.falkon")
set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Falkon")
install(FILES lib/data/icons/exeicons/qupzilla.icns DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
install(FILES lib/data/icons/exeicons/falkon.icns DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
#install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/locale DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/plugins DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
@ -37,15 +37,16 @@ if (UNIX AND NOT APPLE)
install(PROGRAMS ../../linux/applications/org.kde.falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES ../../linux/pixmaps/qupzilla.png DESTINATION ${KDE_INSTALL_DATADIR}/pixmaps)
install(FILES ../../linux/pixmaps/falkon.png DESTINATION ${KDE_INSTALL_DATADIR}/pixmaps)
ecm_install_icons(ICONS
../../linux/hicolor/16-apps-qupzilla.png
../../linux/hicolor/32-apps-qupzilla.png
../../linux/hicolor/48-apps-qupzilla.png
../../linux/hicolor/64-apps-qupzilla.png
../../linux/hicolor/128-apps-qupzilla.png
../../linux/hicolor/256-apps-qupzilla.png
../../linux/hicolor/16-apps-falkon.png
../../linux/hicolor/32-apps-falkon.png
../../linux/hicolor/48-apps-falkon.png
../../linux/hicolor/64-apps-falkon.png
../../linux/hicolor/128-apps-falkon.png
../../linux/hicolor/256-apps-falkon.png
../../linux/hicolor/sc-apps-falkon.svg
DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
install(FILES ../../linux/completion/falkon DESTINATION ${KDE_INSTALL_DATADIR}/bash-completion/completions)

2
src/main/appicon.rc
View File

@ -1,6 +1,6 @@
#include "winver.h"
IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\falkon.ico"
IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"
VS_VERSION_INFO VERSIONINFO

2
src/main/appicon_os2.rc
View File

@ -1,2 +0,0 @@
ICON 1 "../lib/data/icons/exeicons/qupzilla_os2.ico"
ICON 2 "../lib/data/icons/exeicons/page_os2.ico"

2
src/plugins/TestPlugin/testplugin.cpp
View File

@ -124,7 +124,7 @@ void TestPlugin::showSettings(QWidget* parent)
m_settings.data()->setAttribute(Qt::WA_DeleteOnClose);
m_settings.data()->setWindowTitle(tr("Example Plugin Settings"));
m_settings.data()->setWindowIcon(QIcon(":qupzilla.png"));
m_settings.data()->setWindowIcon(QIcon(":icons/falkon.svg"));
connect(closeButton, SIGNAL(clicked()), m_settings.data(), SLOT(close()));
}