Title: [102093] trunk/Tools
- Revision
- 102093
- Author
- [email protected]
- Date
- 2011-12-05 21:55:18 -0800 (Mon, 05 Dec 2011)
Log Message
[Qt] MiniBrowser should default to touch behavior
https://bugs.webkit.org/show_bug.cgi?id=73863
Patch by Alexander Færøy <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (102092 => 102093)
--- trunk/Tools/ChangeLog 2011-12-06 05:30:08 UTC (rev 102092)
+++ trunk/Tools/ChangeLog 2011-12-06 05:55:18 UTC (rev 102093)
@@ -1,3 +1,23 @@
+2011-12-05 Alexander Færøy <[email protected]>
+
+ [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 <[email protected]>
webkit.py: Really fix the printing of StringImpl now that 8-bit strings are present.
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (102092 => 102093)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-12-06 05:30:08 UTC (rev 102092)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-12-06 05:55:18 UTC (rev 102093)
@@ -51,7 +51,7 @@
engine()->rootContext()->setContextProperty("options", options);
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())
showFullScreen();
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (102092 => 102093)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-12-06 05:30:08 UTC (rev 102092)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-12-06 05:55:18 UTC (rev 102093)
@@ -168,7 +168,7 @@
static void printHelp(const QString& programName)
{
qDebug() << "Usage:" << programName.toLatin1().data()
- << "[--touch]"
+ << "[--desktop]"
<< "[-r list]"
<< "[--robot-timeout seconds]"
<< "[--robot-extra-time seconds]"
@@ -192,7 +192,7 @@
appQuit(0);
}
- m_windowOptions.setUseTouchWebView(takeOptionFlag(&args, "--touch"));
+ m_windowOptions.setUseTraditionalDesktopBehavior(takeOptionFlag(&args, "--desktop"));
m_windowOptions.setPrintLoadedUrls(takeOptionFlag(&args, "-v"));
m_windowOptions.setStartMaximized(takeOptionFlag(&args, "--maximize"));
m_windowOptions.setStartFullScreen(takeOptionFlag(&args, "-f"));
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (102092 => 102093)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-12-06 05:30:08 UTC (rev 102092)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-12-06 05:55:18 UTC (rev 102093)
@@ -41,14 +41,14 @@
class WindowOptions : public QObject {
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)
public:
WindowOptions(QObject* parent = 0)
: QObject(parent)
, m_printLoadedUrls(false)
- , m_useTouchWebView(false)
+ , m_useTraditionalDesktopBehavior(false)
, m_startMaximized(false)
, m_windowSize(QSize(980, 735))
{
@@ -56,8 +56,8 @@
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; }
void setStartFullScreen(bool enabled) { m_startFullScreen = enabled; }
@@ -67,7 +67,7 @@
private:
bool m_printLoadedUrls;
- bool m_useTouchWebView;
+ bool m_useTraditionalDesktopBehavior;
bool m_startMaximized;
bool m_startFullScreen;
QSize m_windowSize;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
