mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +00:00

修复dbus服务提供的xml数据中getPluginKey未设置返回值的问题 修复打开个性化配置页面,当任务栏位置、状态、模式发生变化时,未及时反映到界面上的问题 优化接口调用,避免同一数据反复触发dbus 按照需求更新页面文案内容 Log: Task: https://pms.uniontech.com/zentao/task-view-86358.html Change-Id: I598683dcf74711d6935f3c6c911e300967aa1199
200 lines
7.0 KiB
C++
200 lines
7.0 KiB
C++
/*
|
|
* Copyright (C) 2018 ~ 2020 Deepin Technology Co., Ltd.
|
|
*
|
|
* Author: fanpengcheng <fanpengcheng_cm@deepin.com>
|
|
*
|
|
* Maintainer: fanpengcheng <fanpengcheng_cm@deepin.com>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "menuworker.h"
|
|
#include "dockitemmanager.h"
|
|
#include "utils.h"
|
|
#include "displaymanager.h"
|
|
|
|
#include <QAction>
|
|
#include <QMenu>
|
|
#include <QGSettings>
|
|
|
|
#include <DApplication>
|
|
#include <DDBusSender>
|
|
|
|
#define DIS_INS DisplayManager::instance()
|
|
|
|
MenuWorker::MenuWorker(DBusDock *dockInter,QWidget *parent)
|
|
: QObject (parent)
|
|
, m_dockInter(dockInter)
|
|
, m_autoHide(true)
|
|
{
|
|
|
|
}
|
|
|
|
QMenu *MenuWorker::createMenu()
|
|
{
|
|
QMenu *settingsMenu = new QMenu;
|
|
settingsMenu->setAccessibleName("settingsmenu");
|
|
settingsMenu->setTitle("Settings Menu");
|
|
|
|
// 模式
|
|
const QGSettings *menuSettings = Utils::ModuleSettingsPtr("menu");
|
|
if (!menuSettings || !menuSettings->keys().contains("modeVisible") || menuSettings->get("modeVisible").toBool()) {
|
|
const DisplayMode displayMode = static_cast<DisplayMode>(m_dockInter->displayMode());
|
|
|
|
QMenu *modeSubMenu = new QMenu(settingsMenu);
|
|
modeSubMenu->setAccessibleName("modesubmenu");
|
|
|
|
QAction *fashionModeAct = new QAction(tr("Fashion Mode"), this);
|
|
QAction *efficientModeAct = new QAction(tr("Efficient Mode"), this);
|
|
|
|
fashionModeAct->setCheckable(true);
|
|
efficientModeAct->setCheckable(true);
|
|
|
|
fashionModeAct->setChecked(displayMode == Fashion);
|
|
efficientModeAct->setChecked(displayMode == Efficient);
|
|
|
|
connect(fashionModeAct, &QAction::triggered, this, [ = ]{ m_dockInter->setDisplayMode(DisplayMode::Fashion); });
|
|
connect(efficientModeAct, &QAction::triggered, this, [ = ]{ m_dockInter->setDisplayMode(DisplayMode::Efficient); });
|
|
|
|
modeSubMenu->addAction(fashionModeAct);
|
|
modeSubMenu->addAction(efficientModeAct);
|
|
|
|
QAction *act = new QAction(tr("Mode"), this);
|
|
act->setMenu(modeSubMenu);
|
|
|
|
settingsMenu->addAction(act);
|
|
}
|
|
|
|
// 位置
|
|
if (!menuSettings || !menuSettings->keys().contains("locationVisible") || menuSettings->get("locationVisible").toBool()) {
|
|
const Position position = static_cast<Position>(m_dockInter->position());
|
|
|
|
QMenu *locationSubMenu = new QMenu(settingsMenu);
|
|
locationSubMenu->setAccessibleName("locationsubmenu");
|
|
|
|
QAction *topPosAct = new QAction(tr("Top"), this);
|
|
QAction *bottomPosAct = new QAction(tr("Bottom"), this);
|
|
QAction *leftPosAct = new QAction(tr("Left"), this);
|
|
QAction *rightPosAct = new QAction(tr("Right"), this);
|
|
|
|
topPosAct->setCheckable(true);
|
|
bottomPosAct->setCheckable(true);
|
|
leftPosAct->setCheckable(true);
|
|
rightPosAct->setCheckable(true);
|
|
|
|
topPosAct->setChecked(position == Top);
|
|
bottomPosAct->setChecked(position == Bottom);
|
|
leftPosAct->setChecked(position == Left);
|
|
rightPosAct->setChecked(position == Right);
|
|
|
|
connect(topPosAct, &QAction::triggered, this, [ = ]{ m_dockInter->setPosition(Top); });
|
|
connect(bottomPosAct, &QAction::triggered, this, [ = ]{ m_dockInter->setPosition(Bottom); });
|
|
connect(leftPosAct, &QAction::triggered, this, [ = ]{ m_dockInter->setPosition(Left); });
|
|
connect(rightPosAct, &QAction::triggered, this, [ = ]{ m_dockInter->setPosition(Right); });
|
|
|
|
locationSubMenu->addAction(topPosAct);
|
|
locationSubMenu->addAction(bottomPosAct);
|
|
locationSubMenu->addAction(leftPosAct);
|
|
locationSubMenu->addAction(rightPosAct);
|
|
|
|
QAction *act = new QAction(tr("Location"), this);
|
|
act->setMenu(locationSubMenu);
|
|
|
|
settingsMenu->addAction(act);
|
|
}
|
|
|
|
// 状态
|
|
if (!menuSettings || !menuSettings->keys().contains("statusVisible") || menuSettings->get("statusVisible").toBool()) {
|
|
const HideMode hideMode = static_cast<HideMode>(m_dockInter->hideMode());
|
|
|
|
QMenu *statusSubMenu = new QMenu(settingsMenu);
|
|
statusSubMenu->setAccessibleName("statussubmenu");
|
|
|
|
QAction *keepShownAct = new QAction(tr("Keep Shown"), this);
|
|
QAction *keepHiddenAct = new QAction(tr("Keep Hidden"), this);
|
|
QAction *smartHideAct = new QAction(tr("Smart Hide"), this);
|
|
|
|
keepShownAct->setCheckable(true);
|
|
keepHiddenAct->setCheckable(true);
|
|
smartHideAct->setCheckable(true);
|
|
|
|
keepShownAct->setChecked(hideMode == KeepShowing);
|
|
keepHiddenAct->setChecked(hideMode == KeepHidden);
|
|
smartHideAct->setChecked(hideMode == SmartHide);
|
|
|
|
connect(keepShownAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(KeepShowing); });
|
|
connect(keepHiddenAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(KeepHidden); });
|
|
connect(smartHideAct, &QAction::triggered, this, [ = ]{ m_dockInter->setHideMode(SmartHide); });
|
|
|
|
statusSubMenu->addAction(keepShownAct);
|
|
statusSubMenu->addAction(keepHiddenAct);
|
|
statusSubMenu->addAction(smartHideAct);
|
|
|
|
QAction *act = new QAction(tr("Status"), this);
|
|
act->setMenu(statusSubMenu);
|
|
|
|
settingsMenu->addAction(act);
|
|
}
|
|
|
|
// 任务栏配置
|
|
if (!menuSettings || !menuSettings->keys().contains("settingVisible") || menuSettings->get("settingVisible").toBool()) {
|
|
QAction *act = new QAction(tr("Dock settings"), this);
|
|
connect(act, &QAction::triggered, this, &MenuWorker::onDockSettingsTriggered);
|
|
settingsMenu->addAction(act);
|
|
}
|
|
|
|
delete menuSettings;
|
|
menuSettings = nullptr;
|
|
return settingsMenu;
|
|
}
|
|
|
|
void MenuWorker::onDockSettingsTriggered()
|
|
{
|
|
DDBusSender().service("com.deepin.dde.ControlCenter")
|
|
.path("/com/deepin/dde/ControlCenter")
|
|
.interface("com.deepin.dde.ControlCenter")
|
|
.method("ShowPage")
|
|
.arg(QString("personalization"))
|
|
.arg(QString("Dock"))
|
|
.call();
|
|
}
|
|
|
|
void MenuWorker::showDockSettingsMenu()
|
|
{
|
|
// 菜单功能被禁用
|
|
static const QGSettings *setting = Utils::ModuleSettingsPtr("menu", QByteArray(), this);
|
|
if (setting && setting->keys().contains("enable") && !setting->get("enable").toBool()) {
|
|
return;
|
|
}
|
|
|
|
// 菜单将要被打开
|
|
setAutoHide(false);
|
|
|
|
QMenu *menu = createMenu();
|
|
menu->exec(QCursor::pos());
|
|
|
|
// 菜单已经关闭
|
|
setAutoHide(true);
|
|
delete menu;
|
|
menu = nullptr;
|
|
}
|
|
|
|
void MenuWorker::setAutoHide(const bool autoHide)
|
|
{
|
|
if (m_autoHide == autoHide)
|
|
return;
|
|
|
|
m_autoHide = autoHide;
|
|
emit autoHideChanged(m_autoHide);
|
|
}
|