mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 09:23:03 +00:00

语音助手中使用的类TipsWidget与任务栏项目中的同名类的实现不一样,导致符号冲突 解决方法是在任务栏的代码中加上命名空间, Log: 修复符号冲突导致的概率性崩溃问题 Bug: https://pms.uniontech.com/zentao/bug-view-35037.html
151 lines
7.3 KiB
C++
151 lines
7.3 KiB
C++
#include "accessibledefine.h"
|
|
|
|
#include "mainwindow.h"
|
|
#include "../panel/mainpanelcontrol.h"
|
|
#include "../../widgets/tipswidget.h"
|
|
#include "../util/dockpopupwindow.h"
|
|
|
|
#include "../item/launcheritem.h"
|
|
#include "../item/appitem.h"
|
|
#include "../item/components/previewcontainer.h"
|
|
#include "../item/pluginsitem.h"
|
|
#include "../item/traypluginitem.h"
|
|
#include "../item/placeholderitem.h"
|
|
#include "../item/components/appdragwidget.h"
|
|
#include "../item/components/appsnapshot.h"
|
|
#include "../item/components/floatingpreview.h"
|
|
|
|
#include "../plugins/tray/snitraywidget.h"
|
|
#include "../plugins/tray/indicatortraywidget.h"
|
|
#include "../plugins/tray/xembedtraywidget.h"
|
|
#include "../plugins/tray/system-trays/systemtrayitem.h"
|
|
#include "../plugins/tray/fashiontray/fashiontrayitem.h"
|
|
#include "../plugins/tray/fashiontray/fashiontraywidgetwrapper.h"
|
|
#include "../plugins/tray/fashiontray/fashiontraycontrolwidget.h"
|
|
#include "../plugins/tray/fashiontray/containers/attentioncontainer.h"
|
|
#include "../plugins/tray/fashiontray/containers/holdcontainer.h"
|
|
#include "../plugins/tray/fashiontray/containers/normalcontainer.h"
|
|
#include "../plugins/tray/fashiontray/containers/spliteranimated.h"
|
|
|
|
#include "../plugins/show-desktop/showdesktopwidget.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 "../plugins/datetime/datetimewidget.h"
|
|
#include "../plugins/onboard/onboarditem.h"
|
|
#include "../plugins/trash/trashwidget.h"
|
|
#include "../plugins/trash/popupcontrolwidget.h"
|
|
#include "../plugins/shutdown/shutdownwidget.h"
|
|
#include "../plugins/multitasking/multitaskingwidget.h"
|
|
#include "../plugins/overlay-warning/overlaywarningwidget.h"
|
|
|
|
#include <DIconButton>
|
|
#include <DSwitchButton>
|
|
#include <DPushButton>
|
|
|
|
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())
|
|
SET_BUTTON_ACCESSIBLE(IndicatorTrayWidget, m_w->itemKeyForConfig())
|
|
SET_BUTTON_ACCESSIBLE(SNITrayWidget, m_w->itemKeyForConfig())
|
|
SET_BUTTON_ACCESSIBLE(SystemTrayItem, m_w->itemKeyForConfig())
|
|
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_BUTTON_ACCESSIBLE(SoundItem, "plugin-sounditem")
|
|
//SET_FORM_ACCESSIBLE(SoundApplet, "soundapplet")
|
|
//SET_FORM_ACCESSIBLE(SinkInputWidget, "sinkinputwidget")
|
|
//SET_SLIDER_ACCESSIBLE(VolumeSlider, QAccessible::Slider, "volumeslider")
|
|
//SET_FORM_ACCESSIBLE(HorizontalSeparator, "horizontalseparator")
|
|
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->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");
|
|
QAccessibleInterface *accessibleFactory(const QString &classname, QObject *object)
|
|
{
|
|
QAccessibleInterface *interface = nullptr;
|
|
|
|
USE_ACCESSIBLE(classname, MainWindow);
|
|
USE_ACCESSIBLE(classname, MainPanelControl);
|
|
USE_ACCESSIBLE(classname, TipsWidget);
|
|
USE_ACCESSIBLE(classname, DockPopupWindow);
|
|
USE_ACCESSIBLE(classname, LauncherItem);
|
|
USE_ACCESSIBLE(classname, AppItem);
|
|
USE_ACCESSIBLE(classname, PreviewContainer);
|
|
USE_ACCESSIBLE(classname, PluginsItem);
|
|
USE_ACCESSIBLE(classname, TrayPluginItem);
|
|
USE_ACCESSIBLE(classname, PlaceholderItem);
|
|
USE_ACCESSIBLE(classname, AppDragWidget);
|
|
USE_ACCESSIBLE(classname, AppSnapshot);
|
|
USE_ACCESSIBLE(classname, FloatingPreview);
|
|
USE_ACCESSIBLE(classname, SNITrayWidget);
|
|
USE_ACCESSIBLE(classname, SystemTrayItem);
|
|
USE_ACCESSIBLE(classname, FashionTrayItem);
|
|
USE_ACCESSIBLE(classname, FashionTrayWidgetWrapper);
|
|
USE_ACCESSIBLE(classname, FashionTrayControlWidget);
|
|
USE_ACCESSIBLE(classname, AttentionContainer);
|
|
USE_ACCESSIBLE(classname, HoldContainer);
|
|
USE_ACCESSIBLE(classname, NormalContainer);
|
|
USE_ACCESSIBLE(classname, SpliterAnimated);
|
|
USE_ACCESSIBLE(classname, IndicatorTrayWidget);
|
|
USE_ACCESSIBLE(classname, XEmbedTrayWidget);
|
|
// USE_ACCESSIBLE(classname, SoundItem);
|
|
// USE_ACCESSIBLE(classname, SoundApplet);
|
|
// USE_ACCESSIBLE(classname, SinkInputWidget);
|
|
// USE_ACCESSIBLE(classname, VolumeSlider);
|
|
// USE_ACCESSIBLE(classname, HorizontalSeparator);
|
|
USE_ACCESSIBLE(classname, DesktopWidget);
|
|
USE_ACCESSIBLE(classname, DatetimeWidget);
|
|
USE_ACCESSIBLE(classname, OnboardItem);
|
|
USE_ACCESSIBLE(classname, TrashWidget);
|
|
USE_ACCESSIBLE(classname, PopupControlWidget);
|
|
USE_ACCESSIBLE(classname, ShutdownWidget);
|
|
USE_ACCESSIBLE(classname, MultitaskingWidget);
|
|
USE_ACCESSIBLE(classname, ShowDesktopWidget);
|
|
USE_ACCESSIBLE(classname, OverlayWarningWidget);
|
|
USE_ACCESSIBLE(classname, QWidget);
|
|
USE_ACCESSIBLE_BY_OBJECTNAME(classname, QLabel, "spliter_fix");
|
|
USE_ACCESSIBLE_BY_OBJECTNAME(classname, QLabel, "spliter_app");
|
|
USE_ACCESSIBLE_BY_OBJECTNAME(classname, QLabel, "spliter_tray");
|
|
USE_ACCESSIBLE(classname, QLabel);
|
|
USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DIconButton, "closebutton-2d");
|
|
USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DIconButton, "closebutton-3d");
|
|
USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DSwitchButton, "");
|
|
|
|
return interface;
|
|
}
|