From ef5d0342786cc4a504274cb0da94530827788df9 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 1 Feb 2014 20:55:37 +0100 Subject: [PATCH 1/4] Support -c '' again --- qutebrowser/utils/config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qutebrowser/utils/config.py b/qutebrowser/utils/config.py index bd54c3e4b..6f54c3e69 100644 --- a/qutebrowser/utils/config.py +++ b/qutebrowser/utils/config.py @@ -149,6 +149,8 @@ class Config(ConfigParser): self.default_cp = ConfigParser() self.default_cp.optionxform = lambda opt: opt # be case-insensitive self.default_cp.read_string(default_config) + if not self.configdir: + return self.optionxform = lambda opt: opt # be case-insensitive self.configdir = configdir self.configfile = os.path.join(self.configdir, self.FNAME) From b6126a49a92580b405bd755147e9ffd95ce39037 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 1 Feb 2014 21:01:29 +0100 Subject: [PATCH 2/4] Maybe fix completion resize, add debugging. --- qutebrowser/widgets/completion.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py index 9e9c1f5c7..0fb2bee7b 100644 --- a/qutebrowser/widgets/completion.py +++ b/qutebrowser/widgets/completion.py @@ -6,6 +6,7 @@ subclasses to provide completions. """ import html +import logging from PyQt5.QtWidgets import (QTreeView, QStyledItemDelegate, QStyle, QStyleOptionViewItem, QSizePolicy) @@ -93,10 +94,13 @@ class CompletionView(QTreeView): """ width = e.size().width() cols = self.model.columnCount() + colwidth = int(width / cols) + logging.debug('width {}, {} columns -> colwidth {}'.format(width, cols, + colwidth)) assert cols >= 1 - assert width / cols > 1 + assert colwidth > 1 for i in range(cols): - self.setColumnWidth(i, width / cols) + self.setColumnWidth(i, colwidth) super().resizeEvent(e) def setmodel(self, model): From 0adf8d6b53720876e3a6f58b447ef95641c7eedb Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 1 Feb 2014 22:03:06 +0100 Subject: [PATCH 3/4] Call resizeEvent before resizing column for completion --- qutebrowser/widgets/completion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py index 0fb2bee7b..098e89002 100644 --- a/qutebrowser/widgets/completion.py +++ b/qutebrowser/widgets/completion.py @@ -92,6 +92,7 @@ class CompletionView(QTreeView): e -- The QResizeEvent. """ + super().resizeEvent(e) width = e.size().width() cols = self.model.columnCount() colwidth = int(width / cols) @@ -101,7 +102,6 @@ class CompletionView(QTreeView): assert colwidth > 1 for i in range(cols): self.setColumnWidth(i, colwidth) - super().resizeEvent(e) def setmodel(self, model): """Switch completion to a new model. From 6e6fa09f60cc3c12d651c6519d8964a2c1fb2556 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 4 Feb 2014 07:42:45 +0100 Subject: [PATCH 4/4] Add plugin --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index b97db7f5f..b09437ba8 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,7 @@ Plugin architecture Ghostery/Disconnect? NoScript Certificate Patrol + https://chrome.google.com/webstore/detail/remove-google-redirects/ccenmflbeofaceccfhhggbagkblihpoh Insert mode Extern editor Hints