[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 6730ad5169b5176776ac63e70f8b903f751b7014
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 14:57:38 2011 +0000

    [Qt] Add Window menu and Toggle FullScreen action to MiniBrowser.
    https://bugs.webkit.org/show_bug.cgi?id=53491
    
    Reviewed by Andreas Kling.
    
    * MiniBrowser/qt/BrowserWindow.cpp:
    (BrowserWindow::BrowserWindow):
    (BrowserWindow::toggleFullScreenMode):
    * MiniBrowser/qt/BrowserWindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77250 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a0bc443..0081ebc 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Andreas Kling.
 
+        [Qt] Add Window menu and Toggle FullScreen action to MiniBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=53491
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::toggleFullScreenMode):
+        * MiniBrowser/qt/BrowserWindow.h:
+
+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
 
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
index 94cccea..eecb88a 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp
@@ -77,6 +77,16 @@ BrowserWindow::BrowserWindow(QWKContext* context)
     zoomOut->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Minus));
     resetZoom->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
 
+    QMenu* windowMenu = menuBar()->addMenu("&Window");
+    QAction* toggleFullScreen = windowMenu->addAction("Toggle FullScreen", this, SIGNAL(enteredFullScreenMode(bool)));
+    toggleFullScreen->setShortcut(Qt::Key_F11);
+    toggleFullScreen->setCheckable(true);
+    toggleFullScreen->setChecked(false);
+    // When exit fullscreen mode by clicking on the exit area (bottom right corner) we must
+    // uncheck the Toggle FullScreen action.
+    toggleFullScreen->connect(this, SIGNAL(enteredFullScreenMode(bool)), SLOT(setChecked(bool)));
+    connect(this, SIGNAL(enteredFullScreenMode(bool)), this, SLOT(toggleFullScreenMode(bool)));
+
     QMenu* toolsMenu = menuBar()->addMenu("&Develop");
     QAction* toggleFrameFlattening = toolsMenu->addAction("Toggle Frame Flattening", this, SLOT(toggleFrameFlattening(bool)));
     toggleFrameFlattening->setCheckable(true);
@@ -265,6 +275,13 @@ void BrowserWindow::toggleZoomTextOnly(bool b)
     m_isZoomTextOnly = b;
 }
 
+void BrowserWindow::toggleFullScreenMode(bool enable)
+{
+    if (enable)
+        setWindowState(Qt::WindowFullScreen);
+    else
+        setWindowState(Qt::WindowNoState);
+}
 
 void BrowserWindow::toggleFrameFlattening(bool toggle)
 {
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
index f627a69..f48ac99 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.h
+++ b/Tools/MiniBrowser/qt/BrowserWindow.h
@@ -50,6 +50,9 @@ public slots:
     BrowserWindow* newWindow(const QString& url = "about:blank");
     void openLocation();
 
+signals:
+    void enteredFullScreenMode(bool on);
+
 protected slots:
     void changeLocation();
     void loadProgress(int progress);
@@ -63,6 +66,8 @@ protected slots:
     void toggleZoomTextOnly(bool on);
     void screenshot();
 
+    void toggleFullScreenMode(bool enable);
+
     void toggleFrameFlattening(bool);
     void showUserAgentDialog();
 

-- 
WebKit Debian packaging