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

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

fix bug 146541

See merge request kylinos-src/kylin-nm!26
This commit is contained in:
赵世旭 2022-11-01 09:58:29 +00:00
parent 1cf2aeb8ca 977f5f584a
commit 560dea28c2
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/frontend/mainwindow.cpp
View File

@ -168,19 +168,19 @@ void MainWindow::secondaryStart()
*/
void MainWindow::initPlatform()
{
char* projectName = kdk_system_get_projectName();
QString strProjectName(projectName);
free(projectName);
projectName = NULL;
if(v10Sp1.compare(strProjectName,Qt::CaseInsensitive) == 0) {
unsigned int feature = kdk_system_get_productFeatures();
if (feature == 3) {
m_isShowInCenter = true;
}
} else if (intel.compare(strProjectName,Qt::CaseInsensitive) == 0) {
m_isShowInCenter = true;
}
qDebug() << "projectName" << projectName << m_isShowInCenter;
// char* projectName = kdk_system_get_projectName();
// QString strProjectName(projectName);
// free(projectName);
// projectName = NULL;
// if(v10Sp1.compare(strProjectName,Qt::CaseInsensitive) == 0) {
// unsigned int feature = kdk_system_get_productFeatures();
// if (feature == 3) {
// m_isShowInCenter = true;
// }
// } else if (intel.compare(strProjectName,Qt::CaseInsensitive) == 0) {
// m_isShowInCenter = true;
// }
// qDebug() << "projectName" << projectName << m_isShowInCenter;
}
/**
@ -531,20 +531,20 @@ void MainWindow::setCentralWidgetType(IconActiveType iconStatus)
void MainWindow::getTabletMode()
{
QDBusInterface interface(QString("com.kylin.statusmanager.interface"),
QString("/"),
QString("com.kylin.statusmanager.interface"),
QDBusConnection::sessionBus());
if(!interface.isValid()) {
m_isShowInCenter = true;
return;
}
QDBusReply<bool> reply = interface.call("get_current_tabletmode");
if (!reply.isValid()) {
m_isShowInCenter = true;
return;
}
m_isShowInCenter = reply.value();
// QDBusInterface interface(QString("com.kylin.statusmanager.interface"),
// QString("/"),
// QString("com.kylin.statusmanager.interface"),
// QDBusConnection::sessionBus());
// if(!interface.isValid()) {
// m_isShowInCenter = true;
// return;
// }
// QDBusReply<bool> reply = interface.call("get_current_tabletmode");
// if (!reply.isValid()) {
// m_isShowInCenter = true;
// return;
// }
// m_isShowInCenter = reply.value();
}
/**

28
src/frontend/vpnmainwindow.cpp
View File

@ -450,20 +450,20 @@ void vpnMainWindow::setCentralWidgetType(IconActiveType iconStatus)
void vpnMainWindow::getTabletMode()
{
QDBusInterface interface(QString("com.kylin.statusmanager.interface"),
QString("/"),
QString("com.kylin.statusmanager.interface"),
QDBusConnection::sessionBus());
if(!interface.isValid()) {
m_isShowInCenter = true;
return;
}
QDBusReply<bool> reply = interface.call("get_current_tabletmode");
if (!reply.isValid()) {
m_isShowInCenter = true;
return;
}
m_isShowInCenter = reply.value();
// QDBusInterface interface(QString("com.kylin.statusmanager.interface"),
// QString("/"),
// QString("com.kylin.statusmanager.interface"),
// QDBusConnection::sessionBus());
// if(!interface.isValid()) {
// m_isShowInCenter = true;
// return;
// }
// QDBusReply<bool> reply = interface.call("get_current_tabletmode");
// if (!reply.isValid()) {
// m_isShowInCenter = true;
// return;
// }
// m_isShowInCenter = reply.value();
}
/**