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

Merge branch 'dbus-interface' into 'dbus-interface' 

Fix:bug about UI http://172.17.50.104/biz/bug-view-92246.html...

See merge request kylin-desktop/kylin-nm!422
This commit is contained in:
ren peijia 2021-11-24 06:11:03 +00:00
parent 7df336d526 c2e8734ff7
commit 2efe92634f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/list-items/wlanlistitem.cpp
View File

@ -230,6 +230,7 @@ void WlanListItem::initWlanUI()
m_pwdFrame->setLayout(m_pwdFrameLyt);
m_pwdLineEdit = new QLineEdit(m_pwdFrame);
m_pwdLineEdit->setAttribute(Qt::WA_InputMethodEnabled, false);
m_pwdLineEdit->installEventFilter(this);
connect(m_pwdLineEdit, &QLineEdit::textChanged, this, &WlanListItem::onPwdEditorTextChanged);
m_pwdLineEdit->setFixedHeight(PWD_AREA_HEIGHT);
@ -242,6 +243,7 @@ void WlanListItem::initWlanUI()
m_pwdLineEdit->setLayout(m_pwdLineEditLyt);
m_showPwdButton = new QPushButton(m_pwdLineEdit);
m_showPwdButton->setStyleSheet("QPushButton{color:white; background-color:transparent;}");
m_showPwdButton->installEventFilter(this);
m_showPwdButton->setFixedSize(SHOW_PWD_BUTTON_SIZE);
m_showPwdButton->setAutoFillBackground(false);

4
src/frontend/mainwindow.cpp
View File

@ -396,10 +396,10 @@ void MainWindow::onRefreshTrayIcon()
//更新托盘图标显示
iconTimer->stop();
if (m_lanWidget->lanIsConnected()) {
m_trayIcon->setIcon(QIcon::fromTheme("network-wired-signal-excellent-symbolic"));
m_trayIcon->setIcon(QIcon::fromTheme("network-wired-connected-symbolic"));
iconStatus = IconActiveType::LAN_CONNECTED;
} else if (m_wlanWidget->wlanIsConnected()){
m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-signal-excellent-symbolic"));
m_trayIcon->setIcon(QIcon::fromTheme("network-wireless-connected-symbolic"));
iconStatus = IconActiveType::WLAN_CONNECTED;
} else {
m_trayIcon->setIcon(QIcon::fromTheme("network-wired-disconnected-symbolic"));

4
src/frontend/tab-pages/tabpage.cpp
View File

@ -93,14 +93,16 @@ void TabPage::initUI()
m_inactivatedNetLayout->addWidget(m_inactivatedNetListArea);
m_inactivatedNetDivider = new Divider(this);
m_settingsFrame = new QFrame(this);
m_settingsFrame->setFixedHeight(TITLE_FRAME_HEIGHT);
m_settingsLayout = new QHBoxLayout(m_settingsFrame);
m_settingsLayout->setContentsMargins(SETTINGS_LAYOUT_MARGINS);
m_settingsLabel = new QLabel(m_settingsFrame);
m_settingsLabel->setCursor(Qt::PointingHandCursor);
m_settingsLabel->setText(tr("Settings"));
m_settingsLabel->setScaledContents(true);
m_settingsLayout->addWidget(m_settingsLabel);
m_settingsFrame->setLayout(m_settingsLayout);

2
src/frontend/tab-pages/tabpage.h
View File

@ -27,7 +27,7 @@
#define NET_LIST_SPACING 0
#define TEXT_MARGINS 16,0,0,0
//#define SCROLL_AREA_HEIGHT 200
#define SETTINGS_LAYOUT_MARGINS 24,16,24,16
#define SETTINGS_LAYOUT_MARGINS 24,0,24,0
#define TRANSPARENT_COLOR QColor(0,0,0,0)
#define INACTIVE_AREA_MIN_HEIGHT 170
#define ACTIVE_AREA_MAX_HEIGHT 92