From 06ac0b986aa35824cf90710534dca2a71d2ba643 Mon Sep 17 00:00:00 2001 From: fpc_diesel Date: Wed, 6 May 2020 17:28:16 +0800 Subject: [PATCH] feat(accessible):Unified naming && set overlaywarningwidget accessible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 统一命名方式,所有的控件均以统一,添加overlaywarningwidget的accessible代码 --- frame/item/appitem.cpp | 2 +- frame/item/components/appsnapshot.cpp | 3 +- frame/item/components/floatingpreview.cpp | 2 +- frame/panel/mainpanelcontrol.cpp | 14 +- frame/util/docksettings.cpp | 2 +- frame/window/accessible.h | 90 +++++----- frame/window/accessibledefine.h | 159 +++++++++--------- frame/window/mainwindow.cpp | 2 +- .../overlay-warning/overlaywarningwidget.cpp | 1 + .../overlay-warning/overlaywarningwidget.h | 11 +- 10 files changed, 144 insertions(+), 142 deletions(-) diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp index 76a9fe947..a19c88a1e 100644 --- a/frame/item/appitem.cpp +++ b/frame/item/appitem.cpp @@ -104,7 +104,7 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent) m_active = m_itemEntryInter->isActive(); m_appNameTips->setObjectName("AppItemTips"); - m_appNameTips->setAccessibleName(m_itemEntryInter->name() + "-tips"); + m_appNameTips->setAccessibleName(m_itemEntryInter->name()); m_appNameTips->setVisible(false); m_appNameTips->installEventFilter(this); diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index 83e52e215..388f5027f 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -60,13 +60,12 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent) , m_wmHelper(DWindowManagerHelper::instance()) { m_closeBtn2D->setFixedSize(24, 24); - m_closeBtn2D->setAccessibleName("closebutton-2d"); + m_closeBtn2D->setObjectName("closebutton-2d"); m_closeBtn2D->setNormalPic(":/icons/resources/close_round_normal.svg"); m_closeBtn2D->setHoverPic(":/icons/resources/close_round_hover.svg"); m_closeBtn2D->setPressPic(":/icons/resources/close_round_press.svg"); m_closeBtn2D->setVisible(false); m_title->setObjectName("AppSnapshotTitle"); - m_title->setAccessibleName("AppSnapshotTitle"); QHBoxLayout *centralLayout = new QHBoxLayout; centralLayout->addWidget(m_title); diff --git a/frame/item/components/floatingpreview.cpp b/frame/item/components/floatingpreview.cpp index 9cd098116..f042938dc 100644 --- a/frame/item/components/floatingpreview.cpp +++ b/frame/item/components/floatingpreview.cpp @@ -38,7 +38,7 @@ FloatingPreview::FloatingPreview(QWidget *parent) , m_closeBtn3D(new DImageButton) , m_titleBtn(new DPushButton) { - m_closeBtn3D->setAccessibleName("closebutton-3d"); + m_closeBtn3D->setObjectName("closebutton-3d"); m_closeBtn3D->setFixedSize(24, 24); m_closeBtn3D->setNormalPic(":/icons/resources/close_round_normal.svg"); m_closeBtn3D->setHoverPic(":/icons/resources/close_round_hover.svg"); diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index ced6d12fd..1035d48a4 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -102,9 +102,9 @@ MainPanelControl::~MainPanelControl() void MainPanelControl::init() { // 主窗口 - m_fixedSpliter->setAccessibleName("spliter_fix"); - m_appSpliter->setAccessibleName("spliter_app"); - m_traySpliter->setAccessibleName("spliter_tray"); + m_fixedSpliter->setObjectName("spliter_fix"); + m_appSpliter->setObjectName("spliter_app"); + m_traySpliter->setObjectName("spliter_tray"); m_mainPanelLayout->addWidget(m_fixedAreaWidget); m_mainPanelLayout->addWidget(m_fixedSpliter); @@ -123,28 +123,28 @@ void MainPanelControl::init() // 固定区域 m_fixedAreaWidget->setLayout(m_fixedAreaLayout); - m_fixedAreaWidget->setAccessibleName("fixedarea"); + m_fixedAreaWidget->setObjectName("fixedarea"); m_fixedAreaLayout->setMargin(0); m_fixedAreaLayout->setContentsMargins(0, 0, 0, 0); m_fixedAreaLayout->setSpacing(0); // 应用程序 m_appAreaSonWidget->setLayout(m_appAreaSonLayout); - m_appAreaSonWidget->setAccessibleName("apparea"); + m_appAreaSonWidget->setObjectName("apparea"); m_appAreaSonLayout->setMargin(0); m_appAreaSonLayout->setContentsMargins(0, 0, 0, 0); m_appAreaSonLayout->setSpacing(0); // 托盘 m_trayAreaWidget->setLayout(m_trayAreaLayout); - m_trayAreaWidget->setAccessibleName("trayarea"); + m_trayAreaWidget->setObjectName("trayarea"); m_trayAreaLayout->setMargin(0); m_trayAreaLayout->setContentsMargins(0, 10, 0, 10); m_trayAreaLayout->setSpacing(0); // 插件 m_pluginAreaWidget->setLayout(m_pluginLayout); - m_pluginAreaWidget->setAccessibleName("pluginarea"); + m_pluginAreaWidget->setObjectName("pluginarea"); m_pluginLayout->setMargin(0); m_pluginLayout->setSpacing(10); diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index 0c45adc00..8a3a14dfa 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -73,7 +73,7 @@ DockSettings::DockSettings(QWidget *parent) , m_itemManager(DockItemManager::instance(this)) , m_trashPluginShow(true) { - m_settingsMenu.setAccessibleName("dock-settingsmenu"); + m_settingsMenu.setAccessibleName("settingsmenu"); checkService(); m_primaryRawRect = m_displayInter->primaryRawRect(); diff --git a/frame/window/accessible.h b/frame/window/accessible.h index e3dc0d25a..5899f28d8 100644 --- a/frame/window/accessible.h +++ b/frame/window/accessible.h @@ -35,14 +35,13 @@ #include "../plugins/sound/componments/volumeslider.h" #include "../plugins/sound/componments/horizontalseparator.h" -//#include "../plugins/network/item/deviceitem.h" //TODO #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"// TODO +#include "../plugins/overlay-warning/overlaywarningwidget.h" #include #include @@ -51,45 +50,47 @@ DWIDGET_USE_NAMESPACE // 添加accessible -SET_FORM_ACCESSIBLE(MainWindow,"mainwindow") -SET_BUTTON_ACCESSIBLE_SHOWMENU(MainPanelControl,"mainpanelcontrol") -SET_LABEL_ACCESSIBLE(TipsWidget,"Tips") -SET_FORM_ACCESSIBLE(DockPopupWindow,"PopupWindow") -SET_BUTTON_ACCESSIBLE(LauncherItem,"launcheritem") -SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(AppItem,"AppItem") -SET_BUTTON_ACCESSIBLE(PreviewContainer,"previewcontainer") -SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(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_PRESS_SHOWMENU(XEmbedTrayWidget,m_w->itemKeyForConfig()) -SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(IndicatorTrayWidget,m_w->itemKeyForConfig()) -SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(SNITrayWidget,m_w->itemKeyForConfig()) -SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(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,"volumeslider") -SET_SEPARATOR_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_BUTTON_ACCESSIBLE(QWidget,m_w->objectName()) -SET_BUTTON_ACCESSIBLE(DImageButton,m_w->objectName()) -SET_BUTTON_ACCESSIBLE(DSwitchButton,m_w->text()) +SET_FORM_ACCESSIBLE(MainWindow, "mainwindow") +SET_BUTTON_ACCESSIBLE_SHOWMENU(MainPanelControl, "mainpanelcontrol") +SET_LABEL_ACCESSIBLE(TipsWidget, "tips") +SET_FORM_ACCESSIBLE(DockPopupWindow, "popupwindow") +SET_BUTTON_ACCESSIBLE(LauncherItem, "launcheritem") +SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(AppItem, "appitem") +SET_BUTTON_ACCESSIBLE(PreviewContainer, "previewcontainer") +SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(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_PRESS_SHOWMENU(XEmbedTrayWidget, m_w->itemKeyForConfig()) +SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(IndicatorTrayWidget, m_w->itemKeyForConfig()) +SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(SNITrayWidget, m_w->itemKeyForConfig()) +SET_BUTTON_ACCESSIBLE_PRESS_SHOWMENU(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, "volumeslider") +SET_SEPARATOR_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(DImageButton, m_w->objectName().isEmpty() ? "imagebutton" : m_w->objectName()) +SET_BUTTON_ACCESSIBLE(DSwitchButton, m_w->text().isEmpty() ? "switchbutton" : m_w->text()) QAccessibleInterface *accessibleFactory(const QString &classname, QObject *object) { @@ -131,8 +132,13 @@ QAccessibleInterface *accessibleFactory(const QString &classname, QObject *objec USE_ACCESSIBLE(classname, ShutdownWidget); USE_ACCESSIBLE(classname, MultitaskingWidget); USE_ACCESSIBLE(classname, ShowDesktopWidget); - // USE_ACCESSIBLE(classname,OverlayWarningWidget); + USE_ACCESSIBLE(classname, OverlayWarningWidget); USE_ACCESSIBLE_BY_OBJECTNAME(classname, QWidget, "Btn_showdesktoparea");//TODO 点击坐标有偏差 + 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::", ""), DImageButton, "closebutton-2d"); USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DImageButton, "closebutton-3d"); USE_ACCESSIBLE_BY_OBJECTNAME(QString(classname).replace("Dtk::Widget::", ""), DSwitchButton, ""); diff --git a/frame/window/accessibledefine.h b/frame/window/accessibledefine.h index f95bde2d9..7853494e4 100644 --- a/frame/window/accessibledefine.h +++ b/frame/window/accessibledefine.h @@ -61,15 +61,16 @@ #define SEPARATOR "_" -inline QString getAccessibleName(QWidget *w, QAccessible::Role r, QString fallback) +inline QString getAccessibleName(QWidget *w, QAccessible::Role r, const QString &fallback) { + const QString lowerFallback = fallback.toLower(); // 避免重复生成 static QMap< QObject *, QString > objnameMap; if (!objnameMap[w].isEmpty()) return objnameMap[w]; static QMap< QAccessible::Role, QList< QString > > accessibleMap; - QString oldAccessName = w->accessibleName(); + QString oldAccessName = w->accessibleName().toLower(); oldAccessName.replace(SEPARATOR, ""); // 按照类型添加固定前缀 @@ -83,7 +84,7 @@ inline QString getAccessibleName(QWidget *w, QAccessible::Role r, QString fallba // 再加上标识 QString accessibleName = QString::fromLatin1(prefix) + SEPARATOR; - accessibleName += oldAccessName.isEmpty() ? fallback : oldAccessName; + accessibleName += oldAccessName.isEmpty() ? lowerFallback : oldAccessName; // 检查名称是否唯一 if (accessibleMap[r].contains(accessibleName)) { if (!objnameMap.key(accessibleName)) { @@ -114,125 +115,125 @@ inline QString getAccessibleName(QWidget *w, QAccessible::Role r, QString fallba } #define FUNC_CREATE(classname,accessibletype,accessdescription) Accessible##classname(classname *w) \ - : QAccessibleWidget(w,accessibletype,#classname)\ - , m_w(w)\ - , m_description(accessdescription)\ -{}\ + : QAccessibleWidget(w,accessibletype,#classname)\ + , m_w(w)\ + , m_description(accessdescription)\ + {}\ private:\ classname *m_w;\ QString m_description;\ #define FUNC_PRESS(classobj) QStringList actionNames() const override{\ - if(!classobj->isEnabled())\ - return QStringList();\ - return QStringList() << pressAction();}\ + if(!classobj->isEnabled())\ + return QStringList();\ + return QStringList() << pressAction();}\ void doAction(const QString &actionName) override{\ - if(actionName == pressAction())\ -{\ - QPointF localPos = classobj->geometry().center();\ - QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ - QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ - qApp->sendEvent(classobj,&event);\ - qApp->sendEvent(classobj,&event2);\ - }\ + if(actionName == pressAction())\ + {\ + QPointF localPos = classobj->geometry().center();\ + QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ + QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ + qApp->sendEvent(classobj,&event);\ + qApp->sendEvent(classobj,&event2);\ + }\ }\ #define FUNC_SHOWMENU(classobj) QStringList actionNames() const override{\ - if(!classobj->isEnabled())\ - return QStringList();\ - return QStringList() << showMenuAction();}\ + if(!classobj->isEnabled())\ + return QStringList();\ + return QStringList() << showMenuAction();}\ void doAction(const QString &actionName) override{\ - if(actionName == showMenuAction())\ -{\ - QPointF localPos = classobj->geometry().center();\ - QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ - QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ - qApp->sendEvent(classobj,&event);\ - qApp->sendEvent(classobj,&event2);\ - }\ + if(actionName == showMenuAction())\ + {\ + QPointF localPos = classobj->geometry().center();\ + QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ + QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ + qApp->sendEvent(classobj,&event);\ + qApp->sendEvent(classobj,&event2);\ + }\ }\ #define FUNC_PRESS_SHOWMENU(classobj) QStringList actionNames() const override{\ - if(!classobj->isEnabled())\ - return QStringList();\ - return QStringList() << pressAction() << showMenuAction();}\ + if(!classobj->isEnabled())\ + return QStringList();\ + return QStringList() << pressAction() << showMenuAction();}\ void doAction(const QString &actionName) override{\ - if(actionName == pressAction())\ -{\ - QPointF localPos = classobj->geometry().center();\ - QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ - QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ - qApp->sendEvent(classobj,&event);\ - qApp->sendEvent(classobj,&event2);\ - }\ - else if(actionName == showMenuAction())\ -{\ - QPointF localPos = classobj->geometry().center();\ - QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ - QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ - qApp->sendEvent(classobj,&event);\ - qApp->sendEvent(classobj,&event2);\ - }\ + if(actionName == pressAction())\ + {\ + QPointF localPos = classobj->geometry().center();\ + QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ + QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);\ + qApp->sendEvent(classobj,&event);\ + qApp->sendEvent(classobj,&event2);\ + }\ + else if(actionName == showMenuAction())\ + {\ + QPointF localPos = classobj->geometry().center();\ + QMouseEvent event(QEvent::MouseButtonPress,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ + QMouseEvent event2(QEvent::MouseButtonRelease,localPos,Qt::RightButton,Qt::RightButton,Qt::NoModifier);\ + qApp->sendEvent(classobj,&event);\ + qApp->sendEvent(classobj,&event2);\ + }\ }\ #define FUNC_RECT(classobj) QRect rect() const override{\ - if (!classobj->isVisible())\ - return QRect();\ - return classobj->geometry();\ + if (!classobj->isVisible())\ + return QRect();\ + return classobj->geometry();\ }\ #define FUNC_TEXT(classname,accessiblename) QString Accessible##classname::text(QAccessible::Text t) const{\ - switch (t) {\ - case QAccessible::Name:\ - return getAccessibleName(m_w, this->role(), accessiblename);\ - case QAccessible::Description:\ - return m_description;\ - default:\ - return QString();\ - }\ + switch (t) {\ + case QAccessible::Name:\ + return getAccessibleName(m_w, this->role(), accessiblename);\ + case QAccessible::Description:\ + return m_description;\ + default:\ + return QString();\ + }\ }\ #define USE_ACCESSIBLE(classnamestring,classname) if (classnamestring == QLatin1String(#classname) && object && object->isWidgetType())\ -{\ - interface = new Accessible##classname(static_cast(object));\ + {\ + interface = new Accessible##classname(static_cast(object));\ }\ // [指定objectname]---适用同一个类，但objectname不同的情况 #define USE_ACCESSIBLE_BY_OBJECTNAME(classnamestring,classname,objectname) if (classnamestring == QLatin1String(#classname) && object && (object->objectName() == objectname) && object->isWidgetType())\ -{\ - interface = new Accessible##classname(static_cast(object));\ + {\ + interface = new Accessible##classname(static_cast(object));\ }\ #define SET_BUTTON_ACCESSIBLE_PRESS_DESCRIPTION(classname,accessiblename,accessdescription) class Accessible##classname : public QAccessibleWidget\ -{\ + {\ public:\ - FUNC_CREATE(classname,QAccessible::Button,accessdescription)\ - QString text(QAccessible::Text t) const override;\ - FUNC_PRESS(m_w)\ + FUNC_CREATE(classname,QAccessible::Button,accessdescription)\ + QString text(QAccessible::Text t) const override;\ + FUNC_PRESS(m_w)\ };\ #define SET_BUTTON_ACCESSIBLE_SHOWMENU_DESCRIPTION(classname,accessiblename,accessdescription) class Accessible##classname : public QAccessibleWidget\ -{\ + {\ public:\ - FUNC_CREATE(classname,QAccessible::Button,accessdescription)\ - QString text(QAccessible::Text t) const override;\ - FUNC_SHOWMENU(m_w)\ + FUNC_CREATE(classname,QAccessible::Button,accessdescription)\ + QString text(QAccessible::Text t) const override;\ + FUNC_SHOWMENU(m_w)\ };\ #define SET_BUTTON_ACCESSIBLE_PRESS_SHOEMENU_DESCRIPTION(classname,accessiblename,accessdescription) class Accessible##classname : public QAccessibleWidget\ -{\ + {\ public:\ - FUNC_CREATE(classname,QAccessible::Button,accessdescription)\ - QString text(QAccessible::Text t) const override;\ - FUNC_PRESS_SHOWMENU(m_w)\ + FUNC_CREATE(classname,QAccessible::Button,accessdescription)\ + QString text(QAccessible::Text t) const override;\ + FUNC_PRESS_SHOWMENU(m_w)\ };\ #define SET_LABEL_ACCESSIBLE_WITH_DESCRIPTION(classname,aaccessibletype,accessiblename,accessdescription) class Accessible##classname : public QAccessibleWidget\ -{\ + {\ public:\ - FUNC_CREATE(classname,aaccessibletype,accessdescription)\ - QString text(QAccessible::Text t) const override;\ - FUNC_RECT(m_w)\ + FUNC_CREATE(classname,aaccessibletype,accessdescription)\ + QString text(QAccessible::Text t) const override;\ + FUNC_RECT(m_w)\ };\ // /*******************************************简化使用*******************************************/ diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 6a531ae2d..64406b553 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -148,7 +148,7 @@ MainWindow::MainWindow(QWidget *parent) m_sniWatcher(new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this)), m_dragWidget(new DragWidget(this)) { - setAccessibleName("dock-mainwindow"); + setAccessibleName("mainwindow"); m_mainPanel->setAccessibleName("mainpanel"); setAttribute(Qt::WA_TranslucentBackground); setMouseTracking(true); diff --git a/plugins/overlay-warning/overlaywarningwidget.cpp b/plugins/overlay-warning/overlaywarningwidget.cpp index 7ff865dc3..5385bbaf6 100644 --- a/plugins/overlay-warning/overlaywarningwidget.cpp +++ b/plugins/overlay-warning/overlaywarningwidget.cpp @@ -21,6 +21,7 @@ */ #include "overlaywarningwidget.h" +#include "../../interfaces/constants.h" #include #include diff --git a/plugins/overlay-warning/overlaywarningwidget.h b/plugins/overlay-warning/overlaywarningwidget.h index 3a8596be1..fcdf3725f 100644 --- a/plugins/overlay-warning/overlaywarningwidget.h +++ b/plugins/overlay-warning/overlaywarningwidget.h @@ -20,10 +20,8 @@ * along with this program. If not, see . */ -#ifndef PLUGINWIDGET_H -#define PLUGINWIDGET_H - -#include "../../interfaces/constants.h" +#ifndef OVERLAYWARNINGWIDGET_H +#define OVERLAYWARNINGWIDGET_H #include @@ -40,9 +38,6 @@ protected: private: const QPixmap loadSvg(const QString &fileName, const QSize &size) const; - -private: - Dock::DisplayMode m_displayMode; }; -#endif // PLUGINWIDGET_H +#endif // OVERLAYWARNINGWIDGET_H