Clean up testbrowser scripts

7 files changed, 114 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index cb244557b..54a0dcae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,12 +31,12 @@ __pycache__
 /prof
 /venv
 TODO
-/scripts/testbrowser_cpp/webkit/Makefile
-/scripts/testbrowser_cpp/webkit/main.o
-/scripts/testbrowser_cpp/webkit/testbrowser
-/scripts/testbrowser_cpp/webkit/.qmake.stash
-/scripts/testbrowser_cpp/webengine/Makefile
-/scripts/testbrowser_cpp/webengine/main.o
-/scripts/testbrowser_cpp/webengine/testbrowser
-/scripts/testbrowser_cpp/webengine/.qmake.stash
+/scripts/testbrowser/cpp/webkit/Makefile
+/scripts/testbrowser/cpp/webkit/main.o
+/scripts/testbrowser/cpp/webkit/testbrowser
+/scripts/testbrowser/cpp/webkit/.qmake.stash
+/scripts/testbrowser/cpp/webengine/Makefile
+/scripts/testbrowser/cpp/webengine/main.o
+/scripts/testbrowser/cpp/webengine/testbrowser
+/scripts/testbrowser/cpp/webengine/.qmake.stash
 /scripts/dev/pylint_checkers/qute_pylint.egg-info
diff --git a/scripts/testbrowser_cpp/webengine/main.cpp b/scripts/testbrowser/cpp/webengine/main.cpp
index 311432e92..311432e92 100644
--- a/scripts/testbrowser_cpp/webengine/main.cpp
+++ b/scripts/testbrowser/cpp/webengine/main.cpp
diff --git a/scripts/testbrowser_cpp/webengine/testbrowser.pro b/scripts/testbrowser/cpp/webengine/testbrowser.pro
index 12a1cf7f6..12a1cf7f6 100644
--- a/scripts/testbrowser_cpp/webengine/testbrowser.pro
+++ b/scripts/testbrowser/cpp/webengine/testbrowser.pro
diff --git a/scripts/testbrowser_cpp/webkit/main.cpp b/scripts/testbrowser/cpp/webkit/main.cpp
index 06c3d1a4f..06c3d1a4f 100644
--- a/scripts/testbrowser_cpp/webkit/main.cpp
+++ b/scripts/testbrowser/cpp/webkit/main.cpp
diff --git a/scripts/testbrowser_cpp/webkit/testbrowser.pro b/scripts/testbrowser/cpp/webkit/testbrowser.pro
index 59f55ddfc..59f55ddfc 100644
--- a/scripts/testbrowser_cpp/webkit/testbrowser.pro
+++ b/scripts/testbrowser/cpp/webkit/testbrowser.pro
diff --git a/scripts/testbrowser/testbrowser_webengine.py b/scripts/testbrowser/testbrowser_webengine.py
new file mode 100755
index 000000000..e6353dc23
--- /dev/null
+++ b/scripts/testbrowser/testbrowser_webengine.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Very simple browser for testing purposes."""
+
+import sys
+import argparse
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWebEngineWidgets import QWebEngineView
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('url', help='The URL to open')
+    return parser.parse_known_args()[0]
+
+
+if __name__ == '__main__':
+    args = parse_args()
+    app = QApplication(sys.argv)
+    wv = QWebEngineView()
+
+    wv.loadStarted.connect(lambda: print("Loading started"))
+    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
+    wv.loadFinished.connect(lambda: print("Loading finished"))
+
+    wv.load(QUrl.fromUserInput(args.url))
+    wv.show()
+
+    app.exec_()
diff --git a/scripts/testbrowser/testbrowser_webkit.py b/scripts/testbrowser/testbrowser_webkit.py
new file mode 100755
index 000000000..7c7081f18
--- /dev/null
+++ b/scripts/testbrowser/testbrowser_webkit.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Very simple browser for testing purposes."""
+
+import sys
+import argparse
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWebKit import QWebSettings
+from PyQt5.QtWebKitWidgets import QWebView
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('url', help='The URL to open')
+    parser.add_argument('--plugins', '-p', help='Enable plugins',
+                        default=False, action='store_true')
+    return parser.parse_known_args()[0]
+
+
+if __name__ == '__main__':
+    args = parse_args()
+    app = QApplication(sys.argv)
+    wv = QWebView()
+
+    wv.loadStarted.connect(lambda: print("Loading started"))
+    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
+    wv.loadFinished.connect(lambda: print("Loading finished"))
+
+    if args.plugins:
+        wv.settings().setAttribute(QWebSettings.PluginsEnabled, True)
+
+    wv.load(QUrl.fromUserInput(args.url))
+    wv.show()
+
+    app.exec_()