Line 1495... |
Line 1495... |
1495 |
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
1495 |
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
1496 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(Ljava/lang/Integer;)V", TConfig::getLogLevelBits());
|
1496 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(Ljava/lang/Integer;)V", TConfig::getLogLevelBits());
|
1497 |
QAndroidJniObject strPath = QAndroidJniObject::fromString(TConfig::getLogFile().c_str());
|
1497 |
QAndroidJniObject strPath = QAndroidJniObject::fromString(TConfig::getLogFile().c_str());
|
1498 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogEnableFile", "(Z)V", TConfig::getLogFileEnabled());
|
1498 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogEnableFile", "(Z)V", TConfig::getLogFileEnabled());
|
1499 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogPath", "(Ljava/lang/String;)V", strPath.object<jstring>());
|
1499 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogPath", "(Ljava/lang/String;)V", strPath.object<jstring>());
|
- |
|
1500 |
|
- |
|
1501 |
QAndroidJniObject pw1 = QAndroidJniObject::fromString(TConfig::getPassword1().c_str());
|
- |
|
1502 |
QAndroidJniObject pw2 = QAndroidJniObject::fromString(TConfig::getPassword2().c_str());
|
- |
|
1503 |
QAndroidJniObject pw3 = QAndroidJniObject::fromString(TConfig::getPassword3().c_str());
|
- |
|
1504 |
QAndroidJniObject pw4 = QAndroidJniObject::fromString(TConfig::getPassword4().c_str());
|
- |
|
1505 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 1, pw1.object<jstring>());
|
- |
|
1506 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 2, pw2.object<jstring>());
|
- |
|
1507 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 3, pw3.object<jstring>());
|
- |
|
1508 |
QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 4, pw4.object<jstring>());
|
1500 |
#else
|
1509 |
#else
|
1501 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(I)V", TConfig::getLogLevelBits());
|
1510 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(I)V", TConfig::getLogLevelBits());
|
1502 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogEnableFile", "(I)V", (TConfig::getLogFileEnabled() ? 1 : 0));
|
1511 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogEnableFile", "(I)V", (TConfig::getLogFileEnabled() ? 1 : 0));
|
1503 |
QJniObject strPath = QJniObject::fromString(TConfig::getLogFile().c_str());
|
1512 |
QJniObject strPath = QJniObject::fromString(TConfig::getLogFile().c_str());
|
1504 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogPath", "(Ljava/lang/String;)V", strPath.object<jstring>());
|
1513 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogPath", "(Ljava/lang/String;)V", strPath.object<jstring>());
|
Line 1512... |
Line 1521... |
1512 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 3, pw3.object<jstring>());
|
1521 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 3, pw3.object<jstring>());
|
1513 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 4, pw4.object<jstring>());
|
1522 |
QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setPassword", "(ILjava/lang/String;)V", 4, pw4.object<jstring>());
|
1514 |
#endif
|
1523 |
#endif
|
1515 |
|
1524 |
|
1516 |
enterSetup();
|
1525 |
enterSetup();
|
1517 |
/* if (mSetupActive)
|
- |
|
1518 |
return;
|
- |
|
1519 |
|
- |
|
1520 |
mSetupActive = true;
|
- |
|
1521 |
mSavedPage = mActualPage;
|
- |
|
1522 |
|
- |
|
1523 |
TPage *pg = getPage(mActualPage);
|
- |
|
1524 |
|
- |
|
1525 |
if (pg)
|
- |
|
1526 |
{
|
- |
|
1527 |
TSubPage *spage = pg->getFirstSubPage();
|
- |
|
1528 |
mSavedSubpages.clear();
|
- |
|
1529 |
|
- |
|
1530 |
while (spage)
|
- |
|
1531 |
{
|
- |
|
1532 |
if (spage->isVisible())
|
- |
|
1533 |
mSavedSubpages.push_back(spage->getNumber());
|
- |
|
1534 |
|
- |
|
1535 |
spage = pg->getNextSubPage();
|
- |
|
1536 |
}
|
- |
|
1537 |
}
|
- |
|
1538 |
|
- |
|
1539 |
setPage(SYSTEM_PAGE_CONTROLLER, true); // Call the page "Controller" (NetLinx settings)
|
- |
|
1540 |
*/
|
- |
|
1541 |
#else
|
1526 |
#else
|
1542 |
if (_callShowSetup)
|
1527 |
if (_callShowSetup)
|
1543 |
_callShowSetup();
|
1528 |
_callShowSetup();
|
1544 |
#endif
|
1529 |
#endif
|
1545 |
}
|
1530 |
}
|