diff -r 27f636beebad -r 2c730d5fd177 eric6/Cooperation/ChatWidget.py
--- a/eric6/Cooperation/ChatWidget.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Cooperation/ChatWidget.py Tue Mar 02 17:17:09 2021 +0100
@@ -83,7 +83,7 @@
self.__client.editorCommand.connect(self.__editorCommandMessage)
self.serverButton.setText(self.tr("Start Server"))
- self.serverLed.setColor(QColor(Qt.red))
+ self.serverLed.setColor(QColor(Qt.GlobalColor.red))
if port == -1:
port = Preferences.getCooperation("ServerPort")
@@ -167,10 +167,10 @@
return
color = self.chatEdit.textColor()
- self.chatEdit.setTextColor(Qt.gray)
+ self.chatEdit.setTextColor(Qt.GlobalColor.gray)
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- ":")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + ":")
self.chatEdit.append(self.tr("* {0} has joined.\n").format(nick))
self.chatEdit.setTextColor(color)
@@ -197,16 +197,16 @@
if nick == "":
return
- items = self.usersList.findItems(nick, Qt.MatchExactly)
+ items = self.usersList.findItems(nick, Qt.MatchFlag.MatchExactly)
for item in items:
self.usersList.takeItem(self.usersList.row(item))
del item
color = self.chatEdit.textColor()
- self.chatEdit.setTextColor(Qt.gray)
+ self.chatEdit.setTextColor(Qt.GlobalColor.gray)
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- ":")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + ":")
self.chatEdit.append(self.tr("* {0} has left.\n").format(nick))
self.chatEdit.setTextColor(color)
@@ -230,8 +230,8 @@
return
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- " <" + from_ + ">:")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + " <" + from_ + ">:")
self.chatEdit.append(message + "\n")
bar = self.chatEdit.verticalScrollBar()
bar.setValue(bar.maximum())
@@ -308,7 +308,7 @@
Preferences.getCooperation("ServerPort")):
self.serverPortSpin.setValue(
Preferences.getCooperation("ServerPort"))
- self.serverLed.setColor(QColor(Qt.red))
+ self.serverLed.setColor(QColor(Qt.GlobalColor.red))
else:
res, port = self.__client.startListening(
self.serverPortSpin.value())
@@ -316,7 +316,7 @@
self.serverButton.setText(self.tr("Stop Server"))
self.serverPortSpin.setValue(port)
self.serverPortSpin.setEnabled(False)
- self.serverLed.setColor(QColor(Qt.green))
+ self.serverLed.setColor(QColor(Qt.GlobalColor.green))
else:
self.__showErrorMessage(
self.tr("! Server Error: {0}\n").format(
@@ -332,11 +332,11 @@
if connected:
self.connectButton.setText(self.tr("Disconnect"))
self.connectButton.setEnabled(True)
- self.connectionLed.setColor(QColor(Qt.green))
+ self.connectionLed.setColor(QColor(Qt.GlobalColor.green))
else:
self.connectButton.setText(self.tr("Connect"))
self.connectButton.setEnabled(self.hostEdit.currentText() != "")
- self.connectionLed.setColor(QColor(Qt.red))
+ self.connectionLed.setColor(QColor(Qt.GlobalColor.red))
self.on_cancelEditButton_clicked()
self.shareButton.setChecked(False)
self.on_shareButton_clicked(False)
@@ -358,10 +358,10 @@
@param message error message to show (string)
"""
color = self.chatEdit.textColor()
- self.chatEdit.setTextColor(Qt.red)
+ self.chatEdit.setTextColor(Qt.GlobalColor.red)
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- ":")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + ":")
self.chatEdit.append(message + "\n")
self.chatEdit.setTextColor(color)
@@ -645,10 +645,10 @@
self.__client.kickUser(itm.text())
color = self.chatEdit.textColor()
- self.chatEdit.setTextColor(Qt.darkYellow)
+ self.chatEdit.setTextColor(Qt.GlobalColor.darkYellow)
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- ":")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + ":")
self.chatEdit.append(self.tr("* {0} has been kicked.\n").format(
itm.text().split("@")[0]))
self.chatEdit.setTextColor(color)
@@ -661,10 +661,10 @@
self.__client.banUser(itm.text())
color = self.chatEdit.textColor()
- self.chatEdit.setTextColor(Qt.darkYellow)
+ self.chatEdit.setTextColor(Qt.GlobalColor.darkYellow)
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- ":")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + ":")
self.chatEdit.append(self.tr("* {0} has been banned.\n").format(
itm.text().split("@")[0]))
self.chatEdit.setTextColor(color)
@@ -677,10 +677,10 @@
self.__client.banKickUser(itm.text())
color = self.chatEdit.textColor()
- self.chatEdit.setTextColor(Qt.darkYellow)
+ self.chatEdit.setTextColor(Qt.GlobalColor.darkYellow)
self.chatEdit.append(
- QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
- ":")
+ QDateTime.currentDateTime().toString(
+ Qt.DateFormat.SystemLocaleLongDate) + ":")
self.chatEdit.append(
self.tr("* {0} has been banned and kicked.\n")
.format(itm.text().split("@")[0]))
