Changeset 76778 in webkit

Timestamp:

Jan 27, 2011 2:25:17 AM (13 years ago)

Author:

zoltan@webkit.org

Message:

[Qt] Add simple zooming features to MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=53231

Reviewed by Andreas Kling.

Add View menu and Zoom In, Zoom Out, Zoom Reset actions to MiniBrowser.

• MiniBrowser/qt/BrowserWindow.cpp:

(BrowserWindow::BrowserWindow):
(BrowserWindow::zoomIn):
(BrowserWindow::zoomOut):
(BrowserWindow::resetZoom):
(BrowserWindow::updateUserAgentList):
(BrowserWindow::applyZoom):

• MiniBrowser/qt/BrowserWindow.h:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-27  Zoltan Horvath  <zoltan@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Add simple zooming features to MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=53231
+
+        Add View menu and Zoom In, Zoom Out, Zoom Reset actions to MiniBrowser.
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::zoomIn):
+        (BrowserWindow::zoomOut):
+        (BrowserWindow::resetZoom):
+        (BrowserWindow::updateUserAgentList):
+        (BrowserWindow::applyZoom):
+        * MiniBrowser/qt/BrowserWindow.h:
+
 2011-01-26  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

@@ -37 +37 @@
 QGraphicsWKView::BackingStoreType BrowserWindow::backingStoreTypeForNewWindow = QGraphicsWKView::Simple;
 
+QVector<int> BrowserWindow::m_zoomLevels;
+
 BrowserWindow::BrowserWindow(QWKContext* context)
+    : m_currentZoom(100) ,
+      m_browser(new BrowserView(backingStoreTypeForNewWindow, context))
 {
     setAttribute(Qt::WA_DeleteOnClose);
+
+    connect(m_browser->view(), SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
+    connect(m_browser->view(), SIGNAL(titleChanged(const QString&)), SLOT(titleChanged(const QString&)));
+    connect(m_browser->view(), SIGNAL(urlChanged(const QUrl&)), SLOT(urlChanged(const QUrl&)));
+
+    this->setCentralWidget(m_browser);
+    m_browser->setFocus(Qt::OtherFocusReason);
 
     QMenu* fileMenu = menuBar()->addMenu("&File");
@@ -47 +58 @@
     fileMenu->addAction("Quit", this, SLOT(close()));
 
+    QMenu* viewMenu = menuBar()->addMenu("&View");
+    viewMenu->addAction(page()->action(QWKPage::Stop));
+    viewMenu->addAction(page()->action(QWKPage::Reload));
+    viewMenu->addSeparator();
+    QAction* zoomIn = viewMenu->addAction("Zoom &In", this, SLOT(zoomIn()));
+    QAction* zoomOut = viewMenu->addAction("Zoom &Out", this, SLOT(zoomOut()));
+    QAction* resetZoom = viewMenu->addAction("Reset Zoom", this, SLOT(resetZoom()));
+
+    zoomIn->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Plus));
+    zoomOut->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Minus));
+    resetZoom->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
+
     QMenu* toolsMenu = menuBar()->addMenu("&Develop");
     toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
-
-    m_browser = new BrowserView(backingStoreTypeForNewWindow, context);
-    connect(m_browser->view(), SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
-    connect(m_browser->view(), SIGNAL(titleChanged(const QString&)), SLOT(titleChanged(const QString&)));
-    connect(m_browser->view(), SIGNAL(urlChanged(const QUrl&)), SLOT(urlChanged(const QUrl&)));
-
-    this->setCentralWidget(m_browser);
-    m_browser->setFocus(Qt::OtherFocusReason);
 
     m_addressBar = new QLineEdit();
@@ -72 +87 @@
 
     page()->setCreateNewPageFunction(newPageFunction);
+
+    // the zoom values are chosen to be like in Mozilla Firefox 3
+    if (!m_zoomLevels.count()) {
+        m_zoomLevels << 30 << 50 << 67 << 80 << 90;
+        m_zoomLevels << 100;
+        m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+    }
 
     resize(960, 640);
@@ -154 +176 @@
 }
 
+void BrowserWindow::zoomIn()
+{
+    int i = m_zoomLevels.indexOf(m_currentZoom);
+    Q_ASSERT(i >= 0);
+    if (i < m_zoomLevels.count() - 1)
+        m_currentZoom = m_zoomLevels[i + 1];
+
+    applyZoom();
+}
+
+void BrowserWindow::zoomOut()
+{
+    int i = m_zoomLevels.indexOf(m_currentZoom);
+    Q_ASSERT(i >= 0);
+    if (i > 0)
+        m_currentZoom = m_zoomLevels[i - 1];
+
+    applyZoom();
+}
+
+void BrowserWindow::resetZoom()
+{
+    m_currentZoom = 100;
+    applyZoom();
+}
+
+void BrowserWindow::showUserAgentDialog()
+{
+    updateUserAgentList();
+
+    QDialog dialog(this);
+    dialog.setWindowTitle("Change User Agent");
+    dialog.resize(size().width() * 0.7, dialog.size().height());
+    QVBoxLayout* layout = new QVBoxLayout(&dialog);
+    dialog.setLayout(layout);
+
+    QComboBox* combo = new QComboBox(&dialog);
+    combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+    combo->setEditable(true);
+    combo->insertItems(0, m_userAgentList);
+    layout->addWidget(combo);
+
+    int index = combo->findText(page()->customUserAgent());
+    combo->setCurrentIndex(index);
+
+    QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel
+                                                      , Qt::Horizontal, &dialog);
+    connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
+    layout->addWidget(buttonBox);
+
+    if (dialog.exec() && !combo->currentText().isEmpty())
+        page()->setCustomUserAgent(combo->currentText());
+}
+
 void BrowserWindow::updateUserAgentList()
 {
@@ -173 +250 @@
 }
 
-void BrowserWindow::showUserAgentDialog()
-{
-    updateUserAgentList();
-
-    QDialog dialog(this);
-    dialog.setWindowTitle("Change User Agent");
-    dialog.resize(size().width() * 0.7, dialog.size().height());
-    QVBoxLayout* layout = new QVBoxLayout(&dialog);
-    dialog.setLayout(layout);
-
-    QComboBox* combo = new QComboBox(&dialog);
-    combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
-    combo->setEditable(true);
-    combo->insertItems(0, m_userAgentList);
-    layout->addWidget(combo);
-
-    int index = combo->findText(page()->customUserAgent());
-    combo->setCurrentIndex(index);
-
-    QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel
-                                                      , Qt::Horizontal, &dialog);
-    connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
-    layout->addWidget(buttonBox);
-
-    if (dialog.exec() && !combo->currentText().isEmpty())
-        page()->setCustomUserAgent(combo->currentText());
+void BrowserWindow::applyZoom()
+{
+    page()->setPageZoomFactor(qreal(m_currentZoom) / 100.0);
 }
 

trunk/Tools/MiniBrowser/qt/BrowserWindow.h

@@ -57 +57 @@
     void urlChanged(const QUrl&);
     void openFile();
+
+    void zoomIn();
+    void zoomOut();
+    void resetZoom();
+
     void showUserAgentDialog();
 
 private:
     void updateUserAgentList();
+
+    void applyZoom();
+
+    static QVector<int> m_zoomLevels;
+    int m_currentZoom;
 
     BrowserView* m_browser;