Changeset 102093 in webkit

Timestamp:

Dec 5, 2011 9:55:18 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] MiniBrowser should default to touch behavior
​https://bugs.webkit.org/show_bug.cgi?id=73863

Patch by Alexander Færøy <​alexander.faeroy@nokia.com> on 2011-12-05
Reviewed by Chang Shu.

MiniBrowser currently defaults to the traditional desktop behaviour
instead of touch behaviour which is prefered.

• MiniBrowser/qt/BrowserWindow.cpp:

(BrowserWindow::BrowserWindow):

• MiniBrowser/qt/MiniBrowserApplication.cpp:

(printHelp):
(MiniBrowserApplication::handleUserOptions):

• MiniBrowser/qt/MiniBrowserApplication.h:

(WindowOptions::WindowOptions):
(WindowOptions::setUseTraditionalDesktopBehavior):
(WindowOptions::useTraditionalDesktopBehavior):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-05  Alexander Færøy  <alexander.faeroy@nokia.com>
+
+        [Qt] MiniBrowser should default to touch behavior
+        https://bugs.webkit.org/show_bug.cgi?id=73863
+
+        Reviewed by Chang Shu.
+
+        MiniBrowser currently defaults to the traditional desktop behaviour
+        instead of touch behaviour which is prefered.
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        * MiniBrowser/qt/MiniBrowserApplication.cpp:
+        (printHelp):
+        (MiniBrowserApplication::handleUserOptions):
+        * MiniBrowser/qt/MiniBrowserApplication.h:
+        (WindowOptions::WindowOptions):
+        (WindowOptions::setUseTraditionalDesktopBehavior):
+        (WindowOptions::useTraditionalDesktopBehavior):
+
 2011-12-05  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

@@ -52 +52 @@
     setSource(QUrl("qrc:/qml/BrowserWindow.qml"));
     connect(rootObject(), SIGNAL(pageTitleChanged(QString)), this, SLOT(setWindowTitle(QString)));
-    if (!options->useTouchWebView())
+    if (options->useTraditionalDesktopBehavior())
         webView()->experimental()->setUseTraditionalDesktopBehaviour(true);
     if (options->startFullScreen())

trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp

@@ -169 +169 @@
 {
     qDebug() << "Usage:" << programName.toLatin1().data()
-         << "[--touch]"
+         << "[--desktop]"
          << "[-r list]"
          << "[--robot-timeout seconds]"
@@ -193 +193 @@
     }
 
-    m_windowOptions.setUseTouchWebView(takeOptionFlag(&args, "--touch"));
+    m_windowOptions.setUseTraditionalDesktopBehavior(takeOptionFlag(&args, "--desktop"));
     m_windowOptions.setPrintLoadedUrls(takeOptionFlag(&args, "-v"));
     m_windowOptions.setStartMaximized(takeOptionFlag(&args, "--maximize"));

trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h

@@ -42 +42 @@
     Q_OBJECT
     Q_PROPERTY(bool printLoadedUrls READ printLoadedUrls)
-    Q_PROPERTY(bool useTouchWebView READ useTouchWebView)
+    Q_PROPERTY(bool useTraditionalDesktopBehavior READ useTraditionalDesktopBehavior)
     Q_PROPERTY(bool startMaximized READ startMaximized)
 
@@ -49 +49 @@
         : QObject(parent)
         , m_printLoadedUrls(false)
-        , m_useTouchWebView(false)
+        , m_useTraditionalDesktopBehavior(false)
         , m_startMaximized(false)
         , m_windowSize(QSize(980, 735))
@@ -57 +57 @@
     void setPrintLoadedUrls(bool enabled) { m_printLoadedUrls = enabled; }
     bool printLoadedUrls() const { return m_printLoadedUrls; }
-    void setUseTouchWebView(bool enabled) { m_useTouchWebView = enabled; }
-    bool useTouchWebView() const { return m_useTouchWebView; }
+    void setUseTraditionalDesktopBehavior(bool enabled) { m_useTraditionalDesktopBehavior = enabled; }
+    bool useTraditionalDesktopBehavior() const { return m_useTraditionalDesktopBehavior; }
     void setStartMaximized(bool enabled) { m_startMaximized = enabled; }
     bool startMaximized() const { return m_startMaximized; }
@@ -68 +68 @@
 private:
     bool m_printLoadedUrls;
-    bool m_useTouchWebView;
+    bool m_useTraditionalDesktopBehavior;
     bool m_startMaximized;
     bool m_startFullScreen;