Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements to numeric hinting mode #1194

Closed
wants to merge 11 commits into from
Closed

Conversation

@lahwaacz
Copy link
Contributor

@lahwaacz lahwaacz commented Dec 24, 2015

A few commits to address various issues with the numeric hinting mode...

Review on Reviewable

lahwaacz added 5 commits Dec 16, 2015
This allows restoring the filter during rapid hinting in numeric mode (addresses #576)
(addresses #308)
(addresses #674 (comment) )
lahwaacz added 4 commits Feb 2, 2016
* upstream/master: (364 commits)
  Update docs.
  MANIFEST.in: Exclude qutebrowser/3rdparty.
  Regenerate authors.
  Improve performance when scrolling with many tabs.
  Update changelog.
  Add a test in test_editor.py.
  Regenerate authors.
  Regenerate authors.
  fuzzy_url: Raise InvalidUrlError on empty URLs.
  Fix pasting of empty URLs.
  Use system icon for windows if available
  Add missing commas
  Add more tests for new editor config
  requirements: Update colorlog to 2.6.1.
  Revert "update_3rdparty: add docstring to main()"
  pylint: Don't require docstring for main() funcs.
  update_3rdparty: add docstring to main()
  update_3rdparty: add option for pdfjs version
  pdfjs: add file path to version information
  pdfjs: Update documentation
  ...

Conflicts:
      qutebrowser/browser/hints.py
As described in [1], the naming of some variables has become
inconsistent with the original code and even docstrings. This commit
corrects some of these problems, with the following terminology:

 - hint text: informative message (see HINT_TEXTS)
 - hint string: the text displayed on the hint (as instance of str)
 - hint label: the element representing the hint, added to the DOM
 - hint: too abstract, sensibly used only in docstrings to refer to the
   "visual result"

This commit amends b89e0f8 and
8873aba.

[1] #1178 (comment)
* upstream/master: (401 commits)
  Remove unused import
  tox: Update Werkzeug to 0.11.8
  Regenerate authors
  Use __file__ instead of sys.argv[0]
  Regenerate authors
  Make update_3rdparty.py install correctly when run from any directory
  Open command line urls explicitly.
  tox: Update Werkzeug to 0.11.6
  Move qutebrowser.rcc to misc/
  Regenerate resources
  Fix CHANGELOG/link in README
  New qutebrowser logo!
  www: Add releases link
  Release v0.6.1
  release checklist: Clarify how to build on Windows
  Make sure the cheatsheet PNG is included in sdist
  Fix cheatsheet link URL in quickstart
  Mark segfault on exit in test_smoke as xfail
  Add a xfail test for #797
  Add missing file
  ...

 Conflicts:
	qutebrowser/browser/hints.py
@codecov-io
Copy link

@codecov-io codecov-io commented Apr 28, 2016

Current coverage is 77.29%

Merging #1194 into master will decrease coverage by 2.03%

@@             master      #1194   diff @@
==========================================
  Files           106        104     -2   
  Lines         15179      14893   -286   
  Methods           0          0          
  Messages          0          0          
  Branches       2423       2380    -43   
==========================================
- Hits          12040      11511   -529   
- Misses         2690       2950   +260   
+ Partials        449        432    -17   

Powered by Codecov. Last updated by 0f8b298...c202e10

* upstream/master: (384 commits)
  Update docs
  Fix path to link.html in new tests
  Don't autofollow hint when unfiltering w/ rapid
  bdd: Wait a bit in "No crash should happen" step
  tox: Update pytest-mock to 1.0.0
  Fix lint
  Implement utils.is_special_key.
  Don't show keyhint if there are no hints.
  Regenerate authors
  Add invalid url to 'test_set_hover_url_encoded'
  Update changelog
  Try to fix broken yelo link in README
  Fix crash when hovering over an invalid URL
  Use ', '.join instead of str.join(', ', ...).
  Update command completions when keyconf changes.
  Show special keys last in command completion.
  Clean up command_binding_completion.
  Update docs
  Update changelog
  Set Qt.RichText textFormat for KeyHintView
  ...

 Conflicts:
	qutebrowser/browser/hints.py
@The-Compiler
Copy link
Member

@The-Compiler The-Compiler commented Jun 6, 2016

@lahwaacz Is this still WIP (like in the title) from your point of view? Otherwise I'm planning to add some tests and merge this tomorrow.

@lahwaacz lahwaacz changed the title [WIP] Improvements to numeric hinting mode Improvements to numeric hinting mode Jun 6, 2016
@lahwaacz
Copy link
Contributor Author

@lahwaacz lahwaacz commented Jun 6, 2016

After 6 months, I think it's safe to say that everything works as intended 😄 So no WIP, except for the tests for which I don't have the time...

@The-Compiler
Copy link
Member

@The-Compiler The-Compiler commented Jun 7, 2016

Thanks again for the patience!

To make things easier for me I cherry-picked this commit by commit (introducing some tests in the middle), and this is all merged in b972acf:

b759f48...b972acf

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants