Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复部分命令无法执行的问题

Browse Source 
调用QProcess::startDetached异步执行的时候，需要将命令和参数分隔，保证该命令正确执行

Log: 修复部分命令无法执行的问题
Influence: 任务栏关机命令观察是否正常执行
Task: https://pms.uniontech.com/task-view-213403.html
Change-Id: I63d3a9629dce9becdfc4dcbe476b438070def5bf
This commit is contained in:
donghualin 2022-11-10 01:11:28 +00:00
parent 7c2f2b38ea
commit ad56764f49
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frame/item/components/multiquickitem.cpp
View File

@ -63,9 +63,12 @@ bool MultiQuickItem::eventFilter(QObject *obj, QEvent *event)
Q_EMIT requestShowChildWidget(widget); Q_EMIT requestShowChildWidget(widget);
} else if (obj == this) { } else if (obj == this) {
const QString &command = pluginItem()->itemCommand(itemKey()); QStringList commandArgumend = pluginItem()->itemCommand(itemKey()).split(" ");
if (!command.isEmpty()) if (commandArgumend.size() > 0) {
QProcess::startDetached(command, QStringList()); QString command = commandArgumend.first();
commandArgumend.removeFirst();
QProcess::startDetached(command, commandArgumend);
}
} }
} else if (event->type() == QEvent::Resize) { } else if (event->type() == QEvent::Resize) {
QLabel *labelWidget = qobject_cast<QLabel *>(obj); QLabel *labelWidget = qobject_cast<QLabel *>(obj);

9
frame/item/components/singlequickitem.cpp
View File

@ -48,9 +48,12 @@ QuickSettingItem::QuickSettingType SingleQuickItem::type() const
void SingleQuickItem::mouseReleaseEvent(QMouseEvent *event) void SingleQuickItem::mouseReleaseEvent(QMouseEvent *event)
{ {
Q_UNUSED(event); Q_UNUSED(event);
const QString &command = pluginItem()->itemCommand(itemKey()); QStringList commandArgument = pluginItem()->itemCommand(itemKey()).split(" ");
if (!command.isEmpty()) if (commandArgument.size() > 0) {
QProcess::startDetached(command, QStringList()); QString command = commandArgument.first();
commandArgument.removeFirst();
QProcess::startDetached(command, commandArgument);
}
QWidget *itemWidget = pluginItem()->itemWidget(QUICK_ITEM_KEY); QWidget *itemWidget = pluginItem()->itemWidget(QUICK_ITEM_KEY);
if (itemWidget) if (itemWidget)

8
frame/window/systempluginwindow.cpp
View File

@ -376,9 +376,11 @@ void StretchPluginsItem::mouseReleaseEvent(QMouseEvent *e)
void StretchPluginsItem::mouseClick() void StretchPluginsItem::mouseClick()
{ {
const QString command = m_pluginInter->itemCommand(m_itemKey); QStringList commandArgument = m_pluginInter->itemCommand(m_itemKey).split(" ");
if (!command.isEmpty()) { if (commandArgument.size() > 0) {
QProcess::startDetached(command, QStringList()); QString command = commandArgument.first();
commandArgument.removeFirst();
QProcess::startDetached(command, commandArgument);
return; return;
} }