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

Merge branch '2309-0915' into 'yhkylin/v101' 

fix(ui): hide minimize button for detailpage(bug#193349 #191910)

See merge request kylinos-src/kylin-nm!269
This commit is contained in:
赵世旭 2023-09-18 03:37:32 +00:00
parent e54646913e e4ff9e5a64
commit 8158a43149
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/enterprise-wlan/enterprisewlandialog.cpp
View File

@ -51,7 +51,8 @@ EnterpriseWlanDialog::EnterpriseWlanDialog(KyWirelessNetItem &wirelessNetItem, Q
// this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint); // this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
//#endif //#endif
this->setAttribute(Qt::WA_DeleteOnClose); this->setAttribute(Qt::WA_DeleteOnClose);
this->setWindowFlag(Qt::Window); // this->setWindowFlag(Qt::Window);
this->setWindowFlags(Qt::Dialog);
// this->setWindowTitle(tr("Connect Enterprise WLAN")); // this->setWindowTitle(tr("Connect Enterprise WLAN"));
this->setWindowIcon(QIcon::fromTheme("kylin-network")); this->setWindowIcon(QIcon::fromTheme("kylin-network"));
KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager); KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager);

1
src/frontend/list-items/lanlistitem.cpp
View File

@ -56,7 +56,6 @@ LanListItem::LanListItem(const KyConnectItem *lanConnectItem,
m_itemFrame->installEventFilter(this); m_itemFrame->installEventFilter(this);
// connect(this->m_infoButton, &InfoButton::clicked, this, &LanListItem::onInfoButtonClicked); // connect(this->m_infoButton, &InfoButton::clicked, this, &LanListItem::onInfoButtonClicked);
connect(m_menu, &QMenu::triggered, this, &LanListItem::onMenuTriggered);
connect(m_hoverButton, &FixPushButton::clicked, this, &LanListItem::onNetButtonClicked); connect(m_hoverButton, &FixPushButton::clicked, this, &LanListItem::onNetButtonClicked);
} }

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

@ -53,7 +53,6 @@ WlanListItem::WlanListItem(KyWirelessNetItem &wirelessNetItem, QString device, b
setExpanded(false); setExpanded(false);
// connect(this->m_infoButton, &InfoButton::clicked, this, &WlanListItem::onInfoButtonClicked); // connect(this->m_infoButton, &InfoButton::clicked, this, &WlanListItem::onInfoButtonClicked);
connect(m_menu, &QMenu::triggered, this, &WlanListItem::onMenuTriggered);
connect(m_hoverButton, &FixPushButton::clicked, this, &WlanListItem::onNetButtonClicked); connect(m_hoverButton, &FixPushButton::clicked, this, &WlanListItem::onNetButtonClicked);
m_wirelessConnectOperation = new KyWirelessConnectOperation(this); m_wirelessConnectOperation = new KyWirelessConnectOperation(this);

3
src/frontend/netdetails/netdetail.cpp
View File

@ -157,12 +157,13 @@ NetDetail::NetDetail(QString interface, QString name, QString uuid, bool isActiv
// XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), window_hints); // XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), window_hints);
//#else //#else
// this->setWindowFlags(Qt::Dialog /*| Qt::FramelessWindowHint*/); // this->setWindowFlags(Qt::Dialog /*| Qt::FramelessWindowHint*/);
this->setWindowFlag(Qt::Window); // this->setWindowFlag(Qt::Window);
KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager); KWindowSystem::setState(this->winId(), NET::SkipTaskbar | NET::SkipPager);
//#endif //#endif
// this->setProperty("useStyleWindowManager", false); //禁用拖动 // this->setProperty("useStyleWindowManager", false); //禁用拖动
// setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint ); // setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint );
// setAttribute(Qt::WA_TranslucentBackground); // setAttribute(Qt::WA_TranslucentBackground);
setWindowFlags(Qt::Dialog);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setFixedSize(WINDOW_WIDTH,WINDOW_HEIGHT); setFixedSize(WINDOW_WIDTH,WINDOW_HEIGHT);
centerToScreen(); centerToScreen();