From c3a80a76144af6040554dd11fd88d4108c4e725a Mon Sep 17 00:00:00 2001
From: zhangjiaping <zhangjiaping@kylinos.cn>
Date: Wed, 10 Mar 2021 15:04:53 +0800
Subject: [PATCH] feat(frontend): Add app description.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description: 为未安装应用添加应用描述栏

Log: 为未安装应用添加应用描述栏
---
 libsearch/appsearch/app-match.cpp  |  4 ++--
 src/control/search-detail-view.cpp | 16 ++++++++++------
 src/control/search-detail-view.h   |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libsearch/appsearch/app-match.cpp b/libsearch/appsearch/app-match.cpp
index 577ae6b..45439f3 100644
--- a/libsearch/appsearch/app-match.cpp
+++ b/libsearch/appsearch/app-match.cpp
@@ -163,7 +163,7 @@ void AppMatch::getAllDesktopFilePath(QString path){
             if(!m_filePathList.contains(filePathStr)){
                 NameString appname;
                 appname.app_name = QString::fromLocal8Bit(name);
-                m_installAppMap.insert(appname,applist<<filePathStr<<QString::fromLocal8Bit(icon)<<"");
+                m_installAppMap.insert(appname,applist<<filePathStr<<QString::fromLocal8Bit(icon)<<""<<"");
             applist.clear();
             }
 //            m_filePathList.append(filePathStr);
@@ -327,7 +327,7 @@ void AppMatch::parseSoftWareCenterReturn(QList<QMap<QString,QString>> list,QMap<
          appdiscription=list.at(i).value("discription");
         appicon=list.at(i).value("icon");
         name.app_name = appname;
-        pkgname.isEmpty() ? softwarereturn.insert(name,applist<<""<<appicon<<appdiscription) : softwarereturn.insert(name,applist<<""<<appicon<<pkgname);
+        pkgname.isEmpty() ? softwarereturn.insert(name,applist<<""<<appicon<<appdiscription) : softwarereturn.insert(name,applist<<""<<appicon<<pkgname<<appdiscription);
         applist.clear();
     }
 }
diff --git a/src/control/search-detail-view.cpp b/src/control/search-detail-view.cpp
index 30c8eb9..406fa2f 100644
--- a/src/control/search-detail-view.cpp
+++ b/src/control/search-detail-view.cpp
@@ -131,7 +131,7 @@ void SearchDetailView::setWebWidget(const QString& keyword)
         m_webView->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);
         m_webView->setAttribute(Qt::WA_DeleteOnClose);
         m_webView->move(0, 0);
-        m_webView->setFixedSize(360, 522);
+        m_webView->setFixedSize(378, 522);
 
         connect(m_webView,&QWebEngineView::loadFinished, this, [ = ](){
             m_reload = true;
@@ -173,7 +173,7 @@ void SearchDetailView::setWebWidget(const QString& keyword)
     m_webView->show();
 }
 
-void SearchDetailView::setAppWidget(const QString &appname, const QString &path, const QString &iconpath)
+void SearchDetailView::setAppWidget(const QString &appname, const QString &path, const QString &iconpath, const QString &description)
 {
     m_type = SearchListView::ResType::App;
     m_path = path;
@@ -190,6 +190,12 @@ void SearchDetailView::setAppWidget(const QString &appname, const QString &path,
     if (path.isEmpty() || path == "") {
         icon = QIcon(iconpath);
         m_optionView->setupOptions(m_type, false);
+        //未安装应用有一个label显示软件描述
+        if (description != "" && !description.isEmpty()) {
+            m_detailFrame->show();
+            m_contentLabel->show();
+            m_contentLabel->setText(QString(tr("Introduction: %1")).arg(description));
+        }
     } else {
         m_optionView->setupOptions(m_type, true);
         if (QIcon::fromTheme(iconpath).isNull()) {
@@ -437,7 +443,7 @@ void SearchDetailView::initUI()
     m_layout->setContentsMargins(16, 60, 16, 24);
     this->setObjectName("detailView");
     this->setStyleSheet("QWidget#detailView{background:transparent;}");
-    this->setFixedWidth(360);
+    this->setFixedWidth(378);
 
     //图标和名称、分割线区域
     m_iconLabel = new QLabel(this);
@@ -562,9 +568,7 @@ bool SearchDetailView::addPanelShortcut(const QString& path) {
  * @return
  */
 bool SearchDetailView::openPathAction(const QString& path) {
-    QProcess process;
-    process.startDetached(QString("xdg-open %1").arg(path.left(path.lastIndexOf("/"))));
-    return true;
+    return QDesktopServices::openUrl(QUrl::fromLocalFile(path.left(path.lastIndexOf("/"))));
 }
 
 /**
diff --git a/src/control/search-detail-view.h b/src/control/search-detail-view.h
index bb2b658..2e13b33 100644
--- a/src/control/search-detail-view.h
+++ b/src/control/search-detail-view.h
@@ -44,7 +44,7 @@ public:
     int getType();
     bool isContent = false;
     void setWebWidget(const QString&);
-    void setAppWidget(const QString &name, const QString &path, const QString &icon);
+    void setAppWidget(const QString &name, const QString &path, const QString &icon, const QString &description);
     void closeWebWidget();
 
 protected: