From 5cd988ae52eeadb85d97bfa95c2773c0e3f4e7a8 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 6 Jan 2019 20:53:26 -0500 Subject: [PATCH] Change config option to in tabs.pinned group Changes to be committed: modified: qutebrowser/browser/browsertab.py modified: qutebrowser/config/configdata.yml modified: tests/end2end/features/tabs.feature Changed pinned.tabs.frozen to be tabs.pinned.frozen in all of these files. --- qutebrowser/browser/browsertab.py | 2 +- qutebrowser/config/configdata.yml | 10 +++++----- tests/end2end/features/tabs.feature | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 80871a254..55ab89a20 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -945,7 +945,7 @@ class AbstractTab(QWidget): def navigation_blocked(self) -> bool: """Test if navigation is allowed on the current tab.""" - return self.data.pinned and config.val.pinned.tab.frozen + return self.data.pinned and config.val.tabs.pinned.frozen @pyqtSlot(QUrl) def _on_before_load_started(self, url: QUrl) -> None: diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index 15b3eb446..f6313cc88 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -1768,6 +1768,11 @@ tabs.pinned.shrink: type: Bool desc: Shrink pinned tabs down to their contents. +tabs.pinned.frozen: + type: Bool + default: True + desc: If true, then pinned tabs cannot have their URL changed. + tabs.wrap: default: true type: Bool @@ -2917,8 +2922,3 @@ bindings.commands: * register: Entered when qutebrowser is waiting for a register name/key for commands like `:set-mark`. - -pinned.tab.frozen: - type: Bool - default: True - desc: If true, then pinned tabs cannot have their URL changed. diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature index ec6400458..804f72bbf 100644 --- a/tests/end2end/features/tabs.feature +++ b/tests/end2end/features/tabs.feature @@ -1289,8 +1289,8 @@ Feature: Tab management And the following tabs should be open: - data/numbers/1.txt (active) (pinned) - Scenario: :tab-pin open url with pinned.tab.frozen = false - When I set pinned.tab.frozen to false + Scenario: :tab-pin open url with tabs.pinned.frozen = false + When I set tabs.pinned.frozen to false And I open data/numbers/1.txt And I run :tab-pin And I open data/numbers/2.txt @@ -1305,9 +1305,9 @@ Feature: Tab management And the following tabs should be open: - data/numbers/1.txt (active) (pinned) - Scenario: :home on a pinned tab with pinned.tab.frozen = false + Scenario: :home on a pinned tab with tabs.pinned.frozen = false When I set url.start_pages to ["http://localhost:(port)/data/numbers/2.txt"] - And I set pinned.tab.frozen to false + And I set tabs.pinned.frozen to false And I open data/numbers/1.txt And I run :tab-pin And I run :home