Merge remote-tracking branch 'origin/pr/3864'
This commit is contained in:
commit
96739d0013
@ -705,6 +705,10 @@ class WebEngineTab(browsertab.AbstractTab):
|
|||||||
utils.read_file('javascript/webelem.js'),
|
utils.read_file('javascript/webelem.js'),
|
||||||
utils.read_file('javascript/caret.js'),
|
utils.read_file('javascript/caret.js'),
|
||||||
)
|
)
|
||||||
|
self._inject_early_js('js',
|
||||||
|
utils.read_file('javascript/print.js'),
|
||||||
|
subframes=True,
|
||||||
|
world=QWebEngineScript.MainWorld)
|
||||||
# FIXME:qtwebengine what about subframes=True?
|
# FIXME:qtwebengine what about subframes=True?
|
||||||
self._inject_early_js('js', js_code, subframes=True)
|
self._inject_early_js('js', js_code, subframes=True)
|
||||||
self._init_stylesheet()
|
self._init_stylesheet()
|
||||||
@ -1061,6 +1065,13 @@ class WebEngineTab(browsertab.AbstractTab):
|
|||||||
def _on_navigation_request(self, navigation):
|
def _on_navigation_request(self, navigation):
|
||||||
super()._on_navigation_request(navigation)
|
super()._on_navigation_request(navigation)
|
||||||
|
|
||||||
|
if navigation.url == QUrl('qute://print'):
|
||||||
|
command_dispatcher = objreg.get('command-dispatcher',
|
||||||
|
scope='window',
|
||||||
|
window=self.win_id)
|
||||||
|
command_dispatcher.printpage()
|
||||||
|
navigation.accepted = False
|
||||||
|
|
||||||
if not navigation.accepted or not navigation.is_main_frame:
|
if not navigation.accepted or not navigation.is_main_frame:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
30
qutebrowser/javascript/print.js
Normal file
30
qutebrowser/javascript/print.js
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
/**
|
||||||
|
* Copyright 2018 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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* this is a hack based on the QupZilla solution, https://github.com/QupZilla/qupzilla/commit/d3f0d766fb052dc504de2426d42f235d96b5eb60
|
||||||
|
*
|
||||||
|
* We go to a qute://print which triggers the print, then we cancel the request.
|
||||||
|
*/
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
window.print = function() {
|
||||||
|
window.location = "qute://print";
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user