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

Rewrite various references to old settings

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-16 18:10:04 +02:00
parent 88fb5bbd82
commit 089e1ee91b
16 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/help/commands.asciidoc
View File

@ -338,7 +338,7 @@ Show help about a command or setting.
* +'topic'+: The topic to show help for.
- :__command__ for commands.
- __section__\->__option__ for settings.
- __option.foo.bar__ for settings.
==== optional arguments
@ -408,7 +408,7 @@ Start hinting.
* +*-m*+, +*--mode*+: The hinting mode to use.
- `number`: Use numeric hints.
- `letter`: Use the chars in the hints->chars settings.
- `letter`: Use the chars in the hints.chars settings.
- `word`: Use hint words based on the html elements and the
extra words.

16
qutebrowser/browser/commands.py
View File

@ -178,7 +178,7 @@ class CommandDispatcher:
prev: Force selecting the tab before the current tab.
next_: Force selecting the tab after the current tab.
opposite: Force selecting the tab in the opposite direction of
what's configured in 'tabs->select-on-remove'.
what's configured in 'tabs.select_on_remove'.
Return:
QTabBar.SelectLeftTab, QTabBar.SelectRightTab, or None if no change
@ -197,7 +197,7 @@ class CommandDispatcher:
return QTabBar.SelectLeftTab
elif conf_selection == QTabBar.SelectPreviousTab:
raise cmdexc.CommandError(
"-o is not supported with 'tabs->select-on-remove' set to "
"-o is not supported with 'tabs.select_on_remove' set to "
"'last-used'!")
else: # pragma: no cover
raise ValueError("Invalid select-on-remove value "
@ -212,7 +212,7 @@ class CommandDispatcher:
prev: Force selecting the tab before the current tab.
next_: Force selecting the tab after the current tab.
opposite: Force selecting the tab in the opposite direction of
what's configured in 'tabs->select-on-remove'.
what's configured in 'tabs.select_on_remove'.
count: The tab index to close, or None
"""
tabbar = self._tabbed_browser.tabBar()
@ -250,7 +250,7 @@ class CommandDispatcher:
prev: Force selecting the tab before the current tab.
next_: Force selecting the tab after the current tab.
opposite: Force selecting the tab in the opposite direction of
what's configured in 'tabs->select-on-remove'.
what's configured in 'tabs.select_on_remove'.
force: Avoid confirmation for pinned tabs.
count: The tab index to close, or None
"""
@ -268,7 +268,7 @@ class CommandDispatcher:
def tab_pin(self, count=None):
"""Pin/Unpin the current/[count]th tab.
Pinning a tab shrinks it to tabs->pinned-width size.
Pinning a tab shrinks it to `tabs.width.pinned` size.
Attempting to close a pinned tab will cause a confirmation,
unless --force is passed.
@ -1530,7 +1530,7 @@ class CommandDispatcher:
topic: The topic to show help for.
- :__command__ for commands.
- __section__\->__option__ for settings.
- __section__.__option__ for settings.
"""
if topic is None:
path = 'index.html'
@ -1607,7 +1607,7 @@ class CommandDispatcher:
"""Open an external editor with the currently selected form field.
The editor which should be launched can be configured via the
`general -> editor` config option.
`editor.command` config option.
"""
tab = self._current_widget()
tab.elements.find_focused(self._open_editor_cb)
@ -2100,7 +2100,7 @@ class CommandDispatcher:
"""Navigate to a url formed in an external editor.
The editor which should be launched can be configured via the
`general -> editor` config option.
`editor.command` config option.
Args:
url: URL to edit; defaults to the current page url.

2
qutebrowser/browser/downloads.py
View File

@ -88,7 +88,7 @@ def immediate_download_path(prompt_download_directory=None):
Args:
prompt_download_directory: If this is something else than None, it
will overwrite the
storage->prompt-download-directory setting.
downloads.location.prompt setting.
"""
if prompt_download_directory is None:
prompt_download_directory = config.val.downloads.location.prompt

2
qutebrowser/browser/hints.py
View File

@ -649,7 +649,7 @@ class HintManager(QObject):
mode: The hinting mode to use.
- `number`: Use numeric hints.
- `letter`: Use the chars in the hints->chars settings.
- `letter`: Use the chars in the hints.chars setting.
- `word`: Use hint words based on the html elements and the
extra words.

2
qutebrowser/browser/qtnetworkdownloads.py
View File

@ -480,7 +480,7 @@ class DownloadManager(downloads.AbstractDownloadManager):
reply: The QNetworkReply to download.
target: Where to save the download as downloads.DownloadTarget.
auto_remove: Whether to remove the download even if
ui -> remove-finished-downloads is set to -1.
downloads.remove_finished is set to -1.
Return:
The created DownloadItem.

2
qutebrowser/browser/webengine/webenginesettings.py
View File

@ -110,7 +110,7 @@ class DefaultProfileSetter(websettings.Base):
class PersistentCookiePolicy(DefaultProfileSetter):
"""The cookies -> store setting is different from other settings."""
"""The content.cookies.store setting is different from other settings."""
def __init__(self):
super().__init__('setPersistentCookiesPolicy')

4
qutebrowser/config/configdata.yml
View File

@ -1016,7 +1016,7 @@ tabs.favicons.scale:
name: Float
minval: 0.0
desc: Scale for favicons in the tab bar. The tab size is unchanged, so big favicons
also require extra `tabs->padding`.
also require extra `tabs.padding`.
tabs.favicons.show:
default: true
@ -1092,7 +1092,7 @@ tabs.show:
tabs.show_switching_delay:
default: 800
type: Int
desc: "Time to show the tab bar before hiding it when tabs->show is set to
desc: "Time to show the tab bar before hiding it when tabs.show is set to
'switching'."
tabs.tabs_are_windows:

4
qutebrowser/html/no_pdfjs.html
View File

@ -74,7 +74,7 @@ li {
<p>Error while opening {{ url }}<br>
<p id="error-message-text" style="color: #a31a1a;">qutebrowser can't find a suitable pdf.js installation</p></p>
<p>It looks like you set <code>content -> enable-pdfjs</code>
<p>It looks like you set <code>content.pdfjs</code>
to <em>true</em> but qutebrowser can't find the required files.</p>
<br>
@ -82,7 +82,7 @@ li {
<h2>Possible fixes</h2>
<ul>
<li>
Disable <code>content -> enable-pdfjs</code> and reload the page.
Disable <code>content.pdfjs</code> and reload the page.
You will need to download the pdf-file and open it with an external
tool instead.
</li>

2
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -62,7 +62,7 @@ class TabbedBrowser(tabwidget.TabWidget):
_filter: A SignalFilter instance.
_now_focused: The tab which is focused now.
_tab_insert_idx_left: Where to insert a new tab with
tabbar -> new-tab-position set to 'prev'.
tabs.new_tab_position set to 'prev'.
_tab_insert_idx_right: Same as above, for 'next'.
_undo_stack: List of UndoEntry namedtuples of closed tabs.
shutting_down: Whether we're currently shutting down.

2
qutebrowser/mainwindow/tabwidget.py
View File

@ -339,7 +339,7 @@ class TabBar(QTabBar):
self.update()
def _on_show_switching_delay_changed(self):
"""Set timer interval when tabs->show-switching-delay got changed."""
"""Set timer interval when tabs.show_switching_delay got changed."""
self._auto_hide_timer.setInterval(config.val.tabs.show_switching_delay)
def on_current_changed(self):

2
qutebrowser/misc/sessions.py
View File

@ -469,7 +469,7 @@ class SessionManager(QObject):
Args:
name: The name of the session. If not given, the session configured
in general -> session-default-name is saved.
in session_default_name is saved.
current: Save the current session instead of the default.
quiet: Don't show confirmation message.
force: Force saving internal sessions (starting with an underline).

5
qutebrowser/utils/utils.py
View File

@ -823,9 +823,8 @@ def random_port():
def open_file(filename, cmdline=None):
"""Open the given file.
If cmdline is not given, general->default-open-dispatcher is used.
If default-open-dispatcher is unset, the system's default application is
used.
If cmdline is not given, downloads.open_dispatcher is used.
If open_dispatcher is unset, the system's default application is used.
Args:
filename: The filename to open.

2
tests/end2end/features/keyinput.feature
View File

@ -117,7 +117,7 @@ Feature: Keyboard input
And I press the keys "bar"
Then the message "test12-2" should be shown
# input -> forward-unbound-keys
# input.forward_unbound_keys
Scenario: Forwarding all keys
When I open data/keyinput/log.html

18
tests/end2end/features/misc.feature
View File

@ -283,22 +283,14 @@ Feature: Various utility commands.
Scenario: :help with setting
When the documentation is up to date
And I run :tab-only
And I run :help general->editor
And I wait until qute://help/settings.html#general-editor is loaded
And I run :help editor.command
And I wait until qute://help/settings.html#editor.command is loaded
Then the following tabs should be open:
- qute://help/settings.html#general-editor (active)
Scenario: :help with invalid setting (2 arrows)
When I run :help general->editor->foo
Then the error "Invalid help topic general->editor->foo!" should be shown
Scenario: :help with invalid setting (unknown section)
When I run :help foo->bar
Then the error "Invalid section foo!" should be shown
Scenario: :help with invalid setting (unknown option)
When I run :help general->bar
Then the error "Invalid option bar!" should be shown
Scenario: :help with invalid setting
When I run :help foo.bar
Then the error "Invalid option foo.bar!" should be shown
Scenario: :help with -t
When I open about:blank

12
tests/end2end/features/tabs.feature
View File

@ -119,7 +119,7 @@ Feature: Tab management
Scenario: :tab-close with select-on-remove = last-used and --opposite
When I set tabs.select_on_remove to last-used
And I run :tab-close --opposite
Then the error "-o is not supported with 'tabs->select-on-remove' set to 'last-used'!" should be shown
Then the error "-o is not supported with 'tabs.select_on_remove' set to 'last-used'!" should be shown
Scenario: :tab-close should restore selection behavior
When I set tabs.select_on_remove to next
@ -835,7 +835,7 @@ Feature: Tab management
# tab settings
Scenario: opening links with tabs->background-tabs true
Scenario: opening links with tabs.background true
When I set tabs.background_tabs to true
And I open data/hints/html/simple.html
And I hint with args "all tab" and follow a
@ -844,7 +844,7 @@ Feature: Tab management
- data/hints/html/simple.html (active)
- data/hello.txt
Scenario: opening tab with tabs->new-tab-position prev
Scenario: opening tab with tabs.new_tab_position prev
When I set tabs.new_tab_position to prev
And I set tabs.background_tabs to false
And I open about:blank
@ -856,7 +856,7 @@ Feature: Tab management
- data/hello.txt (active)
- data/hints/html/simple.html
Scenario: opening tab with tabs->new-tab-position next
Scenario: opening tab with tabs.new_tab_position next
When I set tabs.new_tab_position to next
And I set tabs.background_tabs to false
And I open about:blank
@ -868,7 +868,7 @@ Feature: Tab management
- data/hints/html/simple.html
- data/hello.txt (active)
Scenario: opening tab with tabs->new-tab-position first
Scenario: opening tab with tabs.new_tab_position first
When I set tabs.new_tab_position to first
And I set tabs.background_tabs to false
And I open about:blank
@ -880,7 +880,7 @@ Feature: Tab management
- about:blank
- data/hints/html/simple.html
Scenario: opening tab with tabs->new-tab-position last
Scenario: opening tab with tabs.new_tab_position last
When I set tabs.new_tab_position to last
And I set tabs.background_tabs to false
And I open data/hints/html/simple.html

4
tests/end2end/features/test_editor_bdd.py
View File

@ -27,7 +27,7 @@ bdd.scenarios('editor.feature')
@bdd.when(bdd.parsers.parse('I set up a fake editor replacing "{text}" by '
'"{replacement}"'))
def set_up_editor_replacement(quteproc, httpbin, tmpdir, text, replacement):
"""Set up general->editor to a small python script doing a replacement."""
"""Set up editor.command to a small python script doing a replacement."""
text = text.replace('(port)', str(httpbin.port))
script = tmpdir / 'script.py'
script.write(textwrap.dedent("""
@ -47,7 +47,7 @@ def set_up_editor_replacement(quteproc, httpbin, tmpdir, text, replacement):
@bdd.when(bdd.parsers.parse('I set up a fake editor returning "{text}"'))
def set_up_editor(quteproc, httpbin, tmpdir, text):
"""Set up general->editor to a small python script inserting a text."""
"""Set up editor.command to a small python script inserting a text."""
script = tmpdir / 'script.py'
script.write(textwrap.dedent("""
import sys