From a6adbdf167b657e02979559ac5fc5923b2caf7af Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 29 Dec 2017 19:10:33 +0100 Subject: Clean up testbrowser scripts --- .gitignore | 16 +++---- scripts/testbrowser/cpp/webengine/main.cpp | 13 ++++++ scripts/testbrowser/cpp/webengine/testbrowser.pro | 6 +++ scripts/testbrowser/cpp/webkit/main.cpp | 13 ++++++ scripts/testbrowser/cpp/webkit/testbrowser.pro | 6 +++ scripts/testbrowser/testbrowser_webengine.py | 50 ++++++++++++++++++++ scripts/testbrowser/testbrowser_webkit.py | 56 +++++++++++++++++++++++ scripts/testbrowser_cpp/webengine/main.cpp | 13 ------ scripts/testbrowser_cpp/webengine/testbrowser.pro | 6 --- scripts/testbrowser_cpp/webkit/main.cpp | 13 ------ scripts/testbrowser_cpp/webkit/testbrowser.pro | 6 --- 11 files changed, 152 insertions(+), 46 deletions(-) create mode 100644 scripts/testbrowser/cpp/webengine/main.cpp create mode 100644 scripts/testbrowser/cpp/webengine/testbrowser.pro create mode 100644 scripts/testbrowser/cpp/webkit/main.cpp create mode 100644 scripts/testbrowser/cpp/webkit/testbrowser.pro create mode 100755 scripts/testbrowser/testbrowser_webengine.py create mode 100755 scripts/testbrowser/testbrowser_webkit.py delete mode 100644 scripts/testbrowser_cpp/webengine/main.cpp delete mode 100644 scripts/testbrowser_cpp/webengine/testbrowser.pro delete mode 100644 scripts/testbrowser_cpp/webkit/main.cpp delete mode 100644 scripts/testbrowser_cpp/webkit/testbrowser.pro 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 new file mode 100644 index 000000000..311432e92 --- /dev/null +++ b/scripts/testbrowser/cpp/webengine/main.cpp @@ -0,0 +1,13 @@ +#include +#include +#include + + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QWebEngineView view; + view.load(QUrl(argv[1])); + view.show(); + return app.exec(); +} diff --git a/scripts/testbrowser/cpp/webengine/testbrowser.pro b/scripts/testbrowser/cpp/webengine/testbrowser.pro new file mode 100644 index 000000000..12a1cf7f6 --- /dev/null +++ b/scripts/testbrowser/cpp/webengine/testbrowser.pro @@ -0,0 +1,6 @@ +QT += core widgets webenginewidgets + +TARGET = testbrowser +TEMPLATE = app + +SOURCES += main.cpp diff --git a/scripts/testbrowser/cpp/webkit/main.cpp b/scripts/testbrowser/cpp/webkit/main.cpp new file mode 100644 index 000000000..06c3d1a4f --- /dev/null +++ b/scripts/testbrowser/cpp/webkit/main.cpp @@ -0,0 +1,13 @@ +#include +#include +#include + + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QWebView view; + view.load(QUrl(argv[1])); + view.show(); + return app.exec(); +} diff --git a/scripts/testbrowser/cpp/webkit/testbrowser.pro b/scripts/testbrowser/cpp/webkit/testbrowser.pro new file mode 100644 index 000000000..59f55ddfc --- /dev/null +++ b/scripts/testbrowser/cpp/webkit/testbrowser.pro @@ -0,0 +1,6 @@ +QT += core widgets webkit webkitwidgets + +TARGET = testbrowser +TEMPLATE = app + +SOURCES += main.cpp 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) +# +# 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 . + +"""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) +# +# 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 . + +"""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_() diff --git a/scripts/testbrowser_cpp/webengine/main.cpp b/scripts/testbrowser_cpp/webengine/main.cpp deleted file mode 100644 index 311432e92..000000000 --- a/scripts/testbrowser_cpp/webengine/main.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include - - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - QWebEngineView view; - view.load(QUrl(argv[1])); - view.show(); - return app.exec(); -} diff --git a/scripts/testbrowser_cpp/webengine/testbrowser.pro b/scripts/testbrowser_cpp/webengine/testbrowser.pro deleted file mode 100644 index 12a1cf7f6..000000000 --- a/scripts/testbrowser_cpp/webengine/testbrowser.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += core widgets webenginewidgets - -TARGET = testbrowser -TEMPLATE = app - -SOURCES += main.cpp diff --git a/scripts/testbrowser_cpp/webkit/main.cpp b/scripts/testbrowser_cpp/webkit/main.cpp deleted file mode 100644 index 06c3d1a4f..000000000 --- a/scripts/testbrowser_cpp/webkit/main.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include - - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - QWebView view; - view.load(QUrl(argv[1])); - view.show(); - return app.exec(); -} diff --git a/scripts/testbrowser_cpp/webkit/testbrowser.pro b/scripts/testbrowser_cpp/webkit/testbrowser.pro deleted file mode 100644 index 59f55ddfc..000000000 --- a/scripts/testbrowser_cpp/webkit/testbrowser.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += core widgets webkit webkitwidgets - -TARGET = testbrowser -TEMPLATE = app - -SOURCES += main.cpp -- cgit v1.2.3-54-g00ecf