[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c833c91aff9f502216b5f52224034cff00adfd27
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 16:01:11 2010 +0000

    [Qt] Add toggle on/off mechanism for Spatial Navigation in QtLauncher.
    
    Reviewed by Kenneth Christiansen.
    Patch by Antonio Gomes <tonikitoo at webkit.org>
    
    * QtLauncher/main.cpp:
    (LauncherWindow::toggleSpatialNavigation):
    (LauncherWindow::setupUI):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c4758dc..b4c8c2d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,16 @@
 2010-03-02  Antonio Gomes  <tonikitoo at webkit.org>
 
+        Reviewed by Kenneth Christiansen.
+        Patch by Antonio Gomes <tonikitoo at webkit.org>
+
+        Add toggle on/off mechanism for Spatial Navigation in QtLauncher.
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::toggleSpatialNavigation):
+        (LauncherWindow::setupUI):
+
+2010-03-02  Antonio Gomes  <tonikitoo at webkit.org>
+
         Reviewed by Simon Hausmann.
         Patch by Antonio Gomes <tonikitoo at webkit.org>
 
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index c47ef13..b34dd22 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -118,6 +118,7 @@ protected slots:
     void toggleAcceleratedCompositing(bool toggle);
     void toggleWebGL(bool toggle);
     void initializeView(bool useGraphicsView = false);
+    void toggleSpatialNavigation(bool b);
 
 public slots:
     void newWindow();
@@ -536,6 +537,11 @@ void LauncherWindow::initializeView(bool useGraphicsView)
 #endif
 }
 
+void LauncherWindow::toggleSpatialNavigation(bool b)
+{
+    page()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, b);
+}
+
 void LauncherWindow::newWindow()
 {
     LauncherWindow* mw = new LauncherWindow(this, false);
@@ -629,6 +635,10 @@ void LauncherWindow::createChrome()
     toggleAcceleratedCompositing->setEnabled(isGraphicsBased());
     toggleAcceleratedCompositing->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
 
+    QAction* spatialNavigationAction = toolsMenu->addAction("Toggle Spatial Navigation", this, SLOT(toggleSpatialNavigation(bool)));
+    spatialNavigationAction->setCheckable(true);
+    spatialNavigationAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_S));
+
     graphicsViewMenu->addSeparator();
 
     m_flipAnimated = graphicsViewMenu->addAction("Animated Flip");

-- 
WebKit Debian packaging