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

 extern amx::TAmxNet *gAmxNet;                   //!< Pointer to the class running the thread which handles the communication with the controller.
 extern bool _restart_;                          //!< If this is set to true then the whole program will start over.
 extern TPageManager *gPageManager;              //!< The pointer to the global defined main class.
 std::mutex draw_mutex;                          //!< We're using threads and need to block execution sometimes
 static bool isRunning = false;                  //!< TRUE = the pageManager was started.
+TObject *gObject = nullptr;                     //!< Internal used pointer to a TObject class. (Necessary because of threads!)
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 static double gScale = 1.0;                     //!< Global variable holding the scale factor.
 static int gFullWidth = 0;                      //!< Global variable holding the width of the AMX screen. This is used to calculate the scale factor for the settings dialog.
 #endif
 using std::bind;
 using std::pair;
 using std::string;
 using std::vector;
+string _NO_OBJECT = "The global class TObject is not available!";
 /**
  * @brief qtmain is used here as the entry point for the surface.
+ *
  * The main entry function parses the command line parameters, if there were
  * any and sets the basic attributes. It creates the main window and starts the
  */
 MainWindow::MainWindow()
+{
     DECL_TRACER("MainWindow::MainWindow()");
+    gObject = new TObject;
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     setAttribute(Qt::WA_AcceptTouchEvents, true);   // We accept touch events
     grabGesture(Qt::PinchGesture);                  // We use a pinch gesture to open the settings dialog
     if (gPageManager && gPageManager->getSettings()->getRotate() == 1)  // portrait?
     else
+    {
         MSG_INFO("Orientation set to landscape mode.");
         _setOrientation(O_LANDSCAPE);
+    }
+#else
+    setWindowIcon(QIcon("logo.png"));
 #endif
     if (!gPageManager)
+    {
         EXCEPTFATALMSG("The class TPageManager was not initialized!");
+    }
+    {
         removeToolBar(mToolbar);
         mToolbar = nullptr;
+    }
+    if (gObject)
+    {
+        delete gObject;
+        gObject = nullptr;
+    }
     isRunning = false;
+}
 #ifdef __ANDROID__
 /**
 */
 void MainWindow::animationFinished()
+{
     DECL_TRACER("MainWindow::animationFinished()");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
-    OBJECT_t *obj = getMarkedRemove();
+    TObject::OBJECT_t *obj = gObject->getMarkedRemove();
     while (obj)
+    {
         if (obj->animation && obj->animation->state() != QAbstractAnimation::Running)
             break;
-        obj = getNextMarkedRemove(obj);
+        obj = gObject->getNextMarkedRemove(obj);
+    }
     if (obj && obj->animation)
+    {
-        MSG_DEBUG("Dropping object " << handleToString(obj->handle));
+        MSG_DEBUG("Dropping object " << TObject::handleToString(obj->handle));
         delete obj->animation;
         obj->animation = nullptr;
-        dropContent(obj);
+        gObject->dropContent(obj);
         if (mLastObject == obj)
             mLastObject = nullptr;
-        removeObject(obj->handle);
+        gObject->removeObject(obj->handle);
+    }
     else
+    {
         MSG_WARNING("No or invalid object to delete!");
+    }
+    {
         MSG_ERROR("No QTextEdit widget found! External sender?");
         return;
+    }
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
     QString text = edit->toPlainText();
     WId id = edit->winId();
-    OBJECT_t *obj = findObject(id);
+    TObject::OBJECT_t *obj = gObject->findObject(id);
     if (!obj)
+    {
         MSG_ERROR("No object witb WId " << id << " found!");
         return;
+    {
         MSG_ERROR("No QLineEdit widget found! External sender?");
         return;
+    }
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
     QString text = edit->text();
     WId id = edit->winId();
-    OBJECT_t *obj = findObject(id);
+    TObject::OBJECT_t *obj = gObject->findObject(id);
     if (!obj)
+    {
         MSG_ERROR("No object with WId " << id << " found!");
         return;
     DECL_TRACER("MainWindow::_setVisible(ulong handle, bool state)");
     if (prg_stopped)
         return;
-    MSG_DEBUG("Object " << handleToString(handle) << " marked for " << (state ? "VISIBLE" : "INVISIBLE") << " state.");
+    MSG_DEBUG("Object " << TObject::handleToString(handle) << " marked for " << (state ? "VISIBLE" : "INVISIBLE") << " state.");
     emit sigSetVisible(handle, state);
+}
 void MainWindow::_setPage(ulong handle, int width, int height)
+{
 /******************* Draw elements *************************/
 void MainWindow::displayButton(ulong handle, ulong parent, QByteArray buffer, int width, int height, int pixline, int left, int top)
+{
-    draw_mutex.lock();
     DECL_TRACER("MainWindow::displayButton(ulong handle, unsigned char* buffer, size_t size, int width, int height, int pixline, int left, int top)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
+    draw_mutex.lock();
     if (isScaled())
+    {
         MSG_DEBUG("Scaling to factor " << mScaleFactor);
+    }
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
-    OBJECT_t *par = findObject(parent);
+    TObject::OBJECT_t *par = gObject->findObject(parent);
-    MSG_TRACE("Processing button " << handleToString(handle) << " from parent " << handleToString(parent));
+    MSG_TRACE("Processing button " << TObject::handleToString(handle) << " from parent " << TObject::handleToString(parent));
     if (!par)
+    {
         if (TStreamError::checkFilter(HLOG_DEBUG))
-            MSG_WARNING("Button " << handleToString(handle) << " has no parent (" << handleToString(parent) << ")! Ignoring it.");
+            MSG_WARNING("Button " << TObject::handleToString(handle) << " has no parent (" << TObject::handleToString(parent) << ")! Ignoring it.");
         draw_mutex.unlock();
         return;
+    }
+    if (par->animation && !par->aniDirection)
+    {
+        if (par->animation->state() == QAbstractAnimation::Running)
+        {
+            MSG_WARNING("Object " << TObject::handleToString(parent) << " is busy with an animation!");
+            par->animation->stop();
+        }
+        else
+        {
+            MSG_WARNING("Object " << TObject::handleToString(parent) << " has not finished the animation!");
+        }
+        draw_mutex.unlock();
+        return;
+    }
+    else if (par->remove)
+    {
+        MSG_WARNING("Object " << TObject::handleToString(parent) << " is marked for remove. Will not draw image!");
+        draw_mutex.unlock();
+        return;
+    }
     if (!obj)
+    {
-        MSG_DEBUG("Adding new object " << handleToString(handle) << " ...");
+        MSG_DEBUG("Adding new object " << TObject::handleToString(handle) << " ...");
-        obj = addObject();
+        obj = gObject->addObject();
         if (!obj)
+        {
             MSG_ERROR("Error creating an object!");
             TError::setError();
             draw_mutex.unlock();
             return;
+        }
-        obj->type = OBJ_BUTTON;
+        obj->type = TObject::OBJ_BUTTON;
         obj->handle = handle;
         obj->width = scale(width);
         obj->height = scale(height);
         obj->left = scale(left);
         obj->top = scale(top);
-        if (par->type == OBJ_PAGE)
+        if (par->type == TObject::OBJ_PAGE)
             obj->object.label = new QLabel("", mBackground);
         else
             obj->object.label = new QLabel("", par->object.widget);
         obj->object.label->installEventFilter(this);
         obj->object.label->setFixedSize(obj->width, obj->height);
         obj->object.label->move(obj->left, obj->top);
         obj->object.label->setAttribute(Qt::WA_TransparentForMouseEvents);
+    }
     else
-        MSG_DEBUG("Object " << handleToString(handle) << " of type " << objectToString(obj->type) << " found!");
+        MSG_DEBUG("Object " << TObject::handleToString(handle) << " of type " << TObject::objectToString(obj->type) << " found!");
-//    MSG_DEBUG("Geometry: l:" << obj->left << ", t:" << obj->top << ", w:" << obj->width << ", h:" << obj->height);
     try
+    {
         if (buffer.size() > 0 && pixline > 0)
+        {
-            MSG_DEBUG("Setting image for " << handleToString(handle) << " ...");
+            MSG_DEBUG("Setting image for " << TObject::handleToString(handle) << " ...");
             QImage img((unsigned char *)buffer.data(), width, height, pixline, QImage::Format_ARGB32);  // Original size
+            if (img.isNull() || !img.valid(width-1, height-1))
+            {
+                MSG_ERROR("Unable to create a valid image!");
+                draw_mutex.unlock();
+                return;
+            }
             QSize size(obj->width, obj->height);
-            QPixmap pixmap(size);
+            QPixmap pixmap;
+            bool ret = false;
             if (isScaled())
-                pixmap.convertFromImage(img.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); // Scaled size
+                ret = pixmap.convertFromImage(img.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); // Scaled size
             else
-                pixmap.convertFromImage(img);
+                ret = pixmap.convertFromImage(img);
+            if (!ret || pixmap.isNull())
+            {
+                MSG_ERROR("Unable to create a pixmap out of an image!");
+                draw_mutex.unlock();
+                return;
+            }
+            if (obj->object.label)
-            obj->object.label->setPixmap(pixmap);
+                obj->object.label->setPixmap(pixmap);
+            else
+            {
+                MSG_WARNING("Object " << TObject::handleToString(handle) << " does not exist any more!");
+            }
+        }
-    //    if (mHasFocus)
+        if (obj->object.label)
             obj->object.label->show();
-    /*    else
-        {
-            if (par->type == OBJ_PAGE || par->type == OBJ_SUBPAGE)
-                mToShow.insert(std::pair<ulong, QWidget *>(par->handle, par->object.widget));
-        }
-    */
+    }
     catch(std::exception& e)
+    {
-        MSG_ERROR("Error drawing button " << handleToString(handle) << ": " << e.what());
+        MSG_ERROR("Error drawing button " << TObject::handleToString(handle) << ": " << e.what());
+    }
     catch(...)
+    {
         MSG_ERROR("Unexpected exception occured [MainWindow::displayButton()]");
+    }
+    gObject->cleanMarked();     // We want to be sure to have no dead entries.
     draw_mutex.unlock();
+}
 void MainWindow::SetVisible(ulong handle, bool state)
+{
     DECL_TRACER("MainWindow::SetVisible(ulong handle, bool state)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
     if (!obj)
+    {
-        MSG_ERROR("Object " << handleToString(handle) << " not found!");
+        MSG_ERROR("Object " << TObject::handleToString(handle) << " not found!");
         return;
+    }
-    if (obj->type == OBJ_BUTTON && obj->object.label)
+    if (obj->type == TObject::OBJ_BUTTON && obj->object.label)
+    {
-        MSG_DEBUG("Setting object " << handleToString(handle) << " visibility to " << (state ? "TRUE" : "FALSE"));
+        MSG_DEBUG("Setting object " << TObject::handleToString(handle) << " visibility to " << (state ? "TRUE" : "FALSE"));
         obj->object.label->setVisible(state);
+    }
     else
+    {
-        MSG_DEBUG("Ignoring non button object " << handleToString(handle));
+        MSG_DEBUG("Ignoring non button object " << TObject::handleToString(handle));
+    }
+}
 void MainWindow::setPage(ulong handle, int width, int height)
+{
-    draw_mutex.lock();
     DECL_TRACER("MainWindow::setPage(ulong handle, int width, int height)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
+    draw_mutex.lock();
     QSize qs = menuBar()->sizeHint();
     this->setMinimumSize(scale(width), scale(height) + qs.height());
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
     if (!obj)
+    {
-        obj = addObject();
+        obj = gObject->addObject();
         if (!obj)
+        {
-            MSG_ERROR("Error crating an object for handle " << handleToString(handle));
+            MSG_ERROR("Error crating an object for handle " << TObject::handleToString(handle));
             TError::setError();
             draw_mutex.unlock();
             return;
+        }
         obj->handle = handle;
         obj->height = scale(height);
         obj->width = scale(width);
-        obj->type = OBJ_PAGE;
+        obj->type = TObject::OBJ_PAGE;
+    }
     bool newBackground = false;
     if (!mBackground)
 void MainWindow::setSubPage(ulong handle, int left, int top, int width, int height, ANIMATION_t animate)
+{
     draw_mutex.lock();
     DECL_TRACER("MainWindow::setSubPage(ulong handle, int left, int top, int width, int height)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        draw_mutex.unlock();
+        return;
+    }
     if (isScaled())
+    {
         MSG_DEBUG("Scaling to factor " << mScaleFactor);
+    }
-    OBJECT_t *obj = addObject();
+    TObject::OBJECT_t *obj = gObject->addObject();
     if (!obj)
+    {
         MSG_ERROR("Error adding an object!");
         TError::setError();
     int scLeft = scale(left);
     int scTop = scale(top);
     int scWidth = scale(width);
     int scHeight = scale(height);
-    obj->type = OBJ_SUBPAGE;
+    obj->type = TObject::OBJ_SUBPAGE;
     obj->handle = handle;
     obj->object.widget = new QWidget(centralWidget());
     obj->object.widget->setAutoFillBackground(true);
     obj->object.widget->setFixedSize(scWidth, scHeight);
     obj->object.widget->move(scLeft, scTop);
     QPixmap pix(scWidth, scHeight);
     pix.fill(QColor::fromRgba(qRgba(0,0,0,0xff)));
     QPalette palette;
     palette.setBrush(QPalette::Window, QBrush(pix));
     obj->object.widget->setPalette(palette);
+    obj->aniDirection = true;
-//    if (mHasFocus)
-//    {
-        startAnimation(obj, animate);
+    startAnimation(obj, animate);
-//        obj->object.widget->show();
-/*    }
-    else
-        mToShow.insert(std::pair<ulong, QWidget *>(handle, obj->object.widget));
-*/
     draw_mutex.unlock();
+}
 void MainWindow::setBackground(ulong handle, QByteArray image, size_t rowBytes, int width, int height, ulong color)
+{
     draw_mutex.lock();
     DECL_TRACER("MainWindow::setBackground(ulong handle, QByteArray image, size_t rowBytes, ulong color)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        draw_mutex.unlock();
+        return;
+    }
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
     if (!obj)
+    {
-        MSG_WARNING("No object " << handleToString(handle) << " found!");
+        MSG_WARNING("No object " << TObject::handleToString(handle) << " found!");
         draw_mutex.unlock();
         return;
+    }
-    MSG_TRACE("Object " << handleToString(handle) << " of type " << objectToString(obj->type) << " found!");
+    MSG_TRACE("Object " << TObject::handleToString(handle) << " of type " << gObject->objectToString(obj->type) << " found!");
-    if (obj->type == OBJ_BUTTON || obj->type == OBJ_SUBPAGE)
+    if (obj->type == TObject::OBJ_BUTTON || obj->type == TObject::OBJ_SUBPAGE)
+    {
-        MSG_DEBUG("Processing object " << objectToString(obj->type));
+        MSG_DEBUG("Processing object " << gObject->objectToString(obj->type));
         QPixmap pix(obj->width, obj->height);
         pix.fill(QColor::fromRgba(qRgba(TColor::getRed(color),TColor::getGreen(color),TColor::getBlue(color),TColor::getAlpha(color))));
         if (image.size() > 0)
+        {
+            }
             else
                 pix.convertFromImage(img);
+        }
-        if (obj->type == OBJ_BUTTON)
+        if (obj->type == TObject::OBJ_BUTTON)
+        {
             obj->object.label->setPixmap(pix);
             if (mHasFocus)
                 obj->object.label->show();
             MSG_DEBUG("Setting image as background for page " << ((handle >> 16) & 0x0000ffff));
             QPalette palette;
             palette.setBrush(QPalette::Window, QBrush(pix));
             obj->object.widget->setPalette(palette);
-//            if (mHasFocus)
-                obj->object.widget->show();
+            obj->object.widget->show();
-//            else
-//                mToShow.insert(std::pair<ulong, QWidget *>(handle, obj->object.widget));
+        }
+    }
-    else if (obj->type == OBJ_PAGE)
+    else if (obj->type == TObject::OBJ_PAGE)
+    {
         bool newBackground = false;
         if (!mBackground)
+        {
 void MainWindow::dropPage(ulong handle)
+{
     draw_mutex.lock();
     DECL_TRACER("MainWindow::dropPage(ulong handle)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        draw_mutex.unlock();
+        return;
+    }
-    removeAllChilds(handle);
+    gObject->removeAllChilds(handle);
-    removeObject(handle);
+    gObject->removeObject(handle);
     if (mBackground)
+    {
         delete mBackground;
         mBackground = nullptr;
 void MainWindow::dropSubPage(ulong handle)
+{
     draw_mutex.lock();
     DECL_TRACER("MainWindow::dropSubPage(ulong handle)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        draw_mutex.unlock();
+        return;
+    }
-    removeAllChilds(handle);
+    gObject->removeAllChilds(handle);
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
     if (!obj)
+    {
-        MSG_WARNING("Object " << handleToString(handle) << " does not exist. Ignoring!");
+        MSG_WARNING("Object " << TObject::handleToString(handle) << " does not exist. Ignoring!");
         draw_mutex.unlock();
         return;
+    }
+    obj->aniDirection = false;
     startAnimation(obj, obj->animate, false);
-    OBJECT_t *o = mLastObject;
+    TObject::OBJECT_t *o = mLastObject;
     if (obj->animate.hideEffect == SE_NONE || !o)
+    {
-        dropContent(obj);
+        gObject->dropContent(obj);
-        removeObject(handle);
+        gObject->removeObject(handle);
+    }
     draw_mutex.unlock();
+}
 void MainWindow::dropButton(ulong handle)
+{
     draw_mutex.lock();
     DECL_TRACER("MainWindow::dropButton(ulong handle)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        draw_mutex.unlock();
+        return;
+    }
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
     if (!obj)
+    {
-        MSG_WARNING("Object " << handleToString(handle) << " does not exist. Ignoring!");
+        MSG_WARNING("Object " << TObject::handleToString(handle) << " does not exist. Ignoring!");
         draw_mutex.unlock();
         return;
+    }
-    if (obj->type == OBJ_BUTTON && obj->object.label)
+    if (obj->type == TObject::OBJ_BUTTON && obj->object.label)
+    {
         obj->object.label->close();
         obj->object.label = nullptr;
+    }
-    removeObject(handle);
+    gObject->removeObject(handle);
     draw_mutex.unlock();
+}
 void MainWindow::playVideo(ulong handle, ulong parent, int left, int top, int width, int height, const string& url, const string& user, const string& pw)
+{
     draw_mutex.lock();
     DECL_TRACER("MainWindow::playVideo(ulong handle, const string& url, const string& user, const string& pw))");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        draw_mutex.unlock();
+        return;
+    }
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
-    OBJECT_t *par = findObject(parent);
+    TObject::OBJECT_t *par = gObject->findObject(parent);
-    MSG_TRACE("Processing button " << handleToString(handle) << " from parent " << handleToString(parent));
+    MSG_TRACE("Processing button " << TObject::handleToString(handle) << " from parent " << TObject::handleToString(parent));
     if (!par)
+    {
         MSG_WARNING("Button has no parent! Ignoring it.");
         draw_mutex.unlock();
+    }
     if (!obj)
+    {
         MSG_DEBUG("Adding new video object ...");
-        obj = addObject();
+        obj = gObject->addObject();
         if (!obj)
+        {
             MSG_ERROR("Error creating a video object!");
             TError::setError();
             draw_mutex.unlock();
             return;
+        }
-        obj->type = OBJ_VIDEO;
+        obj->type = TObject::OBJ_VIDEO;
         obj->handle = handle;
         obj->width = width;
         obj->height = height;
         obj->left = left;
         obj->top = top;
         obj->object.vwidget = new QVideoWidget(par->object.widget);
         obj->object.vwidget->installEventFilter(this);
+    }
     else
-        MSG_DEBUG("Object " << handleToString(handle) << " of type " << objectToString(obj->type) << " found!");
+        MSG_DEBUG("Object " << TObject::handleToString(handle) << " of type " << gObject->objectToString(obj->type) << " found!");
     QMediaPlaylist *playlist = new QMediaPlaylist;
     QUrl qurl(url.c_str());
     if (!user.empty())
     playlist->addMedia(qurl);
     obj->player = new QMediaPlayer;
     obj->player->setPlaylist(playlist);
     obj->player->setVideoOutput(obj->object.vwidget);
-//    if (mHasFocus)
-//    {
-        obj->object.vwidget->show();
+    obj->object.vwidget->show();
-        obj->player->play();
+    obj->player->play();
-//    }
+}
 void MainWindow::inputText(Button::TButton* button, QByteArray buf, int width, int height, size_t pixline)
+{
     DECL_TRACER("MainWindow::inputText(Button::TButton* button)");
+    if (!gObject)
+    {
+        MSG_ERROR(_NO_OBJECT);
+        return;
+    }
     if (!button)
+    {
         MSG_WARNING("No valid button!");
         return;
+    }
     ulong handle = button->getHandle();
     ulong parent = button->getParent();
-    OBJECT_t *obj = findObject(handle);
+    TObject::OBJECT_t *obj = gObject->findObject(handle);
-    OBJECT_t *par = findObject(parent);
+    TObject::OBJECT_t *par = gObject->findObject(parent);
-    MSG_TRACE("Processing button " << handleToString(handle) << " from parent " << handleToString(parent));
+    MSG_TRACE("Processing button " << TObject::handleToString(handle) << " from parent " << gObject->handleToString(parent));
     if (!par)
+    {
         MSG_WARNING("Button has no parent! Ignoring it.");
         return;
+    }
     if (!obj)
+    {
         MSG_DEBUG("Adding new input object ...");
-        obj = addObject();
+        obj = gObject->addObject();
         if (!obj)
+        {
             MSG_ERROR("Error creating an input object!");
             TError::setError();
             return;
+        }
-        obj->type = OBJ_INPUT;
+        obj->type = TObject::OBJ_INPUT;
         obj->handle = handle;
         obj->width = scale(width);
         obj->height = scale(height);
         obj->left = scale(button->getLeftPosition());
         obj->top = scale(button->getTopPosition());
             obj->object.multitext->show();
+        }
+    }
     else
-        MSG_DEBUG("Object " << handleToString(handle) << " of type " << objectToString(obj->type) << " found!");
+        MSG_DEBUG("Object " << TObject::handleToString(handle) << " of type " << gObject->objectToString(obj->type) << " found!");
+}
 void MainWindow::showKeyboard(const std::string& init, const std::string& prompt, bool priv)
+{
     DECL_TRACER("MainWindow::showKeyboard(std::string &init, std::string &prompt, bool priv)");
         return value;
     return (int)((double)value * mScaleFactor);
+}
-void MainWindow::startAnimation(OBJECT_t* obj, ANIMATION_t& ani, bool in)
+void MainWindow::startAnimation(TObject::OBJECT_t* obj, ANIMATION_t& ani, bool in)
+{
     DECL_TRACER("MainWindow::startAnimation(OBJECT_t* obj, ANIMATION_t& ani)");
+    if (!obj)
+    {
+        MSG_ERROR("Got no object to start the animation!");
+        return;
+    }
     SHOWEFFECT_t effect;
     int scLeft = obj->left;
     int scTop = obj->top;
     int scWidth = obj->width;
     int scHeight = obj->height;
     if (effect == SE_NONE)
         return;
     if (effect == SE_FADE)
+    {
+        MSG_DEBUG("Fading object " << TObject::handleToString(obj->handle) << (in ? " IN" : " OUT"));
         QGraphicsOpacityEffect *effect = new QGraphicsOpacityEffect(obj->object.widget);
         obj->object.widget->setGraphicsEffect(effect);
         obj->animation = new QPropertyAnimation(effect, "opacity");
+    }
     else
+    {
+        MSG_DEBUG("Moving object " << TObject::handleToString(obj->handle) << (in ? " IN" : " OUT"));
         obj->animation = new QPropertyAnimation(obj->object.widget);
         obj->animation->setTargetObject(obj->object.widget);
+    }
     if (in)

Subversion Repositories tpanel

(root)/trunk/tqtmain.cpp @ 110 – Rev 101 → 107