From 6d28ca2edfa7eaae79bc631f7d518e2bfb277866 Mon Sep 17 00:00:00 2001 From: zhangjiaping Date: Fri, 25 Dec 2020 21:07:13 +0800 Subject: [PATCH 1/2] feat(searchPage): Add options to opearte search result. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: 添加对搜索结果的可执行操作 Log: 添加对搜索结果的可执行操作 --- control/search-detail-view.cpp | 85 +++++++++++++++++++++++++++++++--- src/mainwindow.cpp | 4 +- 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/control/search-detail-view.cpp b/control/search-detail-view.cpp index 68d3d9a..69a5d29 100644 --- a/control/search-detail-view.cpp +++ b/control/search-detail-view.cpp @@ -2,6 +2,15 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include SearchDetailView::SearchDetailView(QWidget *parent) : QWidget(parent) { @@ -75,7 +84,8 @@ void SearchDetailView::setupWidget(const int& type, const QString& path) { m_layout->addWidget(iconLabel); m_layout->addWidget(nameFrame); m_layout->addWidget(hLine); - m_layout->addWidget(optionView); + m_layout-> + addWidget(optionView); m_layout->addStretch(); //根据不同类型的搜索结果切换加载图片和名称的方式 @@ -144,33 +154,96 @@ void SearchDetailView::execActions(const int& type, const int& option, const QSt * @brief SearchDetailView::openAction 执行“打开”动作 * @return */ -bool SearchDetailView::openAction(const int&, const QString&) { +bool SearchDetailView::openAction(const int& type, const QString& path) { + switch (type) { + case SearchListView::ResType::App: { + GDesktopAppInfo * desktopAppInfo = g_desktop_app_info_new_from_filename(path.toLocal8Bit().data()); + g_app_info_launch(G_APP_INFO(desktopAppInfo),nullptr, nullptr, nullptr); + g_object_unref(desktopAppInfo); + return true; + break; + } + case SearchListView::ResType::Dir: + case SearchListView::ResType::File: { + QProcess * process = new QProcess; + process->start(QString("xdg-open %1").arg(path)); + connect(process, static_cast(&QProcess::finished), this, [ = ]() { + process->deleteLater(); + }); + return true; + break; + } + case SearchListView::ResType::Setting: { + //打开控制面板对应页面 + break; + } + default: + break; + } } /** * @brief SearchDetailView::addDesktopShortcut 添加到桌面快捷方式 * @return */ -bool SearchDetailView::addDesktopShortcut(const QString&) { +bool SearchDetailView::addDesktopShortcut(const QString& path) { + QString dirpath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); + QFileInfo fileInfo(path); + QString desktopfn = fileInfo.fileName(); + QFile file(path); + QString newName = QString(dirpath+"/"+desktopfn); + bool ret = file.copy(QString(dirpath+"/"+desktopfn)); + if(ret) + { + QProcess * process = new QProcess; + process->start(QString("chmod a+x %1").arg(newName)); + connect(process, static_cast(&QProcess::finished), this, [ = ]() { + process->deleteLater(); + }); + return true; + } + return false; } /** * @brief SearchDetailView::addPanelShortcut 添加到任务栏 * @return */ -bool SearchDetailView::addPanelShortcut(const QString&) { +bool SearchDetailView::addPanelShortcut(const QString& path) { + QDBusInterface iface("com.ukui.panel.desktop", + "/", + "com.ukui.panel.desktop", + QDBusConnection::sessionBus()); + if (iface.isValid()) { + QDBusReply isExist = iface.call("CheckIfExist",path); + if (isExist) { + qDebug()<<"qDebug: Add shortcut to panel failed, because it is already existed!"; + return false; + } + QDBusReply ret = iface.call("AddToTaskbar",path); + qDebug()<<"qDebug: Add shortcut to panel successed!"; + return true; + } } /** * @brief SearchDetailView::openPathAction 打开文件所在路径 * @return */ -bool SearchDetailView::openPathAction(const QString&) { +bool SearchDetailView::openPathAction(const QString& path) { + QProcess * process = new QProcess; + process->start(QString("xdg-open %1").arg(path.left(path.length() - path.lastIndexOf("/") + 1))); + connect(process, static_cast(&QProcess::finished), this, [ = ]() { + process->deleteLater(); + }); + return true; } /** * @brief SearchDetailView::copyPathAction 复制文件所在路径 * @return */ -bool SearchDetailView::copyPathAction(const QString&) { +bool SearchDetailView::copyPathAction(const QString& path) { + QClipboard * clipboard = QApplication::clipboard(); //获取系统剪贴板指针 + clipboard->setText(path); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6be9970..bb93b95 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -46,7 +46,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { //testBackServe - testTraverse(); +// testTraverse(); this->setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint); this->setAttribute(Qt::WA_TranslucentBackground, true); @@ -208,7 +208,7 @@ void MainWindow::searchContent(QString searchcontent){ //测试用数据 QStringList list; - list<<"/usr/share/applications/peony.desktop"<<"/usr/share/applications/fcitx.desktop"<<"/usr/share/applications/info.desktop"; + list<<"/usr/share/applications/peony.desktop"<<"/usr/share/applications/ukui-control-center.desktop"<<"/usr/share/applications/wps-office-pdf.desktop"; QStringList list2; list2<<"/home/zjp/下载/搜索结果.png"<<"/home/zjp/下载/显示不全.mp4"<<"/home/zjp/下载/dmesg.log"<<"/home/zjp/下载/WiFi_AP选择.docx"; QStringList list3; From 7221aee4c22a4714bcc700ce765863439f4f208a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=BD=B3=E8=90=8D?= <42267913+mammonsama666@users.noreply.github.com> Date: Sat, 26 Dec 2020 09:22:38 +0800 Subject: [PATCH 2/2] Update search-detail-view.cpp --- control/search-detail-view.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/control/search-detail-view.cpp b/control/search-detail-view.cpp index 69a5d29..de3cf8c 100644 --- a/control/search-detail-view.cpp +++ b/control/search-detail-view.cpp @@ -84,8 +84,7 @@ void SearchDetailView::setupWidget(const int& type, const QString& path) { m_layout->addWidget(iconLabel); m_layout->addWidget(nameFrame); m_layout->addWidget(hLine); - m_layout-> - addWidget(optionView); + m_layout->addWidget(optionView); m_layout->addStretch(); //根据不同类型的搜索结果切换加载图片和名称的方式