p90463782
/
ukui-search
forked from openkylin/ukui-search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ukss-dev' into 'ukss-dev' 

网页搜索占位图替换，尺寸修改；

See merge request kylin-desktop/ukui-search!292
This commit is contained in:
PengfeiZhang 2022-04-18 09:42:02 +00:00
parent 6eecb71daf ad86d9b3ad
commit 70e35e4c38
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libsearch/res/icons/search-web-dark.svg
View File

@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="100px" height="95px" viewBox="0 0 100 95" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<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">
<title> Search-web-深色模式</title>
<g id="综合搜索SP2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.100000001">
<g id="搜索-网页-预览" transform="translate(-1404.000000, -393.000000)" fill="#FFFFFF">
<g id="-Search-web-深色模式" transform="translate(1404.000000, 393.000000)">
<path d="M62.5,35 C77.6878306,35 90,47.3121694 90,62.5 C90,68.6508474 87.9806435,74.3300488 84.5687305,78.9108043 L92.8847763,87.2279221 C94.4468735,88.7900192 94.4468735,91.3226791 92.8847763,92.8847763 C91.3226791,94.4468735 88.7900192,94.4468735 87.2279221,92.8847763 L78.9118053,84.5679849 C74.3308761,87.9803493 68.6512954,90 62.5,90 C47.3121694,90 35,77.6878306 35,62.5 C35,47.3121694 47.3121694,35 62.5,35 Z M62.5,43 C51.7304474,43 43,51.7304474 43,62.5 C43,73.2695526 51.7304474,82 62.5,82 C73.2695526,82 82,73.2695526 82,62.5 C82,51.7304474 73.2695526,43 62.5,43 Z" id="形状结合"></path>
<path d="M92,0 C96.418278,-8.11624501e-16 100,3.581722 100,8 L100,19 L0,19 L0,8 C-5.41083001e-16,3.581722 3.581722,8.11624501e-16 8,0 L92,0 Z M90.5,6 C88.5670034,6 87,7.56700338 87,9.5 C87,11.4329966 88.5670034,13 90.5,13 C92.4329966,13 94,11.4329966 94,9.5 C94,7.56700338 92.4329966,6 90.5,6 Z M78.5,6 C76.5670034,6 75,7.56700338 75,9.5 C75,11.4329966 76.5670034,13 78.5,13 C80.4329966,13 82,11.4329966 82,9.5 C82,7.56700338 80.4329966,6 78.5,6 Z M66.5,6 C64.5670034,6 63,7.56700338 63,9.5 C63,11.4329966 64.5670034,13 66.5,13 C68.4329966,13 70,11.4329966 70,9.5 C70,7.56700338 68.4329966,6 66.5,6 Z" id="形状结合"></path>
<path d="M92,19 L100,19 L100,39 C100,41.209139 98.209139,43 96,43 C93.790861,43 92,41.209139 92,39 L92,19 L92,19 Z" id="矩形备份"></path>
<path d="M8,19 L8,79.0141845 C8,81.1538477 9.68396847,82.900664 11.8003597,83.0045668 L12,83.0094564 L31,83.0094564 C33.209139,83.0094564 35,84.7982005 35,87.0047282 C35,89.1443914 33.3160315,90.8912076 31.1996403,90.9951105 L31,91 L12,91 C5.47454326,91 0.165607248,85.7976124 0.00379985776,79.3187988 L0,79.0141845 L0,19 L8,19 Z" id="路径-2" fill-rule="nonzero"></path>
<defs>
<linearGradient x1="50%" y1="100%" x2="50%" y2="90.6945655%" id="linearGradient-1">
<stop stop-color="#D4E8FF" stop-opacity="0.15" offset="0%"></stop>
<stop stop-color="#D4E8FF" stop-opacity="0.2" offset="100%"></stop>
</linearGradient>
</defs>
<g id="综合搜索SP2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="搜索-网页-预览" transform="translate(-1555.000000, -478.000000)">
<g id="-Search-web-深色模式" transform="translate(1555.000000, 478.000000)">
<rect id="矩形" x="0" y="0" width="128" height="128"></rect>
<path d="M14,36 L114,36 L114,107 C114,111.970563 109.970563,116 105,116 L23,116 C18.0294373,116 14,111.970563 14,107 L14,36 L14,36 Z" id="矩形" fill="url(#linearGradient-1)"></path>
<path d="M77.1694915,53 C91.0702179,53 102.338983,64.2687652 102.338983,78.1694915 C102.338983,83.8006309 100.48974,88.9998566 97.3654105,93.1930131 L104.505604,100.333085 C105.933956,101.761436 105.933956,104.077252 104.505604,105.505604 C103.077252,106.933956 100.761436,106.933956 99.3330846,105.505604 L92.1930131,98.3654105 C87.9998566,101.48974 82.8006309,103.338983 77.1694915,103.338983 C63.2687652,103.338983 52,92.0702179 52,78.1694915 C52,64.2687652 63.2687652,53 77.1694915,53 Z M77.1694915,60.3220339 C67.3126129,60.3220339 59.3220339,68.3126129 59.3220339,78.1694915 C59.3220339,88.0263702 67.3126129,96.0169492 77.1694915,96.0169492 C87.0263702,96.0169492 95.0169492,88.0263702 95.0169492,78.1694915 C95.0169492,68.3126129 87.0263702,60.3220339 77.1694915,60.3220339 Z" id="形状结合" fill-opacity="0.2" fill="#D4E8FF"></path>
<path d="M22,17 L106,17 C110.418278,17 114,20.581722 114,25 L114,36 L114,36 L14,36 L14,25 C14,20.581722 17.581722,17 22,17 Z" id="形状结合" fill-opacity="0.4" fill="#D4E8FF"></path>
<path d="M80.5,23 C82.4329966,23 84,24.5670034 84,26.5 C84,28.4329966 82.4329966,30 80.5,30 C78.5670034,30 77,28.4329966 77,26.5 C77,24.5670034 78.5670034,23 80.5,23 Z M92.5,23 C94.4329966,23 96,24.5670034 96,26.5 C96,28.4329966 94.4329966,30 92.5,30 C90.5670034,30 89,28.4329966 89,26.5 C89,24.5670034 90.5670034,23 92.5,23 Z M104.5,23 C106.432997,23 108,24.5670034 108,26.5 C108,28.4329966 106.432997,30 104.5,30 C102.567003,30 101,28.4329966 101,26.5 C101,24.5670034 102.567003,23 104.5,23 Z" id="形状结合" fill-opacity="0.5" fill="#D4E8FF"></path>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

27
libsearch/res/icons/search-web-default.svg
View File

@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="100px" height="95px" viewBox="0 0 100 95" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<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">
<title> Search-web-浅色模式</title>
<g id="综合搜索SP2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.100000001">
<g id="搜索-网页-预览" transform="translate(-1058.000000, -394.000000)" fill="#262626">
<g id="编组" transform="translate(620.000000, 161.000000)">
<g id="编组-12备份-2" transform="translate(8.000000, 66.000000)">
<g id="-Search-web-浅色模式" transform="translate(430.000000, 167.000000)">
<path d="M62.5,35 C77.6878306,35 90,47.3121694 90,62.5 C90,68.6508474 87.9806435,74.3300488 84.5687305,78.9108043 L92.8847763,87.2279221 C94.4468735,88.7900192 94.4468735,91.3226791 92.8847763,92.8847763 C91.3226791,94.4468735 88.7900192,94.4468735 87.2279221,92.8847763 L78.9118053,84.5679849 C74.3308761,87.9803493 68.6512954,90 62.5,90 C47.3121694,90 35,77.6878306 35,62.5 C35,47.3121694 47.3121694,35 62.5,35 Z M62.5,43 C51.7304474,43 43,51.7304474 43,62.5 C43,73.2695526 51.7304474,82 62.5,82 C73.2695526,82 82,73.2695526 82,62.5 C82,51.7304474 73.2695526,43 62.5,43 Z" id="形状结合"></path>
<path d="M92,0 C96.418278,-8.11624501e-16 100,3.581722 100,8 L100,19 L0,19 L0,8 C-5.41083001e-16,3.581722 3.581722,8.11624501e-16 8,0 L92,0 Z M90.5,6 C88.5670034,6 87,7.56700338 87,9.5 C87,11.4329966 88.5670034,13 90.5,13 C92.4329966,13 94,11.4329966 94,9.5 C94,7.56700338 92.4329966,6 90.5,6 Z M78.5,6 C76.5670034,6 75,7.56700338 75,9.5 C75,11.4329966 76.5670034,13 78.5,13 C80.4329966,13 82,11.4329966 82,9.5 C82,7.56700338 80.4329966,6 78.5,6 Z M66.5,6 C64.5670034,6 63,7.56700338 63,9.5 C63,11.4329966 64.5670034,13 66.5,13 C68.4329966,13 70,11.4329966 70,9.5 C70,7.56700338 68.4329966,6 66.5,6 Z" id="形状结合"></path>
<path d="M92,19 L100,19 L100,39 C100,41.209139 98.209139,43 96,43 C93.790861,43 92,41.209139 92,39 L92,19 L92,19 Z" id="矩形备份"></path>
<path d="M8,19 L8,79.0141845 C8,81.1538477 9.68396847,82.900664 11.8003597,83.0045668 L12,83.0094564 L31,83.0094564 C33.209139,83.0094564 35,84.7982005 35,87.0047282 C35,89.1443914 33.3160315,90.8912076 31.1996403,90.9951105 L31,91 L12,91 C5.47454326,91 0.165607248,85.7976124 0.00379985776,79.3187988 L0,79.0141845 L0,19 L8,19 Z" id="路径-2" fill-rule="nonzero"></path>
</g>
</g>
<defs>
<linearGradient x1="50%" y1="82.1875396%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#425369" stop-opacity="0.08" offset="0%"></stop>
<stop stop-color="#425369" stop-opacity="0.2" offset="100%"></stop>
</linearGradient>
</defs>
<g id="综合搜索SP2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="搜索-网页-预览" transform="translate(-570.000000, -340.000000)">
<g id="-Search-web-浅色模式" transform="translate(570.000000, 340.000000)">
<rect id="矩形" x="0" y="0" width="128" height="128"></rect>
<path d="M14,36 L114,36 L114,107 C114,111.970563 109.970563,116 105,116 L23,116 C18.0294373,116 14,111.970563 14,107 L14,36 L14,36 Z" id="矩形" fill="url(#linearGradient-1)"></path>
<path d="M77.1694915,53 C91.0702179,53 102.338983,64.2687652 102.338983,78.1694915 C102.338983,83.8006309 100.48974,88.9998566 97.3654105,93.1930131 L104.505604,100.333085 C105.933956,101.761436 105.933956,104.077252 104.505604,105.505604 C103.077252,106.933956 100.761436,106.933956 99.3330846,105.505604 L92.1930131,98.3654105 C87.9998566,101.48974 82.8006309,103.338983 77.1694915,103.338983 C63.2687652,103.338983 52,92.0702179 52,78.1694915 C52,64.2687652 63.2687652,53 77.1694915,53 Z M77.1694915,60.3220339 C67.3126129,60.3220339 59.3220339,68.3126129 59.3220339,78.1694915 C59.3220339,88.0263702 67.3126129,96.0169492 77.1694915,96.0169492 C87.0263702,96.0169492 95.0169492,88.0263702 95.0169492,78.1694915 C95.0169492,68.3126129 87.0263702,60.3220339 77.1694915,60.3220339 Z" id="形状结合" fill-opacity="0.2" fill="#425369"></path>
<path d="M22,17 L106,17 C110.418278,17 114,20.581722 114,25 L114,36 L114,36 L14,36 L14,25 C14,20.581722 17.581722,17 22,17 Z" id="形状结合" fill-opacity="0.4" fill="#425369"></path>
<path d="M80.5,23 C82.4329966,23 84,24.5670034 84,26.5 C84,28.4329966 82.4329966,30 80.5,30 C78.5670034,30 77,28.4329966 77,26.5 C77,24.5670034 78.5670034,23 80.5,23 Z M92.5,23 C94.4329966,23 96,24.5670034 96,26.5 C96,28.4329966 94.4329966,30 92.5,30 C90.5670034,30 89,28.4329966 89,26.5 C89,24.5670034 90.5670034,23 92.5,23 Z M104.5,23 C106.432997,23 108,24.5670034 108,26.5 C108,28.4329966 106.432997,30 104.5,30 C102.567003,30 101,28.4329966 101,26.5 C101,24.5670034 102.567003,23 104.5,23 Z" id="形状结合" fill-opacity="0.6" fill="#FFFFFF"></path>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

14
libsearch/websearch/web-search-plugin.cpp
View File

@ -94,16 +94,16 @@ void UkuiSearch::WebSearchPlugin::initDetailPage()
m_iconLabel->setAlignment(Qt::AlignCenter);
QString type = GlobalSettings::getInstance()->getValue(STYLE_NAME_KEY).toString();
if (type == "ukui-dark") {
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-dark.svg").pixmap(100, 96));
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-dark.svg").pixmap(128, 128));
} else {
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-default.svg").pixmap(100, 96));
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-default.svg").pixmap(128, 128));
}
connect(qApp, &QApplication::paletteChanged, this, [=] () {
QString type = GlobalSettings::getInstance()->getValue(STYLE_NAME_KEY).toString();
if (type == "ukui-dark") {
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-dark.svg").pixmap(100, 96));
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-dark.svg").pixmap(128, 128));
} else {
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-default.svg").pixmap(100, 96));
m_iconLabel->setPixmap(QIcon(":/res/icons/search-web-default.svg").pixmap(128, 128));
}
});
@ -114,12 +114,12 @@ void UkuiSearch::WebSearchPlugin::initDetailPage()
m_actionLabel1 = new ActionLabel(tr("Start browser search"), m_currentActionKey, m_actionFrame);
m_actionLabel1->adjustSize();
m_actionFrameLyt->addWidget(m_actionLabel1);;
m_actionFrameLyt->addWidget(m_actionLabel1);
m_actionFrame->setLayout(m_actionFrameLyt);
m_detailLyt->addSpacing(166);
m_detailLyt->addSpacing(146);
m_detailLyt->addWidget(m_iconLabel);
m_detailLyt->addSpacing(6);
//m_detailLyt->addSpacing(6);
m_detailLyt->addWidget(m_actionFrame);
m_detailPage->setLayout(m_detailLyt);
m_detailLyt->addStretch();