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

Use object registry for completion.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-23 21:49:22 +02:00
parent 40812f81b6
commit ffaf4f0cb0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/app.py
View File

@ -372,7 +372,7 @@ class Application(QApplication):
# syntactic sugar # syntactic sugar
kp = self._keyparsers kp = self._keyparsers
status = self.mainwindow.status status = self.mainwindow.status
completion = self.mainwindow.completion completion = self.registry['completion']
tabs = self.mainwindow.tabs tabs = self.mainwindow.tabs
cmd = self.registry['status-cmd'] cmd = self.registry['status-cmd']
completer = self.registry['completer'] completer = self.registry['completer']

4
qutebrowser/widgets/completion.py
View File

@ -210,13 +210,13 @@ class CompletionView(QTreeView):
selmod.clearSelection() selmod.clearSelection()
selmod.clearCurrentIndex() selmod.clearCurrentIndex()
@cmdutils.register(instance='mainwindow.completion', hide=True, @cmdutils.register(instance='completion', hide=True,
modes=[usertypes.KeyMode.command]) modes=[usertypes.KeyMode.command])
def completion_item_prev(self): def completion_item_prev(self):
"""Select the previous completion item.""" """Select the previous completion item."""
self._next_prev_item(prev=True) self._next_prev_item(prev=True)
@cmdutils.register(instance='mainwindow.completion', hide=True, @cmdutils.register(instance='completion', hide=True,
modes=[usertypes.KeyMode.command]) modes=[usertypes.KeyMode.command])
def completion_item_next(self): def completion_item_next(self):
"""Select the next completion item.""" """Select the next completion item."""

12
qutebrowser/widgets/mainwindow.py
View File

@ -85,7 +85,8 @@ class MainWindow(QWidget):
self.tabs.title_changed.connect(self.setWindowTitle) self.tabs.title_changed.connect(self.setWindowTitle)
self._vbox.addWidget(self.tabs) self._vbox.addWidget(self.tabs)
self.completion = completion.CompletionView(self) self._completion = completion.CompletionView(self)
utils.register_object('completion', self._completion)
self.status = bar.StatusBar() self.status = bar.StatusBar()
self._vbox.addWidget(self.status) self._vbox.addWidget(self.status)
@ -93,7 +94,8 @@ class MainWindow(QWidget):
# When we're here the statusbar might not even really exist yet, so # When we're here the statusbar might not even really exist yet, so
# resizing will fail. Therefore, we use singleShot QTimers to make sure # resizing will fail. Therefore, we use singleShot QTimers to make sure
# we defer this until everything else is initialized. # we defer this until everything else is initialized.
QTimer.singleShot(0, lambda: self.completion.resize_completion.connect( QTimer.singleShot(
0, lambda: self._completion.resize_completion.connect(
self.resize_completion)) self.resize_completion))
QTimer.singleShot(0, self.resize_completion) QTimer.singleShot(0, self.resize_completion)
#self.retranslateUi(MainWindow) #self.retranslateUi(MainWindow)
@ -126,8 +128,8 @@ class MainWindow(QWidget):
# Shrink to content size if needed and shrinking is enabled # Shrink to content size if needed and shrinking is enabled
if config.get('completion', 'shrink'): if config.get('completion', 'shrink'):
contents_height = ( contents_height = (
self.completion.viewportSizeHint().height() + self._completion.viewportSizeHint().height() +
self.completion.horizontalScrollBar().sizeHint().height()) self._completion.horizontalScrollBar().sizeHint().height())
if contents_height <= height: if contents_height <= height:
height = contents_height height = contents_height
else: else:
@ -140,7 +142,7 @@ class MainWindow(QWidget):
bottomright = self.status.geometry().topRight() bottomright = self.status.geometry().topRight()
rect = QRect(topleft, bottomright) rect = QRect(topleft, bottomright)
if rect.isValid(): if rect.isValid():
self.completion.setGeometry(rect) self._completion.setGeometry(rect)
@cmdutils.register(instance='mainwindow', name=['quit', 'q']) @cmdutils.register(instance='mainwindow', name=['quit', 'q'])
def close(self): def close(self):