Subversion Repositories tpanel

Rev

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

Rev 334 Rev 335
Line 1417... Line 1417...
1417 
    }
 1417 
    }
1418 
 
 1418 
 
1419 
    return makeElement(instance);
 1419 
    return makeElement(instance);
1420 
}
 1420 
}
1421 
 
 1421 
 
- 
 
 1422 
FEEDBACK TButton::getFeedback()
- 
 
 1423 
{
- 
 
 1424 
    DECL_TRACER("TButton::getFeedback()");
- 
 
 1425 
 
- 
 
 1426 
    if (type != GENERAL)
- 
 
 1427 
        return FB_NONE;
- 
 
 1428 
 
- 
 
 1429 
    return fb;
- 
 
 1430 
}
- 
 
 1431 
 
1422 
bool TButton::setFeedback(FEEDBACK feedback)
 1432 
bool TButton::setFeedback(FEEDBACK feedback)
1423 
{
 1433 
{
1424 
    DECL_TRACER("TButton::setFeedback(FEEDBACK feedback)");
 1434 
    DECL_TRACER("TButton::setFeedback(FEEDBACK feedback)");
1425 
 
 1435 
 
- 
 
 1436 
    if (type != GENERAL)
- 
 
 1437 
    {
- 
 
 1438 
#if TESTMODE == 1
- 
 
 1439 
        setAllDone();
- 
 
 1440 
#endif
- 
 
 1441 
        return false;
- 
 
 1442 
    }
- 
 
 1443 
 
1426 
    int oldFB = fb;
 1444 
    int oldFB = fb;
1427 
    fb = feedback;
 1445 
    fb = feedback;
1428 
 
 1446 
 
1429 
    if (mEnabled && !hd)
 1447 
    if (mEnabled && !hd)
1430 
    {
 1448 
    {
Line 1439... Line 1457...
1439 
            mActInstance = 0;
 1457 
            mActInstance = 0;
1440 
            mChanged = true;
 1458 
            mChanged = true;
1441 
            makeElement(0);
 1459 
            makeElement(0);
1442 
        }
 1460 
        }
1443 
    }
 1461 
    }
- 
 
 1462 
#if TESTMODE == 1
- 
 
 1463 
    if (!mChanged)
- 
 
 1464 
        __success = true;
1444 
 
 1465 
 
- 
 
 1466 
    setScreenDone();
- 
 
 1467 
#endif
1445 
    return true;
 1468 
    return true;
1446 
}
 1469 
}
1447 
 
 1470 
 
1448 
bool TButton::setBorderStyle(const string& style, int instance)
 1471 
bool TButton::setBorderStyle(const string& style, int instance)
1449 
{
 1472 
{
Line 2087... Line 2110...
2087 
    DECL_TRACER("TButton::setOpacity(int op, int instance)");
 2110 
    DECL_TRACER("TButton::setOpacity(int op, int instance)");
2088 
 
 2111 
 
2089 
    if (instance >= 0 && (size_t)instance >= sr.size())
 2112 
    if (instance >= 0 && (size_t)instance >= sr.size())
2090 
    {
 2113 
    {
2091 
        MSG_ERROR("Instance " << instance << " does not exist!");
 2114 
        MSG_ERROR("Instance " << instance << " does not exist!");
- 
 
 2115 
#if TESTMODE == 1
- 
 
 2116 
        setScreenDone();
- 
 
 2117 
#endif
2092 
        return false;
 2118 
        return false;
2093 
    }
 2119 
    }
2094 
 
 2120 
 
2095 
    if (op < 0 || op < 255)
 2121 
    if (op < 0 || op > 255)
2096 
    {
 2122 
    {
2097 
        MSG_ERROR("Invalid opacity " << op << "!");
 2123 
        MSG_ERROR("Invalid opacity " << op << "!");
- 
 
 2124 
#if TESTMODE == 1
- 
 
 2125 
        setScreenDone();
- 
 
 2126 
#endif
2098 
        return false;
 2127 
        return false;
2099 
    }
 2128 
    }
2100 
 
 2129 
 
2101 
    int inst = instance;
 2130 
    if (instance < 0)
- 
 
 2131 
    {
- 
 
 2132 
        for (size_t i = 0; i < sr.size(); ++i)
2102 
    int loop = 1;
 2133 
        {
- 
 
 2134 
            if (sr[i].oo == op)
- 
 
 2135 
                continue;
2103 
 
 2136 
 
- 
 
 2137 
            sr[i].oo = op;
- 
 
 2138 
            mChanged = true;
2104 
    if (inst < 0)
 2139 
        }
- 
 
 2140 
    }
- 
 
 2141 
    else if (sr[instance].oo != op)
2105 
    {
 2142 
    {
2106 
        loop = (int)sr.size();
 2143 
        sr[instance].oo = op;
2107 
        inst = 0;
 2144 
        mChanged = true;
2108 
    }
 2145 
    }
2109 
 
 2146 
 
2110 
    for (int i = 0; i < loop; ++i)
 2147 
    if (!mChanged)
2111 
    {
 2148 
    {
2112 
        if (sr[inst].oo == op)
 2149 
#if TESTMODE == 1
2113 
        {
 - 
 
2114 
            inst++;
 2150 
        __success = true;
2115 
            continue;
 2151 
        setScreenDone();
2116 
        }
 2152 
#endif
2117 
 
 - 
 
2118 
        sr[inst].oo = op;
 - 
 
2119 
        mChanged = true;
 2153 
        return true;
2120 
        inst++;
 - 
 
2121 
    }
 2154 
    }
2122 
 
 2155 
 
2123 
    return makeElement(instance);
 2156 
    return makeElement(instance);
2124 
}
 2157 
}
2125 
 
 2158 
 
Line 2838... Line 2871...
2838 
    }
 2871 
    }
2839 
 
 2872 
 
2840 
    if (inst < 0)
 2873 
    if (inst < 0)
2841 
    {
 2874 
    {
2842 
        for (size_t i = 0; i < sr.size(); i++)
 2875 
        for (size_t i = 0; i < sr.size(); i++)
2843 
        {
 - 
 
2844 
            if (sr[i].sd != sound)
 - 
 
2845 
                mChanged = true;
 - 
 
2846 
 
 - 
 
2847 
            sr[i].sd = sound;
 2876 
            sr[i].sd = sound;
2848 
        }
 - 
 
2849 
    }
 2877 
    }
2850 
    else
 2878 
    else
2851 
    {
 - 
 
2852 
        if (sr[inst].sd != sound)
 - 
 
2853 
            mChanged = true;
 - 
 
2854 
 
 - 
 
2855 
        sr[inst].sd = sound;
 2879 
        sr[inst].sd = sound;
- 
 
 2880 
#if TESTMODE == 1
- 
 
 2881 
    __success = true;
- 
 
 2882 
    setScreenDone();
2856 
    }
 2883 
#endif
2857 
}
 2884 
}
2858 
 
 2885 
 
2859 
bool TButton::startAnimation(int st, int end, int time)
 2886 
bool TButton::startAnimation(int st, int end, int time)
2860 
{
 2887 
{
2861 
    DECL_TRACER("TButton::startAnimation(int start, int end, int time)");
 2888 
    DECL_TRACER("TButton::startAnimation(int start, int end, int time)");