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

Merge branch '1021-tablet' into 'yhkylin/v101-tablet' 

fix 143364

See merge request kylinos-src/kylin-nm!15
This commit is contained in:
赵世旭 2022-10-21 08:34:38 +00:00
parent 2dfe5479b0 cd19f858b7
commit 1cf2aeb8ca
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
kylin-nm (3.20.1.6-ok8) v101; urgency=medium
* BUG号：
-#143364 【网络设置】任务栏点击网络图标，网络设置窗口显示在屏幕中央
* 需求号：
* 其他改动：无
* 影响域：显示位置
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 21 Oct 2022 16:20:36 +0800
kylin-nm (3.20.1.6-ok7) v101; urgency=medium
* BUG号：无

11
src/frontend/mainwindow.cpp
View File

@ -358,7 +358,7 @@ void MainWindow::initDbusConnnect()
connect(m_wlanWidget, &WlanPage::connectivityChanged, this, &MainWindow::onConnectivityChanged);
//模式切换
QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interfacer"),
QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interface"),
QString("/"),
QString("com.kylin.statusmanager.interface"),
QString("mode_change_signal"), this, SLOT(onTabletModeChanged(bool)));
@ -531,14 +531,9 @@ void MainWindow::setCentralWidgetType(IconActiveType iconStatus)
void MainWindow::getTabletMode()
{
QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interfacer"),
QDBusInterface interface(QString("com.kylin.statusmanager.interface"),
QString("/"),
QString("qt5-ukui-platformtheme"),
QString("mode_change_signal"), this, SLOT(onTabletModeChanged(bool)));
QDBusInterface interface(QString("com.kylin.statusmanager.interfacer"),
QString("/"),
QString("qt5-ukui-platformtheme"),
QString("com.kylin.statusmanager.interface"),
QDBusConnection::sessionBus());
if(!interface.isValid()) {
m_isShowInCenter = true;

11
src/frontend/vpnmainwindow.cpp
View File

@ -278,7 +278,7 @@ void vpnMainWindow::initDbusConnnect()
// connect(m_vpnPage, &LanPage::lanConnectChanged, this, &MainWindow::onLanConnectStatusToChangeTrayIcon);
// //模式切换
// QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interfacer"),
// QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interface"),
// QString("/"),
// QString("com.kylin.statusmanager.interface"),
// QString("mode_change_signal"), this, SLOT(onTabletModeChanged(bool)));
@ -450,14 +450,9 @@ void vpnMainWindow::setCentralWidgetType(IconActiveType iconStatus)
void vpnMainWindow::getTabletMode()
{
QDBusConnection::sessionBus().connect(QString("com.kylin.statusmanager.interfacer"),
QDBusInterface interface(QString("com.kylin.statusmanager.interface"),
QString("/"),
QString("qt5-ukui-platformtheme"),
QString("mode_change_signal"), this, SLOT(onTabletModeChanged(bool)));
QDBusInterface interface(QString("com.kylin.statusmanager.interfacer"),
QString("/"),
QString("qt5-ukui-platformtheme"),
QString("com.kylin.statusmanager.interface"),
QDBusConnection::sessionBus());
if(!interface.isValid()) {
m_isShowInCenter = true;