rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changes to pull request 3864, window.print for webengine

Browse Source
This commit is contained in:
Joakim Särehag 2018-05-09 14:36:03 +02:00
parent 199eac2db8
commit 0e756d2f68
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qutebrowser/browser/webengine/webenginetab.py
View File

@ -696,16 +696,14 @@ 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()
js_code_print = utils.read_file('javascript/print.js')
self._inject_early_js('js',
js_code_print,
subframes=True,
world=QWebEngineScript.MainWorld)
greasemonkey = objreg.get('greasemonkey') greasemonkey = objreg.get('greasemonkey')
greasemonkey.scripts_reloaded.connect(self._inject_userscripts) greasemonkey.scripts_reloaded.connect(self._inject_userscripts)
self._inject_userscripts() self._inject_userscripts()
@ -761,9 +759,7 @@ class WebEngineTab(browsertab.AbstractTab):
scripts.insert(new_script) scripts.insert(new_script)
def _install_event_filter(self): def _install_event_filter(self):
fp = self._widget.focusProxy() self._widget.focusProxy().installEventFilter(self._mouse_event_filter)
if fp is not None:
fp.installEventFilter(self._mouse_event_filter)
self._child_event_filter = mouse.ChildEventFilter( self._child_event_filter = mouse.ChildEventFilter(
eventfilter=self._mouse_event_filter, widget=self._widget, eventfilter=self._mouse_event_filter, widget=self._widget,
parent=self) parent=self)
@ -1052,6 +1048,14 @@ class WebEngineTab(browsertab.AbstractTab):
@pyqtSlot(usertypes.NavigationRequest) @pyqtSlot(usertypes.NavigationRequest)
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
@ -1110,6 +1114,4 @@ class WebEngineTab(browsertab.AbstractTab):
self.predicted_navigation.connect(self._on_predicted_navigation) self.predicted_navigation.connect(self._on_predicted_navigation)
def event_target(self): def event_target(self):
fp = self._widget.focusProxy() return self._widget.focusProxy()
assert fp is not None
return fp

8
qutebrowser/javascript/print.js
View File

@ -17,8 +17,14 @@
* along with qutebrowser. If not, see <http://www.gnu.org/licenses/>. * 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"; "use strict";
window.print = function() { window.print = function() {
window.location = "qute:print"; window.location = "qute://print";
}; };