mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 17:33:05 +00:00
1691e7188c
原来的TrayManagerWindow的类是放到MainPanelWindow类里面作为它的一部分，导致窗管在显示的时候有很多问题 修改方案： 1、将左右侧区域拆分成两个窗体，让它们继承自相同的基类MainWindowBase。 2、左右区域公共的部分，例如圆角、展示区域、动画获取等，都在基类中实现或者通过接口返回 3、增加WindowManager类，管理所有的界面，WindowManager类无需知道具体子类的指针，只需要根据相应的接口来获取即可 4、所有的界面类在main.cpp中创建，调用WindowManager对象设置 5、拆分MultiScreenWorker类，使MultiScreenWorker类只关心任务栏相关的逻辑，无需关心窗体或界面 Log: 优化任务栏的显示问题 Influence: 打开任务栏，观察时尚模式下圆角，左右侧区域中间是否连接在一起等 Bug: https://pms.uniontech.com/bug-view-137267.html Bug: https://pms.uniontech.com/bug-view-140029.html Bug: https://pms.uniontech.com/bug-view-134527.html Bug: https://pms.uniontech.com/bug-view-146743.html Bug: https://pms.uniontech.com/bug-view-150293.html Change-Id: I4266f6f8c983f61258b92834d93cdacd0221d7de
192 lines
9.7 KiB
C++
192 lines
9.7 KiB
C++
#include "accessibledefine.h"
|
||
|
||
#include "mainwindow.h"
|
||
#include "mainpanelcontrol.h"
|
||
#include "desktop_widget.h"
|
||
#include "tipswidget.h"
|
||
#include "dockpopupwindow.h"
|
||
#include "dragwidget.h"
|
||
|
||
#include "launcheritem.h"
|
||
#include "appitem.h"
|
||
#include "components/previewcontainer.h"
|
||
#include "pluginsitem.h"
|
||
#include "traypluginitem.h"
|
||
#include "placeholderitem.h"
|
||
#include "components/appdragwidget.h"
|
||
#include "components/appsnapshot.h"
|
||
#include "components/floatingpreview.h"
|
||
|
||
#include "snitraywidget.h"
|
||
#include "abstracttraywidget.h"
|
||
#include "indicatortraywidget.h"
|
||
#include "xembedtraywidget.h"
|
||
#include "system-trays/systemtrayitem.h"
|
||
#include "fashiontray/fashiontrayitem.h"
|
||
#include "fashiontray/fashiontraywidgetwrapper.h"
|
||
#include "fashiontray/fashiontraycontrolwidget.h"
|
||
#include "fashiontray/containers/attentioncontainer.h"
|
||
#include "fashiontray/containers/holdcontainer.h"
|
||
#include "fashiontray/containers/normalcontainer.h"
|
||
#include "fashiontray/containers/spliteranimated.h"
|
||
|
||
// 这部分由sound插件单独维护,这样做是因为在标记volumeslider这个类时,需要用到其setValue的实现,
|
||
// 但插件的源文件dock这边并没有包含,不想引入复杂的包含关系,其实最好的做法就是像sound插件这样,谁维护谁的
|
||
//#include "../plugins/sound/sounditem.h"
|
||
//#include "../plugins/sound/soundapplet.h"
|
||
//#include "../plugins/sound/sinkinputwidget.h"
|
||
//#include "../plugins/sound/componments/volumeslider.h"
|
||
//#include "../plugins/sound/componments/horizontalseparator.h"
|
||
|
||
#include "showdesktopwidget.h"
|
||
#include "datetimewidget.h"
|
||
#include "onboarditem.h"
|
||
#include "trashwidget.h"
|
||
#include "popupcontrolwidget.h"
|
||
#include "shutdownwidget.h"
|
||
#include "multitaskingwidget.h"
|
||
#include "overlaywarningwidget.h"
|
||
#include "horizontalseperator.h"
|
||
|
||
#include <DIconButton>
|
||
#include <DSwitchButton>
|
||
#include <DPushButton>
|
||
#include <DListView>
|
||
#include <DSwitchButton>
|
||
#include <DSpinner>
|
||
#include <dloadingindicator.h>
|
||
|
||
#include <QScrollBar>
|
||
|
||
DWIDGET_USE_NAMESPACE
|
||
using namespace Dock;
|
||
|
||
// 添加accessible
|
||
SET_FORM_ACCESSIBLE(MainWindow, "mainwindow")
|
||
SET_BUTTON_ACCESSIBLE(MainPanelControl, "mainpanelcontrol")
|
||
SET_LABEL_ACCESSIBLE(TipsWidget, "tips")
|
||
SET_FORM_ACCESSIBLE(DockPopupWindow, "popupwindow")
|
||
SET_BUTTON_ACCESSIBLE(LauncherItem, "launcheritem")
|
||
SET_BUTTON_ACCESSIBLE(AppItem, "appitem")
|
||
SET_BUTTON_ACCESSIBLE(PreviewContainer, "previewcontainer")
|
||
SET_BUTTON_ACCESSIBLE(PluginsItem, m_w->pluginName())
|
||
SET_BUTTON_ACCESSIBLE(TrayPluginItem, m_w->pluginName())
|
||
SET_BUTTON_ACCESSIBLE(PlaceholderItem, "placeholderitem")
|
||
SET_BUTTON_ACCESSIBLE(AppDragWidget, "appdragwidget")
|
||
SET_BUTTON_ACCESSIBLE(AppSnapshot, "appsnapshot")
|
||
SET_BUTTON_ACCESSIBLE(FloatingPreview, "floatingpreview")
|
||
SET_BUTTON_ACCESSIBLE(XEmbedTrayWidget, m_w->itemKeyForConfig().replace("sni:", ""))
|
||
SET_BUTTON_ACCESSIBLE(IndicatorTrayWidget, m_w->itemKeyForConfig().replace("sni:", ""))
|
||
SET_BUTTON_ACCESSIBLE(SNITrayWidget, m_w->itemKeyForConfig().replace("sni:", ""))
|
||
SET_BUTTON_ACCESSIBLE(AbstractTrayWidget, m_w->itemKeyForConfig().replace("sni:", ""))
|
||
SET_BUTTON_ACCESSIBLE(SystemTrayItem, m_w->itemKeyForConfig().replace("sni:", ""))
|
||
SET_FORM_ACCESSIBLE(FashionTrayItem, "fashiontrayitem")
|
||
SET_FORM_ACCESSIBLE(FashionTrayWidgetWrapper, "fashiontraywrapper")
|
||
SET_BUTTON_ACCESSIBLE(FashionTrayControlWidget, "fashiontraycontrolwidget")
|
||
SET_FORM_ACCESSIBLE(AttentionContainer, "attentioncontainer")
|
||
SET_FORM_ACCESSIBLE(HoldContainer, "holdcontainer")
|
||
SET_FORM_ACCESSIBLE(NormalContainer, "normalcontainer")
|
||
SET_FORM_ACCESSIBLE(SpliterAnimated, "spliteranimated")
|
||
SET_FORM_ACCESSIBLE(DatetimeWidget, "plugin-datetime")
|
||
SET_FORM_ACCESSIBLE(OnboardItem, "plugin-onboard")
|
||
SET_FORM_ACCESSIBLE(TrashWidget, "plugin-trash")
|
||
SET_BUTTON_ACCESSIBLE(PopupControlWidget, "popupcontrolwidget")
|
||
SET_FORM_ACCESSIBLE(ShutdownWidget, "plugin-shutdown")
|
||
SET_FORM_ACCESSIBLE(MultitaskingWidget, "plugin-multitasking")
|
||
SET_FORM_ACCESSIBLE(ShowDesktopWidget, "plugin-showdesktop")
|
||
SET_FORM_ACCESSIBLE(OverlayWarningWidget, "plugin-overlaywarningwidget")
|
||
SET_FORM_ACCESSIBLE(QWidget, m_w->objectName().isEmpty() ? "widget" : m_w->objectName())
|
||
SET_LABEL_ACCESSIBLE(QLabel, m_w->objectName() == "notifications" ? m_w->objectName() : m_w->text().isEmpty() ? m_w->objectName().isEmpty() ? "text" : m_w->objectName() : m_w->text())
|
||
SET_BUTTON_ACCESSIBLE(DIconButton, m_w->objectName().isEmpty() ? "imagebutton" : m_w->objectName())
|
||
SET_BUTTON_ACCESSIBLE(DSwitchButton, m_w->text().isEmpty() ? "switchbutton" : m_w->text())
|
||
SET_BUTTON_ACCESSIBLE(DesktopWidget, "desktopWidget");
|
||
SET_FORM_ACCESSIBLE(HorizontalSeperator, "HorizontalSeperator");
|
||
// 几个没什么用的标记，但为了提醒大家不要遗漏标记控件，还是不要去掉
|
||
SET_FORM_ACCESSIBLE(DBlurEffectWidget, "DBlurEffectWidget")
|
||
SET_FORM_ACCESSIBLE(DListView, "DListView")
|
||
SET_FORM_ACCESSIBLE(DLoadingIndicator, "DLoadingIndicator")
|
||
SET_FORM_ACCESSIBLE(DSpinner, "DSpinner")
|
||
SET_FORM_ACCESSIBLE(QMenu, "QMenu")
|
||
SET_FORM_ACCESSIBLE(QPushButton, "QPushButton")
|
||
SET_FORM_ACCESSIBLE(QSlider, "QSlider")
|
||
SET_FORM_ACCESSIBLE(QScrollBar, "QScrollBar")
|
||
SET_FORM_ACCESSIBLE(QScrollArea, "QScrollArea")
|
||
SET_FORM_ACCESSIBLE(QFrame, "QFrame")
|
||
SET_FORM_ACCESSIBLE(QGraphicsView, "QGraphicsView")
|
||
SET_FORM_ACCESSIBLE(DragWidget, "DragWidget")
|
||
|
||
QAccessibleInterface *accessibleFactory(const QString &classname, QObject *object)
|
||
{
|
||
// 自动化标记确定不需要的控件，方可加入忽略列表
|
||
const static QStringList ignoreLst = {"WirelessItem", "WiredItem", "SsidButton", "WirelessList", "AccessPointWidget"};
|
||
|
||
QAccessibleInterface *interface = nullptr;
|
||
|
||
USE_ACCESSIBLE(classname, MainWindow)
|
||
ELSE_USE_ACCESSIBLE(classname, MainPanelControl)
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dock::", ""), TipsWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, DockPopupWindow)
|
||
ELSE_USE_ACCESSIBLE(classname, LauncherItem)
|
||
ELSE_USE_ACCESSIBLE(classname, AppItem)
|
||
ELSE_USE_ACCESSIBLE(classname, PreviewContainer)
|
||
ELSE_USE_ACCESSIBLE(classname, PluginsItem)
|
||
ELSE_USE_ACCESSIBLE(classname, TrayPluginItem)
|
||
ELSE_USE_ACCESSIBLE(classname, PlaceholderItem)
|
||
ELSE_USE_ACCESSIBLE(classname, AppDragWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, AppSnapshot)
|
||
ELSE_USE_ACCESSIBLE(classname, FloatingPreview)
|
||
ELSE_USE_ACCESSIBLE(classname, SNITrayWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, AbstractTrayWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, SystemTrayItem)
|
||
ELSE_USE_ACCESSIBLE(classname, FashionTrayItem)
|
||
ELSE_USE_ACCESSIBLE(classname, FashionTrayWidgetWrapper)
|
||
ELSE_USE_ACCESSIBLE(classname, FashionTrayControlWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, AttentionContainer)
|
||
ELSE_USE_ACCESSIBLE(classname, HoldContainer)
|
||
ELSE_USE_ACCESSIBLE(classname, NormalContainer)
|
||
ELSE_USE_ACCESSIBLE(classname, SpliterAnimated)
|
||
ELSE_USE_ACCESSIBLE(classname, IndicatorTrayWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, XEmbedTrayWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, DesktopWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, DatetimeWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, OnboardItem)
|
||
ELSE_USE_ACCESSIBLE(classname, TrashWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, PopupControlWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, ShutdownWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, MultitaskingWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, ShowDesktopWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, OverlayWarningWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, QWidget)
|
||
ELSE_USE_ACCESSIBLE_BY_OBJECTNAME(classname, QLabel, "spliter_fix")
|
||
ELSE_USE_ACCESSIBLE_BY_OBJECTNAME(classname, QLabel, "spliter_app")
|
||
ELSE_USE_ACCESSIBLE_BY_OBJECTNAME(classname, QLabel, "spliter_tray")
|
||
ELSE_USE_ACCESSIBLE(classname, QLabel)
|
||
ELSE_USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DIconButton, "closebutton-2d")
|
||
ELSE_USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DIconButton, "closebutton-3d")
|
||
ELSE_USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DSwitchButton, "")
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dtk::Widget::", ""), DBlurEffectWidget)
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dtk::Widget::", ""), DListView)
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dtk::Widget::", ""), DLoadingIndicator)
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dtk::Widget::", ""), DSpinner)
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dtk::Widget::", ""), DSwitchButton)
|
||
ELSE_USE_ACCESSIBLE(QString(classname).replace("Dtk::Widget::", ""), DIconButton)
|
||
ELSE_USE_ACCESSIBLE(classname, QMenu)
|
||
ELSE_USE_ACCESSIBLE(classname, QPushButton)
|
||
ELSE_USE_ACCESSIBLE(classname, QSlider)
|
||
ELSE_USE_ACCESSIBLE(classname, QScrollBar)
|
||
ELSE_USE_ACCESSIBLE(classname, QScrollArea)
|
||
ELSE_USE_ACCESSIBLE(classname, QFrame)
|
||
ELSE_USE_ACCESSIBLE(classname, QGraphicsView)
|
||
ELSE_USE_ACCESSIBLE(classname, DragWidget)
|
||
ELSE_USE_ACCESSIBLE(classname, HorizontalSeperator);
|
||
|
||
if (!interface && object->inherits("QWidget") && !ignoreLst.contains(classname)) {
|
||
QWidget *w = static_cast<QWidget *>(object);
|
||
// 如果你看到这里的输出，说明代码中仍有控件未兼顾到accessible功能，请帮忙添加
|
||
if (w->accessibleName().isEmpty())
|
||
qWarning() << "accessibleFactory()" + QString("Class: " + classname + " cannot access");
|
||
}
|
||
|
||
return interface;
|
||
}
|