Subversion Repositories tpanel

Rev

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

Rev 350 Rev 351
Line 3697... Line 3697...
3697 
        return;
 3697 
        return;
3698 
    }
 3698 
    }
3699 
 
 3699 
 
3700 
    if (!obj)
 3700 
    if (!obj)
3701 
    {
 3701 
    {
- 
 
 3702 
        if (!par->object.widget)
- 
 
 3703 
        {
- 
 
 3704 
            MSG_ERROR("Object " << handleToString(parent) << " has no valid widget!");
- 
 
 3705 
#if TESTMODE == 1
- 
 
 3706 
            setScreenDone();
- 
 
 3707 
#endif
- 
 
 3708 
            return;
- 
 
 3709 
        }
- 
 
 3710 
 
3702 
        MSG_DEBUG("Adding new object " << handleToString(handle) << " ...");
 3711 
        MSG_DEBUG("Adding new object " << handleToString(handle) << " ...");
3703 
        OBJECT_t nobj;
 3712 
        OBJECT_t nobj;
3704 
 
 3713 
 
3705 
        nobj.type = TObject::OBJ_BUTTON;
 3714 
        nobj.type = TObject::OBJ_BUTTON;
3706 
        nobj.handle = handle;
 3715 
        nobj.handle = handle;
Line 3718... Line 3727...
3718 
            nobj.height = scale(height);
 3727 
            nobj.height = scale(height);
3719 
            nobj.left = scale(left);
 3728 
            nobj.left = scale(left);
3720 
            nobj.top = scale(top);
 3729 
            nobj.top = scale(top);
3721 
        }
 3730 
        }
3722 
 
 3731 
 
3723 
        nobj.object.label = new QLabel("", par->object.widget);
 3732 
        nobj.object.label = new QLabel(par->object.widget);
3724 
        nobj.object.label->setObjectName(QString("Label_") + handleToString(handle).c_str());
 3733 
        nobj.object.label->setObjectName(QString("Label_") + handleToString(handle).c_str());
3725 
 
 3734 
 
3726 
        if (mGestureFilter)
 3735 
        if (mGestureFilter)
3727 
        {
 3736 
        {
3728 
            nobj.object.label->installEventFilter(mGestureFilter);
 3737 
            nobj.object.label->installEventFilter(mGestureFilter);
Line 3888... Line 3897...
3888 
        return;
 3897 
        return;
3889 
    }
 3898 
    }
3890 
 
 3899 
 
3891 
    if (!obj)
 3900 
    if (!obj)
3892 
    {
 3901 
    {
- 
 
 3902 
        if (!par->object.widget)
- 
 
 3903 
        {
- 
 
 3904 
#if TESTMODE == 1
- 
 
 3905 
            MSG_ERROR("Object " << handleToString(parent) << " has no valid object!");
- 
 
 3906 
#endif
- 
 
 3907 
            return;
- 
 
 3908 
        }
- 
 
 3909 
 
3893 
        MSG_DEBUG("Adding new object " << handleToString(handle) << " ...");
 3910 
        MSG_DEBUG("Adding new object " << handleToString(handle) << " ...");
3894 
        OBJECT_t nobj;
 3911 
        OBJECT_t nobj;
3895 
 
 3912 
 
3896 
        nobj.type = OBJ_SUBVIEW;
 3913 
        nobj.type = OBJ_SUBVIEW;
3897 
        nobj.handle = handle;
 3914 
        nobj.handle = handle;