mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup.

Browse source
This commit is contained in:
karxi 2016-12-05 10:17:03 -05:00
parent 13c2e85cff
commit c1dad65f56
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
convo.py
View file

@ -431,10 +431,11 @@ class PesterText(QtGui.QTextEdit):
key = event.key() key = event.key()
keymods = event.modifiers() keymods = event.modifiers()
if hasattr(parent, 'textInput') and key not in pass_to_super: if hasattr(parent, 'textInput') and key not in pass_to_super:
# TODO: Shift focus here on bare (no modifiers) alphanumerics.
parent.textInput.keyPressEvent(event) parent.textInput.keyPressEvent(event)
# Pass to the normal handler. # Pass to the normal handler.
super(QtGui.QTextEdit, self).keyPressEvent(event) super(PesterText, self).keyPressEvent(event)
def mousePressEvent(self, event): def mousePressEvent(self, event):
if event.button() == QtCore.Qt.LeftButton: if event.button() == QtCore.Qt.LeftButton:
@ -508,20 +509,15 @@ class PesterText(QtGui.QTextEdit):
del self.sending del self.sending
class PesterInput(QtGui.QLineEdit): class PesterInput(QtGui.QLineEdit):
# NOTE: I have ABSOLUTELY NO IDEA HOW, but using super() here breaks this
# class's keyPressEvent so that no input can be provided. I am *very*
# confused.
# For the sake of safety, I've avoided it here until I know what's going
# on.
def __init__(self, theme, parent=None): def __init__(self, theme, parent=None):
QtGui.QLineEdit.__init__(self, parent) super(PesterInput, self).__init__(parent)
self.setStyleSheet(theme["convo/input/style"]) self.setStyleSheet(theme["convo/input/style"])
def changeTheme(self, theme): def changeTheme(self, theme):
self.setStyleSheet(theme["convo/input/style"]) self.setStyleSheet(theme["convo/input/style"])
def focusInEvent(self, event): def focusInEvent(self, event):
self.parent().clearNewMessage() self.parent().clearNewMessage()
self.parent().textArea.textCursor().clearSelection() self.parent().textArea.textCursor().clearSelection()
QtGui.QLineEdit.focusInEvent(self, event) super(PesterInput, self).focusInEvent(event)
def keyPressEvent(self, event): def keyPressEvent(self, event):
if event.key() == QtCore.Qt.Key_Up: if event.key() == QtCore.Qt.Key_Up:
text = unicode(self.text()) text = unicode(self.text())
@ -535,7 +531,7 @@ class PesterInput(QtGui.QLineEdit):
elif event.key() in [QtCore.Qt.Key_PageUp, QtCore.Qt.Key_PageDown]: elif event.key() in [QtCore.Qt.Key_PageUp, QtCore.Qt.Key_PageDown]:
self.parent().textArea.keyPressEvent(event) self.parent().textArea.keyPressEvent(event)
self.parent().mainwindow.idletime = 0 self.parent().mainwindow.idletime = 0
QtGui.QLineEdit.keyPressEvent(self, event) super(PesterInput, self).keyPressEvent(event)
class PesterConvo(QtGui.QFrame): class PesterConvo(QtGui.QFrame):
def __init__(self, chum, initiated, mainwindow, parent=None): def __init__(self, chum, initiated, mainwindow, parent=None):