"QString" --> str
This commit is contained in:
parent
a7f266c382
commit
70ea19e839
4 changed files with 65 additions and 65 deletions
4
convo.py
4
convo.py
|
@ -1152,8 +1152,8 @@ class PesterConvo(QtWidgets.QFrame):
|
||||||
def toggleMute(self, toggled):
|
def toggleMute(self, toggled):
|
||||||
self.notifications_muted = toggled
|
self.notifications_muted = toggled
|
||||||
|
|
||||||
messageSent = QtCore.pyqtSignal("QString", "QString")
|
messageSent = QtCore.pyqtSignal(str, str)
|
||||||
windowClosed = QtCore.pyqtSignal("QString")
|
windowClosed = QtCore.pyqtSignal(str)
|
||||||
|
|
||||||
aligndict = {
|
aligndict = {
|
||||||
"h": {
|
"h": {
|
||||||
|
|
32
irc.py
32
irc.py
|
@ -1019,22 +1019,22 @@ class PesterIRC(QtCore.QThread):
|
||||||
""" "METADATA DRAFT numeric reply 770 RPL_METADATASUBOK, we subbed to a key."""
|
""" "METADATA DRAFT numeric reply 770 RPL_METADATASUBOK, we subbed to a key."""
|
||||||
PchumLog.info("_metadatasubok: %s", params)
|
PchumLog.info("_metadatasubok: %s", params)
|
||||||
|
|
||||||
moodUpdated = QtCore.pyqtSignal("QString", Mood)
|
moodUpdated = QtCore.pyqtSignal(str, Mood)
|
||||||
colorUpdated = QtCore.pyqtSignal("QString", QtGui.QColor)
|
colorUpdated = QtCore.pyqtSignal(str, QtGui.QColor)
|
||||||
messageReceived = QtCore.pyqtSignal("QString", "QString")
|
messageReceived = QtCore.pyqtSignal(str, str)
|
||||||
memoReceived = QtCore.pyqtSignal("QString", "QString", "QString")
|
memoReceived = QtCore.pyqtSignal(str, str, str)
|
||||||
noticeReceived = QtCore.pyqtSignal("QString", "QString")
|
noticeReceived = QtCore.pyqtSignal(str, str)
|
||||||
inviteReceived = QtCore.pyqtSignal("QString", "QString")
|
inviteReceived = QtCore.pyqtSignal(str, str)
|
||||||
timeCommand = QtCore.pyqtSignal("QString", "QString", "QString")
|
timeCommand = QtCore.pyqtSignal(str, str, str)
|
||||||
namesReceived = QtCore.pyqtSignal("QString", PesterList)
|
namesReceived = QtCore.pyqtSignal(str, PesterList)
|
||||||
channelListReceived = QtCore.pyqtSignal(PesterList)
|
channelListReceived = QtCore.pyqtSignal(PesterList)
|
||||||
nickCollision = QtCore.pyqtSignal("QString", "QString")
|
nickCollision = QtCore.pyqtSignal(str, str)
|
||||||
getSvsnickedOn = QtCore.pyqtSignal("QString", "QString")
|
getSvsnickedOn = QtCore.pyqtSignal(str, str)
|
||||||
myHandleChanged = QtCore.pyqtSignal("QString")
|
myHandleChanged = QtCore.pyqtSignal(str)
|
||||||
chanInviteOnly = QtCore.pyqtSignal("QString")
|
chanInviteOnly = QtCore.pyqtSignal(str)
|
||||||
modesUpdated = QtCore.pyqtSignal("QString", "QString")
|
modesUpdated = QtCore.pyqtSignal(str, str)
|
||||||
connected = QtCore.pyqtSignal()
|
connected = QtCore.pyqtSignal()
|
||||||
askToConnect = QtCore.pyqtSignal(Exception)
|
askToConnect = QtCore.pyqtSignal(Exception)
|
||||||
userPresentUpdate = QtCore.pyqtSignal("QString", "QString", "QString")
|
userPresentUpdate = QtCore.pyqtSignal(str, str, str)
|
||||||
cannotSendToChan = QtCore.pyqtSignal("QString", "QString")
|
cannotSendToChan = QtCore.pyqtSignal(str, str)
|
||||||
signal_forbiddenchannel = QtCore.pyqtSignal("QString", "QString")
|
signal_forbiddenchannel = QtCore.pyqtSignal(str, str)
|
||||||
|
|
6
memos.py
6
memos.py
|
@ -1461,7 +1461,7 @@ class PesterMemo(PesterConvo):
|
||||||
def closeInviteOnly(self, channel):
|
def closeInviteOnly(self, channel):
|
||||||
c = str(channel)
|
c = str(channel)
|
||||||
if c.lower() == self.channel.lower():
|
if c.lower() == self.channel.lower():
|
||||||
self.mainwindow.inviteOnlyChan["QString"].disconnect(self.closeInviteOnly)
|
self.mainwindow.inviteOnlyChan[str].disconnect(self.closeInviteOnly)
|
||||||
if self.parent():
|
if self.parent():
|
||||||
PchumLog.info(self.channel)
|
PchumLog.info(self.channel)
|
||||||
i = self.parent().tabIndices[self.channel]
|
i = self.parent().tabIndices[self.channel]
|
||||||
|
@ -1484,7 +1484,7 @@ class PesterMemo(PesterConvo):
|
||||||
def closeForbidden(self, channel, reason):
|
def closeForbidden(self, channel, reason):
|
||||||
c = str(channel)
|
c = str(channel)
|
||||||
if c.lower() == self.channel.lower():
|
if c.lower() == self.channel.lower():
|
||||||
self.mainwindow.forbiddenChan["QString", "QString"].disconnect(
|
self.mainwindow.forbiddenChan[str, str].disconnect(
|
||||||
self.closeForbidden
|
self.closeForbidden
|
||||||
)
|
)
|
||||||
if self.parent():
|
if self.parent():
|
||||||
|
@ -2040,7 +2040,7 @@ class PesterMemo(PesterConvo):
|
||||||
self.mainwindow.waitingMessages.messageAnswered(self.channel)
|
self.mainwindow.waitingMessages.messageAnswered(self.channel)
|
||||||
self.windowClosed.emit(self.title())
|
self.windowClosed.emit(self.title())
|
||||||
|
|
||||||
windowClosed = QtCore.pyqtSignal("QString")
|
windowClosed = QtCore.pyqtSignal(str)
|
||||||
|
|
||||||
|
|
||||||
timelist = [
|
timelist = [
|
||||||
|
|
|
@ -1152,8 +1152,8 @@ class chumArea(RightClickTree):
|
||||||
self.takeItem(chumLabel)
|
self.takeItem(chumLabel)
|
||||||
self.addItem(chumLabel)
|
self.addItem(chumLabel)
|
||||||
|
|
||||||
removeChumSignal = QtCore.pyqtSignal("QString")
|
removeChumSignal = QtCore.pyqtSignal(str)
|
||||||
blockChumSignal = QtCore.pyqtSignal("QString")
|
blockChumSignal = QtCore.pyqtSignal(str)
|
||||||
|
|
||||||
|
|
||||||
class trollSlum(chumArea):
|
class trollSlum(chumArea):
|
||||||
|
@ -1295,13 +1295,13 @@ class TrollSlumWindow(QtWidgets.QFrame):
|
||||||
self.blockChumSignal.emit(handle)
|
self.blockChumSignal.emit(handle)
|
||||||
self.addtrolldialog = None
|
self.addtrolldialog = None
|
||||||
|
|
||||||
blockChumSignal = QtCore.pyqtSignal("QString")
|
blockChumSignal = QtCore.pyqtSignal(str)
|
||||||
unblockChumSignal = QtCore.pyqtSignal("QString")
|
unblockChumSignal = QtCore.pyqtSignal(str)
|
||||||
|
|
||||||
|
|
||||||
class PesterWindow(MovingWindow):
|
class PesterWindow(MovingWindow):
|
||||||
disconnectIRC = QtCore.pyqtSignal()
|
disconnectIRC = QtCore.pyqtSignal()
|
||||||
sendMessage = QtCore.pyqtSignal("QString", "QString")
|
sendMessage = QtCore.pyqtSignal(str, str)
|
||||||
|
|
||||||
def __init__(self, options, parent=None, app=None):
|
def __init__(self, options, parent=None, app=None):
|
||||||
super().__init__(
|
super().__init__(
|
||||||
|
@ -1596,8 +1596,8 @@ class PesterWindow(MovingWindow):
|
||||||
self.chumList.itemActivated[QtWidgets.QTreeWidgetItem, int].connect(
|
self.chumList.itemActivated[QtWidgets.QTreeWidgetItem, int].connect(
|
||||||
self.pesterSelectedChum
|
self.pesterSelectedChum
|
||||||
)
|
)
|
||||||
self.chumList.removeChumSignal["QString"].connect(self.removeChum)
|
self.chumList.removeChumSignal[str].connect(self.removeChum)
|
||||||
self.chumList.blockChumSignal["QString"].connect(self.blockChum)
|
self.chumList.blockChumSignal[str].connect(self.blockChum)
|
||||||
|
|
||||||
self.addChumButton = QtWidgets.QPushButton(
|
self.addChumButton = QtWidgets.QPushButton(
|
||||||
self.theme["main/addchum/text"], self
|
self.theme["main/addchum/text"], self
|
||||||
|
@ -1662,7 +1662,7 @@ class PesterWindow(MovingWindow):
|
||||||
# if not ostools.isOSXLeopard():
|
# if not ostools.isOSXLeopard():
|
||||||
# QtCore.QTimer.singleShot(1000, self.mspacheck)
|
# QtCore.QTimer.singleShot(1000, self.mspacheck)
|
||||||
|
|
||||||
self.pcUpdate["QString", "QString"].connect(self.updateMsg)
|
self.pcUpdate[str, str].connect(self.updateMsg)
|
||||||
|
|
||||||
self.mychumhandleLabel.adjustSize() # Required so "CHUMHANDLE:" regardless of style-sheet.
|
self.mychumhandleLabel.adjustSize() # Required so "CHUMHANDLE:" regardless of style-sheet.
|
||||||
self.moodsLabel.adjustSize() # Required so "MOOD:" regardless of style-sheet.
|
self.moodsLabel.adjustSize() # Required so "MOOD:" regardless of style-sheet.
|
||||||
|
@ -2027,10 +2027,10 @@ class PesterWindow(MovingWindow):
|
||||||
self.tabconvo.show()
|
self.tabconvo.show()
|
||||||
else:
|
else:
|
||||||
convoWindow = PesterConvo(chum, initiated, self)
|
convoWindow = PesterConvo(chum, initiated, self)
|
||||||
convoWindow.messageSent["QString", "QString"].connect(
|
convoWindow.messageSent[str, str].connect(
|
||||||
self.sendMessage["QString", "QString"]
|
self.sendMessage[str, str]
|
||||||
)
|
)
|
||||||
convoWindow.windowClosed["QString"].connect(self.closeConvo)
|
convoWindow.windowClosed[str].connect(self.closeConvo)
|
||||||
self.convos[chum.handle] = convoWindow
|
self.convos[chum.handle] = convoWindow
|
||||||
if chum.handle.upper() in BOTNAMES or self.config.irc_compatibility_mode():
|
if chum.handle.upper() in BOTNAMES or self.config.irc_compatibility_mode():
|
||||||
convoWindow.toggleQuirks(True)
|
convoWindow.toggleQuirks(True)
|
||||||
|
@ -2134,15 +2134,15 @@ class PesterWindow(MovingWindow):
|
||||||
else:
|
else:
|
||||||
memoWindow = PesterMemo(channel, timestr, self, None)
|
memoWindow = PesterMemo(channel, timestr, self, None)
|
||||||
# connect signals
|
# connect signals
|
||||||
self.inviteOnlyChan["QString"].connect(memoWindow.closeInviteOnly)
|
self.inviteOnlyChan[str].connect(memoWindow.closeInviteOnly)
|
||||||
self.forbiddenChan["QString", "QString"].connect(memoWindow.closeForbidden)
|
self.forbiddenChan[str, str].connect(memoWindow.closeForbidden)
|
||||||
memoWindow.messageSent["QString", "QString"].connect(
|
memoWindow.messageSent[str, str].connect(
|
||||||
self.sendMessage["QString", "QString"]
|
self.sendMessage[str, str]
|
||||||
)
|
)
|
||||||
memoWindow.windowClosed["QString"].connect(self.closeMemo)
|
memoWindow.windowClosed[str].connect(self.closeMemo)
|
||||||
self.namesUpdated["QString"].connect(memoWindow.namesUpdated)
|
self.namesUpdated[str].connect(memoWindow.namesUpdated)
|
||||||
self.modesUpdated["QString", "QString"].connect(memoWindow.modesUpdated)
|
self.modesUpdated[str, str].connect(memoWindow.modesUpdated)
|
||||||
self.userPresentSignal["QString", "QString", "QString"].connect(
|
self.userPresentSignal[str, str, str].connect(
|
||||||
memoWindow.userPresentChange
|
memoWindow.userPresentChange
|
||||||
)
|
)
|
||||||
# chat client send memo open
|
# chat client send memo open
|
||||||
|
@ -3098,8 +3098,8 @@ class PesterWindow(MovingWindow):
|
||||||
self.allusers = PesterUserlist(self.config, self.theme, self)
|
self.allusers = PesterUserlist(self.config, self.theme, self)
|
||||||
self.allusers.accepted.connect(self.userListClose)
|
self.allusers.accepted.connect(self.userListClose)
|
||||||
self.allusers.rejected.connect(self.userListClose)
|
self.allusers.rejected.connect(self.userListClose)
|
||||||
self.allusers.addChum["QString"].connect(self.userListAdd)
|
self.allusers.addChum[str].connect(self.userListAdd)
|
||||||
self.allusers.pesterChum["QString"].connect(self.userListPester)
|
self.allusers.pesterChum[str].connect(self.userListPester)
|
||||||
self.requestNames.emit("#pesterchum")
|
self.requestNames.emit("#pesterchum")
|
||||||
self.allusers.show()
|
self.allusers.show()
|
||||||
|
|
||||||
|
@ -3613,8 +3613,8 @@ class PesterWindow(MovingWindow):
|
||||||
return
|
return
|
||||||
trolls = [PesterProfile(h) for h in self.config.getBlocklist()]
|
trolls = [PesterProfile(h) for h in self.config.getBlocklist()]
|
||||||
self.trollslum = TrollSlumWindow(trolls, self)
|
self.trollslum = TrollSlumWindow(trolls, self)
|
||||||
self.trollslum.blockChumSignal["QString"].connect(self.blockChum)
|
self.trollslum.blockChumSignal[str].connect(self.blockChum)
|
||||||
self.trollslum.unblockChumSignal["QString"].connect(self.unblockChum)
|
self.trollslum.unblockChumSignal[str].connect(self.unblockChum)
|
||||||
self.moodsRequest.emit(PesterList(trolls))
|
self.moodsRequest.emit(PesterList(trolls))
|
||||||
self.trollslum.show()
|
self.trollslum.show()
|
||||||
|
|
||||||
|
@ -4215,41 +4215,41 @@ class PesterWindow(MovingWindow):
|
||||||
if ret == QtWidgets.QMessageBox.StandardButton.Yes:
|
if ret == QtWidgets.QMessageBox.StandardButton.Yes:
|
||||||
self.parent.restartIRC(verify_hostname=False)
|
self.parent.restartIRC(verify_hostname=False)
|
||||||
|
|
||||||
pcUpdate = QtCore.pyqtSignal("QString", "QString")
|
pcUpdate = QtCore.pyqtSignal(str, str)
|
||||||
closeToTraySignal = QtCore.pyqtSignal()
|
closeToTraySignal = QtCore.pyqtSignal()
|
||||||
newConvoStarted = QtCore.pyqtSignal("QString", bool, name="newConvoStarted")
|
newConvoStarted = QtCore.pyqtSignal(str, bool, name="newConvoStarted")
|
||||||
sendMessage = QtCore.pyqtSignal("QString", "QString")
|
sendMessage = QtCore.pyqtSignal(str, str)
|
||||||
sendNotice = QtCore.pyqtSignal("QString", "QString")
|
sendNotice = QtCore.pyqtSignal(str, str)
|
||||||
sendCTCP = QtCore.pyqtSignal("QString", "QString")
|
sendCTCP = QtCore.pyqtSignal(str, str)
|
||||||
convoClosed = QtCore.pyqtSignal("QString")
|
convoClosed = QtCore.pyqtSignal(str)
|
||||||
profileChanged = QtCore.pyqtSignal()
|
profileChanged = QtCore.pyqtSignal()
|
||||||
animationSetting = QtCore.pyqtSignal(bool)
|
animationSetting = QtCore.pyqtSignal(bool)
|
||||||
moodRequest = QtCore.pyqtSignal(PesterProfile)
|
moodRequest = QtCore.pyqtSignal(PesterProfile)
|
||||||
moodsRequest = QtCore.pyqtSignal(PesterList)
|
moodsRequest = QtCore.pyqtSignal(PesterList)
|
||||||
moodUpdated = QtCore.pyqtSignal()
|
moodUpdated = QtCore.pyqtSignal()
|
||||||
requestChannelList = QtCore.pyqtSignal()
|
requestChannelList = QtCore.pyqtSignal()
|
||||||
requestNames = QtCore.pyqtSignal("QString")
|
requestNames = QtCore.pyqtSignal(str)
|
||||||
namesUpdated = QtCore.pyqtSignal("QString")
|
namesUpdated = QtCore.pyqtSignal(str)
|
||||||
modesUpdated = QtCore.pyqtSignal("QString", "QString")
|
modesUpdated = QtCore.pyqtSignal(str, str)
|
||||||
userPresentSignal = QtCore.pyqtSignal("QString", "QString", "QString")
|
userPresentSignal = QtCore.pyqtSignal(str, str, str)
|
||||||
mycolorUpdated = QtCore.pyqtSignal()
|
mycolorUpdated = QtCore.pyqtSignal()
|
||||||
trayIconSignal = QtCore.pyqtSignal(int)
|
trayIconSignal = QtCore.pyqtSignal(int)
|
||||||
blockedChum = QtCore.pyqtSignal("QString")
|
blockedChum = QtCore.pyqtSignal(str)
|
||||||
unblockedChum = QtCore.pyqtSignal("QString")
|
unblockedChum = QtCore.pyqtSignal(str)
|
||||||
kickUser = QtCore.pyqtSignal("QString", "QString", "QString")
|
kickUser = QtCore.pyqtSignal(str, str, str)
|
||||||
joinChannel = QtCore.pyqtSignal("QString")
|
joinChannel = QtCore.pyqtSignal(str)
|
||||||
leftChannel = QtCore.pyqtSignal("QString")
|
leftChannel = QtCore.pyqtSignal(str)
|
||||||
setChannelMode = QtCore.pyqtSignal("QString", "QString", "QString")
|
setChannelMode = QtCore.pyqtSignal(str, str, str)
|
||||||
channelNames = QtCore.pyqtSignal("QString")
|
channelNames = QtCore.pyqtSignal(str)
|
||||||
inviteChum = QtCore.pyqtSignal("QString", "QString")
|
inviteChum = QtCore.pyqtSignal(str, str)
|
||||||
inviteOnlyChan = QtCore.pyqtSignal("QString")
|
inviteOnlyChan = QtCore.pyqtSignal(str)
|
||||||
forbiddenChan = QtCore.pyqtSignal("QString", "QString")
|
forbiddenChan = QtCore.pyqtSignal(str, str)
|
||||||
closeSignal = QtCore.pyqtSignal()
|
closeSignal = QtCore.pyqtSignal()
|
||||||
disconnectIRC = QtCore.pyqtSignal()
|
disconnectIRC = QtCore.pyqtSignal()
|
||||||
gainAttention = QtCore.pyqtSignal(QtWidgets.QWidget)
|
gainAttention = QtCore.pyqtSignal(QtWidgets.QWidget)
|
||||||
pingServer = QtCore.pyqtSignal()
|
pingServer = QtCore.pyqtSignal()
|
||||||
setAway = QtCore.pyqtSignal(bool)
|
setAway = QtCore.pyqtSignal(bool)
|
||||||
killSomeQuirks = QtCore.pyqtSignal("QString", "QString")
|
killSomeQuirks = QtCore.pyqtSignal(str, str)
|
||||||
|
|
||||||
|
|
||||||
class PesterTray(QtWidgets.QSystemTrayIcon):
|
class PesterTray(QtWidgets.QSystemTrayIcon):
|
||||||
|
|
Loading…
Reference in a new issue