WebSVN – tpanel – Diff – /trunk/tsubpage.cpp



            mSubpage.height = xml.convertElementToInt(content);
            mSubpage.heightOrig = mSubpage.height;
        }
        else if (ename.compare("group") == 0)
            mSubpage.group = content;
        else if (ename.compare("modal") == 0)
            mSubpage.modal = xml.convertElementToInt(content);
        else if (ename.compare("showEffect") == 0)
            mSubpage.showEffect = (SHOWEFFECT)xml.convertElementToInt(content);
        else if (ename.compare("showTime") == 0)
            mSubpage.showTime = xml.convertElementToInt(content);
        else if (ename.compare("hideTime") == 0)

            int btX = x - but->getLeftPosition();
            int btY = y - but->getTopPosition();
 
            if (but->getButtonType() == BARGRAPH)
                but->moveBargraphLevel(btX, btY);
            else if (but->getButtonType() == JOYSTICK && !but->getLevelFuction().empty())
            {
                but->drawJoystick(btX, btY);
                but->sendJoystickLevels();
            }
 

Subversion Repositories tpanel

(root)/trunk/tsubpage.cpp @ 444 – Rev 416 → 418

Rev 416		Rev 418
Line 198...		Line 198...
198	`mSubpage.height = xml.convertElementToInt(content);`	198	`mSubpage.height = xml.convertElementToInt(content);`
199	`mSubpage.heightOrig = mSubpage.height;`	199	`mSubpage.heightOrig = mSubpage.height;`
200	`}`	200	`}`
201	`else if (ename.compare("group") == 0)`	201	`else if (ename.compare("group") == 0)`
202	`mSubpage.group = content;`	202	`mSubpage.group = content;`
-		203	`else if (ename.compare("modal") == 0)`
-		204	`mSubpage.modal = xml.convertElementToInt(content);`
203	`else if (ename.compare("showEffect") == 0)`	205	`else if (ename.compare("showEffect") == 0)`
204	`mSubpage.showEffect = (SHOWEFFECT)xml.convertElementToInt(content);`	206	`mSubpage.showEffect = (SHOWEFFECT)xml.convertElementToInt(content);`
205	`else if (ename.compare("showTime") == 0)`	207	`else if (ename.compare("showTime") == 0)`
206	`mSubpage.showTime = xml.convertElementToInt(content);`	208	`mSubpage.showTime = xml.convertElementToInt(content);`
207	`else if (ename.compare("hideTime") == 0)`	209	`else if (ename.compare("hideTime") == 0)`
Line 975...		Line 977...
975	`int btX = x - but->getLeftPosition();`	977	`int btX = x - but->getLeftPosition();`
976	`int btY = y - but->getTopPosition();`	978	`int btY = y - but->getTopPosition();`
977		979
978	`if (but->getButtonType() == BARGRAPH)`	980	`if (but->getButtonType() == BARGRAPH)`
979	`but->moveBargraphLevel(btX, btY);`	981	`but->moveBargraphLevel(btX, btY);`
980	`else`	982	`else if (but->getButtonType() == JOYSTICK && !but->getLevelFuction().empty())`
981	`{`	983	`{`
982	`but->drawJoystick(btX, btY);`	984	`but->drawJoystick(btX, btY);`
983	`but->sendJoystickLevels();`	985	`but->sendJoystickLevels();`
984	`}`	986	`}`
985		987