From ee875ba895f2613b2680ff73a25c15875b23829a Mon Sep 17 00:00:00 2001 From: Peter Vilim Date: Sun, 26 Oct 2014 02:44:47 -0500 Subject: [PATCH 1/3] hints: Show uppercase hint chars #73 --- qutebrowser/browser/hints.py | 10 +++++++++- qutebrowser/config/configdata.py | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index d71613c59..1dd38fb10 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -110,6 +110,7 @@ class HintManager(QObject): display: {display}; color: {config[colors][hints.fg]}; background: {config[colors][hints.bg]}; + text-transform: {texttransform}; font: {config[fonts][hints]}; border: {config[hints][border]}; opacity: {config[hints][opacity]}; @@ -271,6 +272,12 @@ class HintManager(QObject): display = 'inline' else: display = 'none' + + # Make text uppercase if set in config + if config.get("hints","uppercase") and config.get("hints","mode") == "letter": + texttransform = 'uppercase' + else: + texttransform = 'none' rect = elem.geometry() left = rect.x() top = rect.y() @@ -279,7 +286,8 @@ class HintManager(QObject): left /= zoom top /= zoom return self.HINT_CSS.format( - left=left, top=top, config=objreg.get('config'), display=display) + left=left, top=top, config=objreg.get('config'), display=display, + texttransform=texttransform) def _draw_label(self, elem, string): """Draw a hint label over an element. diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 257d4aaef..91ef0cee1 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -512,6 +512,10 @@ DATA = collections.OrderedDict([ SettingValue(typ.String(minlen=2), 'asdfghjkl'), "Chars used for hint strings."), + ('uppercase', + SettingValue(typ.Bool(), 'false'), + "Make chars in hint strings uppercase."), + ('auto-follow', SettingValue(typ.Bool(), 'true'), "Whether to auto-follow a hint if there's only one left."), From 2d9425a0b744a798c19df76de877eda227dac467 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 26 Oct 2014 17:05:56 +0100 Subject: [PATCH 2/3] Fix uppercase hint formatting. --- qutebrowser/browser/hints.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index 1dd38fb10..df42f26b1 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -274,7 +274,8 @@ class HintManager(QObject): display = 'none' # Make text uppercase if set in config - if config.get("hints","uppercase") and config.get("hints","mode") == "letter": + if (config.get('hints', 'uppercase') and + config.get('hints', 'mode') == 'letter'): texttransform = 'uppercase' else: texttransform = 'none' @@ -287,7 +288,7 @@ class HintManager(QObject): top /= zoom return self.HINT_CSS.format( left=left, top=top, config=objreg.get('config'), display=display, - texttransform=texttransform) + texttransform=texttransform) def _draw_label(self, elem, string): """Draw a hint label over an element. From 0c2dbe72179c168aac36c69cdb75861671e7e03d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 26 Oct 2014 17:07:25 +0100 Subject: [PATCH 3/3] Regenerate author list. --- README.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.asciidoc b/README.asciidoc index e98a00b3b..56e9df344 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -233,6 +233,7 @@ Contributors, sorted by the number of commits in descending order: // QUTE_AUTHORS_START * Florian Bruhin * Claude +* Peter Vilim // QUTE_AUTHORS_END Thanks / Similiar projects