Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: wireless item display problem when ssid contains "&"

Browse Source 
https://github.com/linuxdeepin/developer-center/issues/880

Change-Id: I44a71eb7e1ffaf0626c4c03805e5fe01fc12bfc2
This commit is contained in:
listenerri 2019-02-13 10:50:12 +08:00
parent 49b84eb0cc
commit ecea16f89a
Notes: gerrit 2019-02-14 16:08:22 +08:00 
Verified+1: <jenkins@deepin.com>
Verified+1: liuwen123 <liuwen@linuxdeepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Thu, 14 Feb 2019 16:08:21 +0800
Reviewed-on: https://cr.deepin.io/41597
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/network/item/applet/accesspointwidget.cpp
View File

@ -35,7 +35,7 @@ AccessPointWidget::AccessPointWidget()
: QFrame(nullptr),
m_activeState(NetworkDevice::Unknow),
m_ssidBtn(new QPushButton(this)),
m_ssidBtn(new SsidButton(this)),
m_disconnectBtn(new DImageButton(this)),
m_securityLabel(new QLabel),
m_strengthLabel(new QLabel)
@ -89,8 +89,8 @@ AccessPointWidget::AccessPointWidget()
// "color:#2ca7f8;"
"}");
connect(m_ssidBtn, &QPushButton::clicked, this, &AccessPointWidget::clicked);
connect(m_ssidBtn, &QPushButton::clicked, this, &AccessPointWidget::ssidClicked);
connect(m_ssidBtn, &SsidButton::clicked, this, &AccessPointWidget::clicked);
connect(m_ssidBtn, &SsidButton::clicked, this, &AccessPointWidget::ssidClicked);
connect(m_disconnectBtn, &DImageButton::clicked, this, &AccessPointWidget::disconnectBtnClicked);
}

20
plugins/network/item/applet/accesspointwidget.h
View File

@ -32,6 +32,24 @@
#include <dimagebutton.h>
#include <NetworkDevice>
class SsidButton : public QLabel
{
Q_OBJECT
public:
SsidButton(QWidget *parent = nullptr) : QLabel(parent){}
virtual ~SsidButton() {}
signals:
void clicked();
protected:
void mouseReleaseEvent(QMouseEvent *event) override {
QLabel::mouseReleaseEvent(event);
Q_EMIT clicked();
}
};
class AccessPointWidget : public QFrame
{
Q_OBJECT
@ -64,7 +82,7 @@ private:
dde::network::NetworkDevice::DeviceStatus m_activeState;
AccessPoint m_ap;
QPushButton *m_ssidBtn;
SsidButton *m_ssidBtn;
Dtk::Widget::DImageButton *m_disconnectBtn;
QLabel *m_securityLabel;
QLabel *m_strengthLabel;