diff --git a/README.asciidoc b/README.asciidoc index 215e2e437..8e9af00b5 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -160,6 +160,7 @@ Contributors, sorted by the number of commits in descending order: * Lamar Pavel * Marshall Lochbaum * Bruno Oliveira +* thuck * Martin Tournoij * Imran Sobir * Alexander Cogneau @@ -174,6 +175,7 @@ Contributors, sorted by the number of commits in descending order: * Fritz Reichwald * Corentin Julé * meles5 +* Jay Kamat * Philipp Hansch * Panagiotis Ktistakis * Artur Shaik @@ -191,7 +193,6 @@ Contributors, sorted by the number of commits in descending order: * ZDarian * Milan Svoboda * John ShaggyTwoDope Jenkins -* Jay Kamat * Clayton Craft * Peter Vilim * Jacob Sword @@ -225,7 +226,6 @@ Contributors, sorted by the number of commits in descending order: * Jussi Timperi * Cosmin Popescu * Brian Jackson -* thuck * sbinix * rsteube * neeasade diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc index 3c14a00f3..8e37acdac 100644 --- a/doc/help/commands.asciidoc +++ b/doc/help/commands.asciidoc @@ -82,7 +82,7 @@ It is possible to run or bind multiple commands by separating them with `;;`. |<>|Move the current tab according to the argument and [count]. |<>|Switch to the next tab, or switch [count] tabs forward. |<>|Close all tabs except for the current one. -|<>|Pin the current/[count]th tab. +|<>|Pin/Unpin the current/[count]th tab. |<>|Switch to the previous tab, or switch [count] tabs back. |<>|Unbind a keychain. |<>|Re-open a closed tab (optionally skipping [count] closed tabs). @@ -335,7 +335,7 @@ Syntax: +:help [*--tab*] [*--bg*] [*--window*] ['topic']+ Show help about a command or setting. ==== positional arguments -* +'topic'+: The topic to show help for. +* +'topic'+: The topic to show help for. - :__command__ for commands. - __section__\->__option__ for settings. @@ -839,9 +839,9 @@ Close the current/[count]th tab. ==== optional arguments * +*-p*+, +*--prev*+: Force selecting the tab before the current tab. * +*-n*+, +*--next*+: Force selecting the tab after the current tab. -* +*-f*+, +*--force*+: Avoid confirmation for pinned tabs. * +*-o*+, +*--opposite*+: Force selecting the tab in the opposite direction of what's configured in 'tabs->select-on-remove'. +* +*-f*+, +*--force*+: Avoid confirmation for pinned tabs. ==== count The tab index to close @@ -905,16 +905,10 @@ Close all tabs except for the current one. [[tab-pin]] === tab-pin -Syntax: +:tab-pin+ - -Pin the current/[count]th tab. +Pin/Unpin the current/[count]th tab. ==== count -The tab index to pin - -==== note -* Pinning a tab shrinks it to `tabs->pinned-width` size. -* Attempting to close a pinned tab will cause a confirmation, unless `--force` is passed. +The tab index to pin or unpin [[tab-prev]] === tab-prev diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index ce9740278..9beb2e9f4 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -124,15 +124,15 @@ |<>|Whether to wrap when changing tabs. |<>|Whether tabs should be movable. |<>|On which mouse button to close tabs. -|<>|The size of pinned tabs. |<>|The position of the tab bar. |<>|Whether to show favicons in the tab bar. |<>|Scale for favicons in the tab bar. The tab size is unchanged, so big favicons also require extra `tabs->padding`. |<>|The width of the tab bar if it's vertical, in px or as percentage of the window. +|<>|The width for pinned tabs with a horizontal tabbar, in px. |<>|Width of the progress indicator (0 to disable). |<>|Whether to open windows instead of tabs. |<>|The format to use for the tab title. The following placeholders are defined: -|<>|The format to use for the tab title, when it is pinned. The following placeholders are defined: +|<>|The format to use for the tab title for pinned tabs.The same placeholders like for title-format are defined. |<>|Alignment of the text inside of tabs |<>|Switch between tabs using the mouse wheel. |<>|Padding for tabs (top, bottom, left, right). @@ -1185,14 +1185,6 @@ Valid values: Default: +pass:[middle]+ -[[tabs-pinned-width]] -=== pinned-width -The width for pinned tabs with a horizontal tabbar, in px. - -See `:tab-pin` for more details. - -Default: +43+ - [[tabs-position]] === position The position of the tab bar. @@ -1229,6 +1221,12 @@ The width of the tab bar if it's vertical, in px or as percentage of the window. Default: +pass:[20%]+ +[[tabs-pinned-width]] +=== pinned-width +The width for pinned tabs with a horizontal tabbar, in px. + +Default: +pass:[43]+ + [[tabs-indicator-width]] === indicator-width Width of the progress indicator (0 to disable). @@ -1264,9 +1262,7 @@ Default: +pass:[{index}: {title}]+ [[tabs-title-format-pinned]] === title-format-pinned -The format to use for the tab title when it is pinned. - -The same syntax is used as `tabs->title-format` +The format to use for the tab title for pinned tabs.The same placeholders like for title-format are defined. Default: +pass:[{index}]+ diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index dfcf33eaa..f4591c9d6 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -259,7 +259,7 @@ class CommandDispatcher: name='tab-pin') @cmdutils.argument('count', count=True) def tab_pin(self, count=None): - """Pin/Unpin the current tab. + """Pin/Unpin the current/[count]th tab. Args: count: The tab index to pin or unpin, or None diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py index 80d89bd35..abcf744f7 100644 --- a/tests/end2end/features/conftest.py +++ b/tests/end2end/features/conftest.py @@ -549,7 +549,6 @@ def check_open_tabs(quteproc, request, tabs): assert line.startswith('- ') line = line[2:] # remove "- " prefix - path = line active = False pinned = False