Subversion Repositories tpanel

Rev

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

Rev 350 Rev 408
Line 177... Line 177...
177 
        if (ename.compare("pageID") == 0)
 177 
        if (ename.compare("pageID") == 0)
178 
            mSubpage.pageID = xml.convertElementToInt(content);
 178 
            mSubpage.pageID = xml.convertElementToInt(content);
179 
        else if (ename.compare("name") == 0)
 179 
        else if (ename.compare("name") == 0)
180 
            mSubpage.name = content;
 180 
            mSubpage.name = content;
181 
        else if (ename.compare("left") == 0)
 181 
        else if (ename.compare("left") == 0)
- 
 
 182 
        {
182 
            mSubpage.left = xml.convertElementToInt(content);
 183 
            mSubpage.left = xml.convertElementToInt(content);
- 
 
 184 
            mSubpage.leftOrig = mSubpage.left;
- 
 
 185 
        }
183 
        else if (ename.compare("top") == 0)
 186 
        else if (ename.compare("top") == 0)
- 
 
 187 
        {
184 
            mSubpage.top = xml.convertElementToInt(content);
 188 
            mSubpage.top = xml.convertElementToInt(content);
- 
 
 189 
            mSubpage.topOrig = mSubpage.top;
- 
 
 190 
        }
185 
        else if (ename.compare("width") == 0)
 191 
        else if (ename.compare("width") == 0)
- 
 
 192 
        {
186 
            mSubpage.width = xml.convertElementToInt(content);
 193 
            mSubpage.width = xml.convertElementToInt(content);
- 
 
 194 
            mSubpage.widthOrig = mSubpage.width;
- 
 
 195 
        }
187 
        else if (ename.compare("height") == 0)
 196 
        else if (ename.compare("height") == 0)
- 
 
 197 
        {
188 
            mSubpage.height = xml.convertElementToInt(content);
 198 
            mSubpage.height = xml.convertElementToInt(content);
- 
 
 199 
            mSubpage.heightOrig = mSubpage.height;
- 
 
 200 
        }
189 
        else if (ename.compare("group") == 0)
 201 
        else if (ename.compare("group") == 0)
190 
            mSubpage.group = content;
 202 
            mSubpage.group = content;
191 
        else if (ename.compare("showEffect") == 0)
 203 
        else if (ename.compare("showEffect") == 0)
192 
            mSubpage.showEffect = (SHOWEFFECT)xml.convertElementToInt(content);
 204 
            mSubpage.showEffect = (SHOWEFFECT)xml.convertElementToInt(content);
193 
        else if (ename.compare("showTime") == 0)
 205 
        else if (ename.compare("showTime") == 0)
Line 196... Line 208...
196 
            mSubpage.hideTime = xml.convertElementToInt(content);
 208 
            mSubpage.hideTime = xml.convertElementToInt(content);
197 
        else if (ename.compare("hideEffect") == 0)
 209 
        else if (ename.compare("hideEffect") == 0)
198 
            mSubpage.hideEffect = (SHOWEFFECT)xml.convertElementToInt(content);
 210 
            mSubpage.hideEffect = (SHOWEFFECT)xml.convertElementToInt(content);
199 
        else if (ename.compare("timeout") == 0)
 211 
        else if (ename.compare("timeout") == 0)
200 
            mSubpage.timeout = xml.convertElementToInt(content);
 212 
            mSubpage.timeout = xml.convertElementToInt(content);
- 
 
 213 
        else if (ename.compare("resetPos") == 0)
- 
 
 214 
            mSubpage.resetPos = xml.convertElementToInt(content);
201 
        else if (ename.compare("button") == 0)      // Read a button
 215 
        else if (ename.compare("button") == 0)      // Read a button
202 
        {
 216 
        {
203 
            try
 217 
            try
204 
            {
 218 
            {
205 
                TButton *button = new TButton();
 219 
                TButton *button = new TButton();
Line 352... Line 366...
352 
        setScreenDone();
 366 
        setScreenDone();
353 
#endif
 367 
#endif
354 
        return;
 368 
        return;
355 
    }
 369 
    }
356 
 
 370 
 
- 
 
 371 
    if (mSubpage.resetPos != 0)
- 
 
 372 
    {
- 
 
 373 
        mSubpage.left = mSubpage.leftOrig;
- 
 
 374 
        mSubpage.top = mSubpage.topOrig;
- 
 
 375 
        mSubpage.width = mSubpage.widthOrig;
- 
 
 376 
        mSubpage.height = mSubpage.heightOrig;
- 
 
 377 
    }
- 
 
 378 
 
357 
    target.eraseColor(TColor::getSkiaColor(mSubpage.sr[0].cf));
 379 
    target.eraseColor(TColor::getSkiaColor(mSubpage.sr[0].cf));
358 
    // Draw the background, if any
 380 
    // Draw the background, if any
359 
    if (mSubpage.sr.size() > 0 && (!mSubpage.sr[0].bm.empty() || !mSubpage.sr[0].mi.empty()))
 381 
    if (mSubpage.sr.size() > 0 && (!mSubpage.sr[0].bm.empty() || !mSubpage.sr[0].mi.empty()))
360 
    {
 382 
    {
361 
        TDrawImage dImage;
 383 
        TDrawImage dImage;
Line 542... Line 564...
542 
            button->button->createButtons();
 564 
            button->button->createButtons();
543 
 
 565 
 
544 
            if (mSubpage.sr.size() > 0)
 566 
            if (mSubpage.sr.size() > 0)
545 
                button->button->setGlobalOpacity(mSubpage.sr[0].oo);
 567 
                button->button->setGlobalOpacity(mSubpage.sr[0].oo);
546 
 
 568 
 
- 
 
 569 
            if (mSubpage.resetPos != 0)
547 
//            button->button->setChanged(true);
 570 
                button->button->resetButton();
- 
 
 571 
 
548 
            button->button->show();
 572 
            button->button->show();
549 
        }
 573 
        }
550 
 
 574 
 
551 
        button = button->next;
 575 
        button = button->next;
552 
    }
 576 
    }