[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit ca411388e030d59961623a2019043fd85f52c342
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 13:32:27 2011 +0000

    [Qt] Add Toggle Frame Flattening, Auto Load Images and Disable JavaScript actions to MiniBrowser.
    https://bugs.webkit.org/show_bug.cgi?id=53489
    
    Reviewed by Andreas Kling.
    
    Add Toggle Frame Flattening action to Develop menu. Add Auto Load Images and Disable JavaScript actions
    to Settings menu.
    
    * MiniBrowser/qt/BrowserWindow.cpp:
    (BrowserWindow::BrowserWindow):
    (BrowserWindow::toggleFrameFlattening):
    (BrowserWindow::toggleDisableJavaScript):
    (BrowserWindow::toggleAutoLoadImages):
    * MiniBrowser/qt/BrowserWindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3415546..a0bc443 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2011-02-01  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Add Toggle Frame Flattening, Auto Load Images and Disable JavaScript actions to MiniBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=53489
+
+        Add Toggle Frame Flattening action to Develop menu. Add Auto Load Images and Disable JavaScript actions
+        to Settings menu.
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::toggleFrameFlattening):
+        (BrowserWindow::toggleDisableJavaScript):
+        (BrowserWindow::toggleAutoLoadImages):
+        * MiniBrowser/qt/BrowserWindow.h:
+
 2011-01-31  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
index 0d2826d..94cccea 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp
@@ -28,6 +28,8 @@
 
 #include "BrowserWindow.h"
 
+#include "qwkpreferences.h"
+
 static QWKPage* newPageFunction(QWKPage* page)
 {
     BrowserWindow* window = new BrowserWindow(page->context());
@@ -76,8 +78,20 @@ BrowserWindow::BrowserWindow(QWKContext* context)
     resetZoom->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
 
     QMenu* toolsMenu = menuBar()->addMenu("&Develop");
+    QAction* toggleFrameFlattening = toolsMenu->addAction("Toggle Frame Flattening", this, SLOT(toggleFrameFlattening(bool)));
+    toggleFrameFlattening->setCheckable(true);
+    toggleFrameFlattening->setChecked(false);
+    toolsMenu->addSeparator();
     toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
 
+    QMenu* settingsMenu = menuBar()->addMenu("&Settings");
+    QAction* toggleAutoLoadImages = settingsMenu->addAction("Disable Auto Load Images", this, SLOT(toggleAutoLoadImages(bool)));
+    toggleAutoLoadImages->setCheckable(true);
+    toggleAutoLoadImages->setChecked(false);
+    QAction* toggleDisableJavaScript = settingsMenu->addAction("Disable JavaScript", this, SLOT(toggleDisableJavaScript(bool)));
+    toggleDisableJavaScript->setCheckable(true);
+    toggleDisableJavaScript->setChecked(false);
+
     m_addressBar = new QLineEdit();
     connect(m_addressBar, SIGNAL(returnPressed()), SLOT(changeLocation()));
 
@@ -251,6 +265,13 @@ void BrowserWindow::toggleZoomTextOnly(bool b)
     m_isZoomTextOnly = b;
 }
 
+
+void BrowserWindow::toggleFrameFlattening(bool toggle)
+{
+    page()->preferences()->setAttribute(QWKPreferences::FrameFlatteningEnabled, toggle);
+}
+
+
 void BrowserWindow::showUserAgentDialog()
 {
     updateUserAgentList();
@@ -280,6 +301,16 @@ void BrowserWindow::showUserAgentDialog()
         page()->setCustomUserAgent(combo->currentText());
 }
 
+void BrowserWindow::toggleDisableJavaScript(bool enable)
+{
+    page()->preferences()->setAttribute(QWKPreferences::JavascriptEnabled, !enable);
+}
+
+void BrowserWindow::toggleAutoLoadImages(bool enable)
+{
+    page()->preferences()->setAttribute(QWKPreferences::AutoLoadImages, !enable);
+}
+
 void BrowserWindow::updateUserAgentList()
 {
     QFile file(":/useragentlist.txt");
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
index 596a335..f627a69 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.h
+++ b/Tools/MiniBrowser/qt/BrowserWindow.h
@@ -63,8 +63,12 @@ protected slots:
     void toggleZoomTextOnly(bool on);
     void screenshot();
 
+    void toggleFrameFlattening(bool);
     void showUserAgentDialog();
 
+    void toggleAutoLoadImages(bool);
+    void toggleDisableJavaScript(bool);
+
 private:
     void updateUserAgentList();
 

-- 
WebKit Debian packaging