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

Merge branch 'master' of ssh://the-compiler.org:2323/qutebrowser

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-23 14:22:22 +02:00
commit 4661f2c30b
11 changed files with 92 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
THANKS
View File

@ -24,6 +24,7 @@ valuable ones:
- andrean
- chelmuth
- quark
- Bleeding Fingers
Thanks to these people for helpful bits and pieces in the Qt bugtracker and IRC
channel:
@ -51,6 +52,7 @@ channel:
- AlexWMF
- scummos
- svuorela
- kpj
Thanks to these projects which were essential while developing qutebrowser:
- Python

21
TODO
View File

@ -11,6 +11,7 @@ Style
=====
Refactor completion widget mess (initializing / changing completions)
keypress-signal-foo is a bit of a chaos and might be done better
Major features
==============
@ -25,7 +26,6 @@ Plugin architecture
NoScript
Certificate Patrol
https://chrome.google.com/webstore/detail/remove-google-redirects/ccenmflbeofaceccfhhggbagkblihpoh
Insert mode
Extern editor
Downloads
webinterface for settings/colors/bindings
@ -37,6 +37,12 @@ Before Blink
session handling / saving
IPC, like dwb -x
Mode handling?
- Problem: how to detect we're going to insert mode:
-> Detect mouse clicks and use QWebFrame::hitTestContent (only mouse)
-> Use javascript: http://stackoverflow.com/a/2848120/2085149
-> Use microFocusChanged and check active element via:
frame = page.currentFrame()
elem = frame.findFirstElement('*:focus')
Bookmarks
Internationalization
Marks
@ -59,7 +65,18 @@ handle completion for aliases
keybind should have completion for commands/arguments
Hiding scrollbars
Ctrl+A/X to increase/decrease last number in URL
keypress-signal-foo is a bit of a chaos and might be done better
command completion gets hidden when doing a new ValueList value
logging contexts
catch import errors for PyQt and QtWebKit
Qt Bugs
========
- Printing under windows produced blank pages
https://bugreports.qt-project.org/browse/QTBUG-19571
If this isn't fixed in Qt 5.3, bug should be reopened.
- Web inspector is blank unless .hide()/.show() is called.
Other stuff
===========

4
qutebrowser/browser/curcommand.py
View File

@ -164,7 +164,7 @@ class CurCommandDispatcher(QObject):
if self._tabs.currentWidget().page_.history().canGoBack():
self._tabs.currentWidget().back()
else:
message.info("At beginning of history.")
message.error("At beginning of history.")
break
@cmdutils.register(instance='mainwindow.tabs.cur')
@ -180,7 +180,7 @@ class CurCommandDispatcher(QObject):
if self._tabs.currentWidget().page_.history().canGoForward():
self._tabs.currentWidget().forward()
else:
message.info("At end of history.")
message.error("At end of history.")
break
@cmdutils.register(instance='mainwindow.tabs.cur')

5
qutebrowser/commands/utils.py
View File

@ -88,7 +88,10 @@ class register: # pylint: disable=invalid-name
mainname = name[0]
names += name
count, nargs = self._get_nargs_count(func)
desc = func.__doc__.splitlines()[0].strip().rstrip('.')
if func.__doc__ is not None:
desc = func.__doc__.splitlines()[0].strip().rstrip('.')
else:
desc = ""
cmd = Command(name=mainname, maxsplit=self.maxsplit,
hide=self.hide, nargs=nargs, count=count, desc=desc,
instance=self.instance, handler=func,

12
qutebrowser/config/configdata.py
View File

@ -497,18 +497,22 @@ DATA = OrderedDict([
('tab.fg',
SettingValue(types.Color(), "white"),
"Foreground color of the tabbar."),
"Foreground color of tabs."),
('tab.bg',
SettingValue(types.Color(), "grey"),
"Background color of the tabbar."),
"Background color of unselected tabs."),
('tab.bg.selected',
SettingValue(types.Color(), "black"),
"Background color of the tabbar for the selected tab."),
"Background color of selected tabs."),
('tab.bg.bar',
SettingValue(types.Color(), "#555555"),
"Background color of the tabbar."),
('tab.seperator',
SettingValue(types.Color(), "white"),
SettingValue(types.Color(), "#555555"),
"Color for the tab seperator."),
('hints.fg',

9
qutebrowser/models/completion.py
View File

@ -263,11 +263,12 @@ class CompletionModel(QAbstractItemModel):
"""
if not index.isValid():
return Qt.NoItemFlags
flags = Qt.ItemIsEnabled
if len(self._id_map[index.internalId()].children) > 0:
return flags
if index.parent().isValid():
# item
return Qt.ItemIsEnabled | Qt.ItemIsSelectable
else:
return flags | Qt.ItemIsSelectable
# category
return Qt.NoItemFlags
def index(self, row, column, parent=QModelIndex()):
"""Return the QModelIndex for row/column/parent.

22
qutebrowser/utils/debug.py
View File

@ -18,8 +18,10 @@
"""Utilities used for debugging."""
import sys
import logging
from functools import wraps
from PyQt5.QtCore import pyqtRemoveInputHook
from PyQt5.QtCore import pyqtRemoveInputHook, QEvent
try:
# pylint: disable=import-error
@ -29,6 +31,24 @@ except ImportError:
import qutebrowser.commands.utils as cmdutils
EVENTS = {n: x for x, n in vars(QEvent).items()
if isinstance(n, QEvent.Type)}
def log_events(klass):
"""Class decorator to log Qt events."""
old_event = klass.event
@wraps(old_event)
def new_event(self, e, *args, **kwargs):
"""Wrapper for event() which logs events."""
logging.debug("Event in {}: {}".format(klass.__name__,
EVENTS[e.type()]))
return old_event(self, e, *args, **kwargs)
klass.event = new_event
return klass
@cmdutils.register(name='settrace', hide=True)
def set_trace():

37
qutebrowser/widgets/browsertab.py
View File

@ -20,7 +20,7 @@
import logging
import functools
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt
from PyQt5.QtWidgets import QApplication
from PyQt5.QtWebKit import QWebSettings
from PyQt5.QtWebKitWidgets import QWebView, QWebPage
@ -248,10 +248,10 @@ class BrowserTab(QWebView):
# Let superclass handle the event
return super().paintEvent(e)
def event(self, e):
def mousePressEvent(self, e):
"""Check if a link was clicked with the middle button or Ctrl.
Extend the superclass event().
Extend the superclass mousePressEvent().
This also is a bit of a hack, but it seems it's the only possible way.
Set the _open_target attribute accordingly.
@ -260,21 +260,20 @@ class BrowserTab(QWebView):
e: The arrived event.
Return:
The superclass event return value.
The superclass return value.
"""
if e.type() in [QEvent.MouseButtonPress, QEvent.MouseButtonDblClick]:
if self._force_open_target is not None:
self._open_target = self._force_open_target
self._force_open_target = None
logging.debug("Setting force target: {}".format(
self._open_target))
elif (e.button() == Qt.MidButton or
e.modifiers() & Qt.ControlModifier):
if config.get('general', 'background_tabs'):
self._open_target = "bgtab"
else:
self._open_target = "tab"
logging.debug("Setting target: {}".format(self._open_target))
if self._force_open_target is not None:
self._open_target = self._force_open_target
self._force_open_target = None
logging.debug("Setting force target: {}".format(
self._open_target))
elif (e.button() == Qt.MidButton or
e.modifiers() & Qt.ControlModifier):
if config.get('general', 'background_tabs'):
self._open_target = "bgtab"
else:
self._open_target = "normal"
return super().event(e)
self._open_target = "tab"
logging.debug("Setting target: {}".format(self._open_target))
else:
self._open_target = "normal"
return super().mousePressEvent(e)

10
qutebrowser/widgets/completion.py
View File

@ -79,17 +79,20 @@ class CompletionView(QTreeView):
{color[completion.bg]}
outline: 0;
}}
QTreeView::item {{
QTreeView::item:enabled {{
{color[completion.item.fg]}
{color[completion.item.bg]}
}}
QTreeView::item:has-children {{
QTreeView::item:disabled {{
{color[completion.category.fg]}
{color[completion.category.bg]}
border-top: 1px solid {color[completion.category.border.top]};
border-bottom: 1px solid
{color[completion.category.border.bottom]};
}}
QTreeView::item:selected {{
border-top: 1px solid {color[completion.item.selected.border.top]};
border-bottom: 1px solid
@ -98,8 +101,7 @@ class CompletionView(QTreeView):
{color[completion.item.selected.fg]}
}}
"""
# FIXME because we use :has-children, if a category is empty, it won't look
# like one anymore
change_completed_part = pyqtSignal(str)
def __init__(self, parent=None):

6
qutebrowser/widgets/tabbedbrowser.py
View File

@ -268,6 +268,8 @@ class TabbedBrowser(TabWidget):
"""
if self._url_stack:
self.tabopen(self._url_stack.pop())
else:
message.error("Nothing to undo!")
@cmdutils.register(instance='mainwindow.tabs', name='tabprev')
def switch_prev(self, count=1):
@ -284,7 +286,7 @@ class TabbedBrowser(TabWidget):
elif config.get('tabbar', 'wrap'):
self.setCurrentIndex(newidx % self.count())
else:
message.info("First tab")
message.error("First tab")
@cmdutils.register(instance='mainwindow.tabs', name='tabnext')
def switch_next(self, count=1):
@ -301,7 +303,7 @@ class TabbedBrowser(TabWidget):
elif config.get('tabbar', 'wrap'):
self.setCurrentIndex(newidx % self.count())
else:
message.info("Last tab")
message.error("Last tab")
@cmdutils.register(instance='mainwindow.tabs', nargs=(0, 1))
def paste(self, sel=False, tab=False):

13
qutebrowser/widgets/tabwidget.py
View File

@ -33,9 +33,6 @@ class TabWidget(QTabWidget):
STYLESHEET: The stylesheet template to be used.
"""
# FIXME there is still some ugly 1px white stripe from somewhere if we do
# background-color: grey for QTabBar...
STYLESHEET = """
QTabWidget::pane {{
position: absolute;
@ -44,18 +41,13 @@ class TabWidget(QTabWidget):
QTabBar {{
{font[tabbar]}
{color[tab.bg.bar]}
}}
QTabBar::tab {{
{color[tab.bg]}
{color[tab.fg]}
padding-left: 5px;
padding-right: 5px;
padding-top: 0px;
padding-bottom: 0px;
}}
QTabBar::tab:first, QTabBar::tab:middle {{
padding: 0px 5px 0px 5px;
border-right: 1px solid {color[tab.seperator]};
}}
@ -71,6 +63,7 @@ class TabWidget(QTabWidget):
set_register_stylesheet(self)
self.setDocumentMode(True)
self.setElideMode(Qt.ElideRight)
self.tabBar().setDrawBase(False)
self._init_config()
def _init_config(self):