From ba6201a1505aeab828dafcdb3e1565a1fbf2e2af Mon Sep 17 00:00:00 2001 From: Hualet Wang Date: Sat, 29 Oct 2016 10:18:30 +0800 Subject: [PATCH] Supplement some info for GUI test Change-Id: I99839778174318881ddbd66d5b229cfef3d550c1 --- plugins/disk-mount/diskmountplugin.cpp | 2 ++ plugins/network/item/wirelessitem.cpp | 2 +- plugins/shutdown/shutdownplugin.cpp | 1 + plugins/sound/sinkinputwidget.cpp | 5 ++++- plugins/sound/soundapplet.cpp | 3 +++ plugins/sound/sounditem.cpp | 1 + plugins/system-tray/systemtrayplugin.cpp | 1 + plugins/trash/trashplugin.cpp | 1 + 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/disk-mount/diskmountplugin.cpp b/plugins/disk-mount/diskmountplugin.cpp index 016f02a35..acdbbde31 100644 --- a/plugins/disk-mount/diskmountplugin.cpp +++ b/plugins/disk-mount/diskmountplugin.cpp @@ -13,6 +13,8 @@ DiskMountPlugin::DiskMountPlugin(QObject *parent) m_diskControlApplet(nullptr) { m_diskPluginItem->setVisible(false); + + m_tipsLabel->setObjectName("diskmount"); m_tipsLabel->setVisible(false); m_tipsLabel->setText(tr("Disk")); m_tipsLabel->setStyleSheet("color:white;" diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp index f0d485af0..19711baf4 100644 --- a/plugins/network/item/wirelessitem.cpp +++ b/plugins/network/item/wirelessitem.cpp @@ -17,8 +17,8 @@ WirelessItem::WirelessItem(const QUuid &uuid) m_refershTimer->setInterval(100); m_wirelessApplet->setVisible(false); + m_wirelessPopup->setObjectName("wireless-" + uuid.toString()); m_wirelessPopup->setVisible(false); - m_wirelessPopup->setStyleSheet("color:white;" "padding:5px 10px;"); diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index e020fd8d8..f8e3f8c76 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -41,6 +41,7 @@ QWidget *ShutdownPlugin::itemWidget(const QString &itemKey) QWidget *ShutdownPlugin::itemTipsWidget(const QString &itemKey) { const BatteryPercentageMap data = m_powerInter->batteryPercentage(); + m_tipsLabel->setObjectName(itemKey); if (data.isEmpty() || (itemKey == SHUTDOWN_KEY && displayMode() == Dock::Efficient)) { diff --git a/plugins/sound/sinkinputwidget.cpp b/plugins/sound/sinkinputwidget.cpp index d3bf2e311..2b8b66227 100644 --- a/plugins/sound/sinkinputwidget.cpp +++ b/plugins/sound/sinkinputwidget.cpp @@ -13,7 +13,10 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent) m_volumeIcon(new DImageButton), m_volumeSlider(new VolumeSlider) { - m_volumeIcon->setPixmap(QIcon::fromTheme(m_inputInter->icon()).pixmap(24, 24)); + const QString iconName = m_inputInter->icon(); + m_volumeIcon->setAccessibleName("app-" + iconName + "-icon"); + m_volumeIcon->setPixmap(QIcon::fromTheme(iconName).pixmap(24, 24)); + m_volumeSlider->setAccessibleName("app-" + iconName + "-slider"); m_volumeSlider->setValue(m_inputInter->volume() * 1000); QHBoxLayout *centeralLayout = new QHBoxLayout; diff --git a/plugins/sound/soundapplet.cpp b/plugins/sound/soundapplet.cpp index 81c29ad21..ffd003289 100644 --- a/plugins/sound/soundapplet.cpp +++ b/plugins/sound/soundapplet.cpp @@ -24,6 +24,9 @@ SoundApplet::SoundApplet(QWidget *parent) { QIcon::setThemeName("deepin"); + m_volumeBtn->setAccessibleName("volume-button"); + m_volumeSlider->setAccessibleName("volume-slider"); + QLabel *deviceLabel = new QLabel; deviceLabel->setText(tr("Device")); deviceLabel->setStyleSheet("color:white;"); diff --git a/plugins/sound/sounditem.cpp b/plugins/sound/sounditem.cpp index 8381a9329..ffc8031d8 100644 --- a/plugins/sound/sounditem.cpp +++ b/plugins/sound/sounditem.cpp @@ -18,6 +18,7 @@ SoundItem::SoundItem(QWidget *parent) { QIcon::setThemeName("deepin"); + m_tipsLabel->setObjectName("sound"); m_tipsLabel->setVisible(false); // m_tipsLabel->setFixedWidth(145); m_tipsLabel->setAlignment(Qt::AlignCenter); diff --git a/plugins/system-tray/systemtrayplugin.cpp b/plugins/system-tray/systemtrayplugin.cpp index ea03a8000..9010ab818 100644 --- a/plugins/system-tray/systemtrayplugin.cpp +++ b/plugins/system-tray/systemtrayplugin.cpp @@ -20,6 +20,7 @@ SystemTrayPlugin::SystemTrayPlugin(QObject *parent) m_trayApplet->setObjectName("sys-tray"); m_fashionItem = new FashionTrayItem; + m_tipsLabel->setObjectName("sys-tray"); m_tipsLabel->setText(tr("System Tray")); m_tipsLabel->setVisible(false); m_tipsLabel->setStyleSheet("color:white;" diff --git a/plugins/trash/trashplugin.cpp b/plugins/trash/trashplugin.cpp index c5c6cfcbc..f0bd2b652 100644 --- a/plugins/trash/trashplugin.cpp +++ b/plugins/trash/trashplugin.cpp @@ -5,6 +5,7 @@ TrashPlugin::TrashPlugin(QObject *parent) m_trashWidget(new TrashWidget), m_tipsLabel(new QLabel) { + m_tipsLabel->setObjectName("trash"); m_tipsLabel->setStyleSheet("color:white;" "padding:5px 10px;");