Changeset 77250 in webkit

Timestamp:

Feb 1, 2011 6:57:38 AM (13 years ago)

Author:

zoltan@webkit.org

Message:

[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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/qt/BrowserWindow.cpp (modified) (2 diffs)
• MiniBrowser/qt/BrowserWindow.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-01  Zoltan Horvath  <zoltan@webkit.org>
+
+        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@webkit.org>
 

trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

@@ -78 +78 @@
     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)));
@@ -266 +276 @@
 }
 
+void BrowserWindow::toggleFullScreenMode(bool enable)
+{
+    if (enable)
+        setWindowState(Qt::WindowFullScreen);
+    else
+        setWindowState(Qt::WindowNoState);
+}
 
 void BrowserWindow::toggleFrameFlattening(bool toggle)

trunk/Tools/MiniBrowser/qt/BrowserWindow.h

@@ -51 +51 @@
     void openLocation();
 
+signals:
+    void enteredFullScreenMode(bool on);
+
 protected slots:
     void changeLocation();
@@ -63 +66 @@
     void toggleZoomTextOnly(bool on);
     void screenshot();
+
+    void toggleFullScreenMode(bool enable);
 
     void toggleFrameFlattening(bool);