openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1202-main' into 'dbus-interface' 

间距调整

See merge request kylin-desktop/kylin-nm!442
This commit is contained in:
ren peijia 2021-12-02 05:35:39 +00:00
parent 987959d1c7 d1504b99d6
commit bceddecb20
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/netconnect/netconnect.cpp
View File

@ -45,7 +45,7 @@ const QByteArray GSETTINGS_SCHEMA = "org.ukui.kylin-nm.switch";
#define DEACTIVATED 4
#define NO_MARGINS 0,0,0,0
#define TOP_MARGINS 0,0,0,0
#define TOP_MARGINS 0,8,0,0
#define MAIN_LAYOUT_MARGINS 0,0,0,8
#define SPACING 8

2
plugins/wlanconnect/itemframe.cpp
View File

@ -2,7 +2,7 @@
#include <QPainter>
#define LAYOUT_MARGINS 0,0,0,0
#define MAIN_LAYOUT_MARGINS 0,0,0,8
#define MAIN_LAYOUT_MARGINS 0,0,0,0
ItemFrame::ItemFrame(QString devName, QWidget *parent)
{
deviceLanLayout = new QVBoxLayout(this);

4
plugins/wlanconnect/wlanconnect.cpp
View File

@ -32,6 +32,9 @@
#define SCANTIMER 20 * 1000
#define UPDATETIMER 5 * 1000
#define SPACING 8
const QString WIRELESS_SWITCH = "wirelessswitch";
const QByteArray GSETTINGS_SCHEMA = "org.ukui.kylin-nm.switch";
@ -179,6 +182,7 @@ void WlanConnect::initComponent() {
ui->openWIifLayout->addWidget(m_wifiSwitch);
ui->detailLayOut_3->setContentsMargins(MAIN_LAYOUT_MARGINS);
ui->verticalLayout_3->setContentsMargins(NO_MARGINS);
ui->availableLayout->setSpacing(SPACING);
connect(m_wifiSwitch, &SwitchButton::disabledClick, this, [=]() {
showDesktopNotify(tr("No wireless network card detected"));