openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

修改应用搜索插件接口图标返回格式

This commit is contained in:
iaom 2023-02-27 13:45:28 +08:00
parent 9b835b9686
commit e53d13c54b
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsearch/appsearch/app-search-plugin.cpp
View File

@ -2,6 +2,7 @@
#include <gio/gdesktopappinfo.h> #include <gio/gdesktopappinfo.h>
#include <QWidget> #include <QWidget>
#include <QLabel> #include <QLabel>
#include <qt5xdg/XdgIcon>
#include "file-utils.h" #include "file-utils.h"
using namespace UkuiSearch; using namespace UkuiSearch;
@ -172,13 +173,7 @@ void AppSearchPlugin::run()
SearchPluginIface::ResultInfo ri; SearchPluginIface::ResultInfo ri;
ri.actionKey = oneResult.getExtral().at(0).toString(); ri.actionKey = oneResult.getExtral().at(0).toString();
ri.name = oneResult.getExtral().at(1).toString(); ri.name = oneResult.getExtral().at(1).toString();
QIcon icon = oneResult.getExtral().at(2).value<QIcon>(); ri.icon = XdgIcon::fromTheme(oneResult.getExtral().at(2).toString(), QIcon(":/res/icons/unknown.svg"));
if(icon.isNull()) {
ri.icon = QIcon(":/res/icons/unknown.svg");
} else {
ri.icon = icon;
}
SearchPluginIface::DescriptionInfo description; SearchPluginIface::DescriptionInfo description;
description.key = QString(tr("Application Description:")); description.key = QString(tr("Application Description:"));
description.value = oneResult.getExtral().at(3).toString(); description.value = oneResult.getExtral().at(3).toString();

3
libsearch/searchinterface/searchtasks/app-search-task.cpp
View File

@ -1,7 +1,6 @@
#include "app-search-task.h" #include "app-search-task.h"
#include "index-status-recorder.h" #include "index-status-recorder.h"
#include "common.h" #include "common.h"
#include <qt5xdg/XdgIcon>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QQueue> #include <QQueue>
@ -81,7 +80,7 @@ void AppSearchWorker::run()
info << QVariant(results.at(i*3 + 1)); info << QVariant(results.at(i*3 + 1));
} }
if (dataType & UkuiSearch::ApplicationIconName) { if (dataType & UkuiSearch::ApplicationIconName) {
info << QVariant(XdgIcon::fromTheme(results.at(i*3 + 2))); info << QVariant(results.at(i*3 + 2));
} }
if (dataType & UkuiSearch::ApplicationDescription) {//本地应用暂无简介 if (dataType & UkuiSearch::ApplicationDescription) {//本地应用暂无简介
info << QVariant(QString()); info << QVariant(QString());