Subversion Repositories tpanel

Rev

Rev 371 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 371 Rev 383
Line 682... Line 682...
682 
    DECL_TRACER("Java_org_qtproject_theosys_Settings_setLogEnableFile(JNIEnv *env, jclass clazz, jboolean log)");
 682 
    DECL_TRACER("Java_org_qtproject_theosys_Settings_setLogEnableFile(JNIEnv *env, jclass clazz, jboolean log)");
683 
 
 683 
 
684 
    Q_UNUSED(env);
 684 
    Q_UNUSED(env);
685 
    Q_UNUSED(clazz);
 685 
    Q_UNUSED(clazz);
686 
 
 686 
 
687 
    if (TConfig::getLogFileEnabled() != log)
 687 
    TConfig::setLogFileEnabled(log);
- 
 
 688 
 
688 
        TConfig::setLogFileEnabled(log);
 689 
    if (log && !TConfig::getLogFile().empty())
- 
 
 690 
        TStreamError::setLogFile(TConfig::getLogFile());
- 
 
 691 
 
- 
 
 692 
    MSG_DEBUG("Logfile was " << (log ? "ENABLED" : "DISABLED"));
689 
}
 693 
}
690 
 
 694 
 
691 
JNIEXPORT void JNICALL Java_org_qtproject_theosys_SettingsActivity_setLogFile(JNIEnv *env, jclass clazz, jstring log)
 695 
JNIEXPORT void JNICALL Java_org_qtproject_theosys_SettingsActivity_setLogFile(JNIEnv *env, jclass clazz, jstring log)
692 
{
 696 
{
693 
    DECL_TRACER("Java_org_qtproject_theosys_Settings_setLogFile(JNIEnv *env, jclass clazz, jstring sip)");
 697 
    DECL_TRACER("Java_org_qtproject_theosys_Settings_setLogFile(JNIEnv *env, jclass clazz, jstring sip)");
Line 1429... Line 1433...
1429 
            _stopWait();
 1433 
            _stopWait();
1430 
    }
 1434 
    }
1431 
 
 1435 
 
1432 
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 1436 
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
1433 
    QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(Ljava/lang/Integer;)V", TConfig::getLogLevelBits());
 1437 
    QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(Ljava/lang/Integer;)V", TConfig::getLogLevelBits());
- 
 
 1438 
    QAndroidJniObject strPath = QAndroidJniObject::fromString(TConfig::getLogFile().c_str());
- 
 
 1439 
    QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogFileEnabled", "(Z)V", TConfig::getLogFileEnabled());
- 
 
 1440 
    QAndroidJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogPath", "(Ljava/lang/String;)V", strPath.object<jstring>());
1434 
#else
 1441 
#else
1435 
    QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(I)V", TConfig::getLogLevelBits());
 1442 
    QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogLevel", "(I)V", TConfig::getLogLevelBits());
- 
 
 1443 
    QJniObject strPath = QJniObject::fromString(TConfig::getLogFile().c_str());
- 
 
 1444 
    QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogFileEnabled", "(Z)V", TConfig::getLogFileEnabled());
- 
 
 1445 
    QJniObject::callStaticMethod<void>("org/qtproject/theosys/Settings", "setLogPath", "(Ljava/lang/String;)V", strPath.object<jstring>());
1436 
#endif
 1446 
#endif
1437 
 
 1447 
 
1438 
    enterSetup();
 1448 
    enterSetup();
1439 
/*    if (mSetupActive)
 1449 
/*    if (mSetupActive)
1440 
        return;
 1450 
        return;
Line 1655... Line 1665...
1655 
            subPg->drop();
 1665 
            subPg->drop();
1656 
        }
 1666 
        }
1657 
    }
 1667 
    }
1658 
}
 1668 
}
1659 
 
 1669 
 
- 
 
 1670 
void TPageManager::redrawObject(ulong handle)
- 
 
 1671 
{
- 
 
 1672 
    DECL_TRACER("TPageManager::redrawObject(ulong handle)");
- 
 
 1673 
 
- 
 
 1674 
    int pnumber = (int)((handle >> 16) & 0x0000ffff);
- 
 
 1675 
    int btnumber = (int)(handle & 0x0000ffff);
- 
 
 1676 
 
- 
 
 1677 
    if (pnumber < REGULAR_SUBPAGE_START)    // Is it a page?
- 
 
 1678 
    {
- 
 
 1679 
        TPage *page = getPage(pnumber);
- 
 
 1680 
 
- 
 
 1681 
        if (!page)
- 
 
 1682 
        {
- 
 
 1683 
            MSG_WARNING("Page " << pnumber << " not found!");
- 
 
 1684 
            return;
- 
 
 1685 
        }
- 
 
 1686 
 
- 
 
 1687 
        if (!page->isVisilble())
- 
 
 1688 
            return;
- 
 
 1689 
 
- 
 
 1690 
        if (btnumber == 0)
- 
 
 1691 
        {
- 
 
 1692 
            page->show();
- 
 
 1693 
            return;
- 
 
 1694 
        }
- 
 
 1695 
 
- 
 
 1696 
        Button::TButton *button = page->getButton(btnumber);
- 
 
 1697 
 
- 
 
 1698 
        if (!button)
- 
 
 1699 
        {
- 
 
 1700 
            MSG_WARNING("Button " << btnumber << " on page " << pnumber << " not found!");
- 
 
 1701 
            return;
- 
 
 1702 
        }
- 
 
 1703 
 
- 
 
 1704 
        button->showLastButton();
- 
 
 1705 
    }
- 
 
 1706 
    else if (pnumber >= REGULAR_SUBPAGE_START && pnumber < SYSTEM_PAGE_START)
- 
 
 1707 
    {
- 
 
 1708 
        TSubPage *spage = getSubPage(pnumber);
- 
 
 1709 
 
- 
 
 1710 
        if (!spage)
- 
 
 1711 
        {
- 
 
 1712 
            MSG_WARNING("Subpage " << pnumber << " not found!");
- 
 
 1713 
            return;
- 
 
 1714 
        }
- 
 
 1715 
 
- 
 
 1716 
        if (!spage->isVisible())
- 
 
 1717 
            return;
- 
 
 1718 
 
- 
 
 1719 
        if (btnumber == 0)
- 
 
 1720 
        {
- 
 
 1721 
            spage->show();
- 
 
 1722 
            return;
- 
 
 1723 
        }
- 
 
 1724 
 
- 
 
 1725 
        Button::TButton *button = spage->getButton(btnumber);
- 
 
 1726 
 
- 
 
 1727 
        if (!button)
- 
 
 1728 
        {
- 
 
 1729 
            MSG_WARNING("Button " << btnumber << " on subpage " << pnumber << " not found!");
- 
 
 1730 
            return;
- 
 
 1731 
        }
- 
 
 1732 
 
- 
 
 1733 
        button->showLastButton();
- 
 
 1734 
    }
- 
 
 1735 
    else
- 
 
 1736 
    {
- 
 
 1737 
        MSG_WARNING("System pages are not handled by redraw method! Ignoring page " << pnumber << ".");
- 
 
 1738 
    }
- 
 
 1739 
}
- 
 
 1740 
 
1660 
#ifdef _SCALE_SKIA_
 1741 
#ifdef _SCALE_SKIA_
1661 
void TPageManager::setSetupScaleFactor(double scale, double sw, double sh)
 1742 
void TPageManager::setSetupScaleFactor(double scale, double sw, double sh)
1662 
{
 1743 
{
1663 
    DECL_TRACER("TPageManager::setSetupScaleFactor(double scale, double sw, double sh)");
 1744 
    DECL_TRACER("TPageManager::setSetupScaleFactor(double scale, double sw, double sh)");
1664 
 
 1745