[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a08b463943d8dd39e4237ffa9f9a2dcaebf9d3da
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 11:46:13 2009 +0000

    2009-10-07  Girish Ramakrishnan  <girish at forwardbias.in>
    
            Reviewed by Simon Hausmann.
    
            Add a simple rotation effect to QGVLauncher
    
            https://bugs.webkit.org/show_bug.cgi?id=30162
    
            * QGVLauncher/main.cpp:
            (MainView::animatedFlip):
            (MainWindow::animatedFlip):
            (MainWindow::buildUI):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49240 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index da1699a..2980736 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-07  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Simon Hausmann.
+
+        Add a simple rotation effect to QGVLauncher
+
+        https://bugs.webkit.org/show_bug.cgi?id=30162
+
+        * QGVLauncher/main.cpp:
+        (MainView::animatedFlip):
+        (MainWindow::animatedFlip):
+        (MainWindow::buildUI):
+
 2009-10-07  Volker Hilsheimer  <volker.hilsheimer at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index 86c6b65..8436497 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -6,6 +6,7 @@
  * Copyright (C) 2006 Simon Hausmann <hausmann at kde.org>
  * Copyright (C) 2009 Kenneth Christiansen <kenneth at webkit.org>
  * Copyright (C) 2009 Antonio Gomes <antonio.gomes at openbossa.org>
+ * Copyright (C) 2009 Girish Ramakrishnan <girish at forwardbias.in>
  *
  * All rights reserved.
  *
@@ -101,6 +102,20 @@ public slots:
 #endif
     }
 
+    void animatedFlip()
+    {
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+        QSizeF center = m_mainWidget->boundingRect().size() / 2;
+        QPointF centerPoint = QPointF(center.width(), center.height());
+        m_mainWidget->setTransformOriginPoint(centerPoint);
+
+        QPropertyAnimation* animation = new QPropertyAnimation(m_mainWidget, "rotation", this);
+        animation->setDuration(1000);
+        animation->setStartValue(m_mainWidget->rotation());
+        animation->setEndValue(m_mainWidget->rotation() + 180);
+        animation->start(QAbstractAnimation::DeleteWhenStopped);
+#endif
+    }
 private:
     QGraphicsWidget* m_mainWidget;
 };
@@ -235,6 +250,10 @@ public slots:
         view->flip();
     }
 
+    void animatedFlip()
+    {
+        view->animatedFlip();
+    }
 private:
     void buildUI()
     {
@@ -261,6 +280,7 @@ private:
 
         QMenu* fxMenu = menuBar()->addMenu("&Effects");
         fxMenu->addAction("Flip", this, SLOT(flip()));
+        fxMenu->addAction("Animated Flip", this, SLOT(animatedFlip()));
     }
 
 private:

-- 
WebKit Debian packaging