Merge branch 'oed-master'

This commit is contained in:
Florian Bruhin 2014-12-29 22:01:34 +01:00
commit 5ca58843fc
4 changed files with 15 additions and 1 deletions

View File

@ -128,12 +128,12 @@ Contributors, sorted by the number of commits in descending order:
* Claude
* John ShaggyTwoDope Jenkins
* rikn00
* Joel Torstensson
* Brian Jackson
* Martin Zimmermann
* Mathias Fussenegger
* Larry Hynes
* Johannes Altmanninger
* Joel Torstensson
* Regina Hug
* Peter Vilim
* Helen Sherwood-Taylor

View File

@ -13,6 +13,7 @@
|<<download,download>>|Download a given URL, given as string.
|<<download-page,download-page>>|Download the current page.
|<<forward,forward>>|Go forward in the history of the current tab.
|<<fullscreen,fullscreen>>|Toggle fullscreen mode.
|<<help,help>>|Show help about a command or setting.
|<<hint,hint>>|Start hinting.
|<<home,home>>|Open main startpage in current tab.
@ -123,6 +124,10 @@ Go forward in the history of the current tab.
==== count
How many pages to go forward.
[[fullscreen]]
=== fullscreen
Toggle fullscreen mode.
[[help]]
=== help
Syntax: +:help [*--tab*] [*--bg*] [*--window*] ['topic']+

View File

@ -951,6 +951,7 @@ KEY_DATA = collections.OrderedDict([
('forward', ['L']),
('forward -t', ['tl']),
('forward -w', ['wl']),
('fullscreen', ['<F11>']),
('hint', ['f']),
('hint all tab', ['F']),
('hint all window', ['wf']),

View File

@ -305,6 +305,14 @@ class MainWindow(QWidget):
"""
super().close()
@cmdutils.register(instance='main-window', scope='window')
def fullscreen(self):
"""Toggle fullscreen mode."""
if self.isFullScreen():
self.showNormal()
else:
self.showFullScreen()
def resizeEvent(self, e):
"""Extend resizewindow's resizeEvent to adjust completion.