eric: comparison Cooperation/ChatWidget.py

-:96232974dcdb
+:645c12de6b0c
 self.__client.participantLeft.connect(self.__participantLeft)
 self.__client.connectionError.connect(self.__showErrorMessage)
 self.__client.cannotConnect.connect(self.__initialConnectionRefused)
 self.__client.editorCommand.connect(self.__editorCommandMessage)
-self.serverButton.setText(self.trUtf8("Start Server"))
+self.serverButton.setText(self.tr("Start Server"))
 self.serverLed.setColor(QColor(Qt.red))
 if port == -1:
 port = Preferences.getCooperation("ServerPort")
 self.serverPortSpin.setValue(port)
 if text == "":
 return
 if text.startswith("/"):
 self.__showErrorMessage(
-self.trUtf8("! Unknown command: {0}\n")
+self.tr("! Unknown command: {0}\n")
 .format(text.split()[0]))
 else:
 self.__client.sendMessage(text)
 self.appendMessage(self.__myNickName, text)
 color = self.chatEdit.textColor()
 self.chatEdit.setTextColor(Qt.gray)
 self.chatEdit.append(
 QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
 ":")
-self.chatEdit.append(self.trUtf8("* {0} has joined.\n").format(nick))
+self.chatEdit.append(self.tr("* {0} has joined.\n").format(nick))
 self.chatEdit.setTextColor(color)
 QListWidgetItem(
 UI.PixmapCache.getIcon(
 "chatUser{0}.png".format(1 + self.usersList.count() % 6)),
 self.__setConnected(True)
 if not self.isVisible():
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("cooperation48.png"),
-self.trUtf8("New User"), self.trUtf8("{0} has joined.")
+self.tr("New User"), self.tr("{0} has joined.")
 .format(nick))
 def __participantLeft(self, nick):
 """
 Private slot handling a participant leaving the session.
 color = self.chatEdit.textColor()
 self.chatEdit.setTextColor(Qt.gray)
 self.chatEdit.append(
 QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
 ":")
-self.chatEdit.append(self.trUtf8("* {0} has left.\n").format(nick))
+self.chatEdit.append(self.tr("* {0} has left.\n").format(nick))
 self.chatEdit.setTextColor(color)
 if not self.__client.hasConnections():
 self.__setConnected(False)
 if not self.isVisible():
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("cooperation48.png"),
-self.trUtf8("User Left"), self.trUtf8("{0} has left.")
+self.tr("User Left"), self.tr("{0} has left.")
 .format(nick))
 def appendMessage(self, from_, message):
 """
 Public slot to append a message to the display.
 bar.setValue(bar.maximum())
 if not self.isVisible():
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("cooperation48.png"),
-self.trUtf8("Message from <{0}>").format(from_), message)
+self.tr("Message from <{0}>").format(from_), message)
 @pyqtSlot(str)
 def on_hostEdit_editTextChanged(self, host):
 """
 Private slot handling the entry of a host to connect to.
 """
 Private slot to start the server.
 """
 if self.__client.isListening():
 self.__client.close()
-self.serverButton.setText(self.trUtf8("Start Server"))
+self.serverButton.setText(self.tr("Start Server"))
 self.serverPortSpin.setEnabled(True)
 if (self.serverPortSpin.value() !=
 Preferences.getCooperation("ServerPort")):
 self.serverPortSpin.setValue(
 Preferences.getCooperation("ServerPort"))
 self.serverLed.setColor(QColor(Qt.red))
 else:
 res, port = self.__client.startListening(
 self.serverPortSpin.value())
 if res:
-self.serverButton.setText(self.trUtf8("Stop Server"))
+self.serverButton.setText(self.tr("Stop Server"))
 self.serverPortSpin.setValue(port)
 self.serverPortSpin.setEnabled(False)
 self.serverLed.setColor(QColor(Qt.green))
 else:
 self.__showErrorMessage(
-self.trUtf8("! Server Error: {0}\n").format(
+self.tr("! Server Error: {0}\n").format(
 self.__client.errorString())
 )
 def __setConnected(self, connected):
 """
 Private slot to set the connected state.
 @param connected new connected state (boolean)
 """
 if connected:
-self.connectButton.setText(self.trUtf8("Disconnect"))
+self.connectButton.setText(self.tr("Disconnect"))
 self.connectButton.setEnabled(True)
 self.connectionLed.setColor(QColor(Qt.green))
 else:
-self.connectButton.setText(self.trUtf8("Connect"))
+self.connectButton.setText(self.tr("Connect"))
 self.connectButton.setEnabled(self.hostEdit.currentText() != "")
 self.connectionLed.setColor(QColor(Qt.red))
 self.on_cancelEditButton_clicked()
 self.shareButton.setChecked(False)
 self.on_shareButton_clicked(False)
 """
 self.__chatMenu = QMenu(self)
 self.__copyChatAct = \
 self.__chatMenu.addAction(
 UI.PixmapCache.getIcon("editCopy.png"),
-self.trUtf8("Copy"), self.__copyChat)
+self.tr("Copy"), self.__copyChat)
 self.__chatMenu.addSeparator()
 self.__cutAllChatAct = \
 self.__chatMenu.addAction(
 UI.PixmapCache.getIcon("editCut.png"),
-self.trUtf8("Cut all"), self.__cutAllChat)
+self.tr("Cut all"), self.__cutAllChat)
 self.__copyAllChatAct = \
 self.__chatMenu.addAction(
 UI.PixmapCache.getIcon("editCopy.png"),
-self.trUtf8("Copy all"), self.__copyAllChat)
+self.tr("Copy all"), self.__copyAllChat)
 self.__chatMenu.addSeparator()
 self.__clearChatAct = \
 self.__chatMenu.addAction(
 UI.PixmapCache.getIcon("editDelete.png"),
-self.trUtf8("Clear"), self.__clearChat)
+self.tr("Clear"), self.__clearChat)
 self.__chatMenu.addSeparator()
 self.__saveChatAct = \
 self.__chatMenu.addAction(
 UI.PixmapCache.getIcon("fileSave.png"),
-self.trUtf8("Save"), self.__saveChat)
+self.tr("Save"), self.__saveChat)
 self.on_chatEdit_copyAvailable(False)
 @pyqtSlot(bool)
 def on_chatEdit_copyAvailable(self, yes):
 """
 txt = self.chatEdit.toPlainText()
 if txt:
 fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self,
-self.trUtf8("Save Chat"),
+self.tr("Save Chat"),
 "",
-self.trUtf8("Text Files (*.txt);;All Files (*)"),
+self.tr("Text Files (*.txt);;All Files (*)"),
 None,
 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
 if fname:
 ext = QFileInfo(fname).suffix()
 if not ext:
 if ex:
 fname += ex
 if QFileInfo(fname).exists():
 res = E5MessageBox.yesNo(
 self,
-self.trUtf8("Save Chat"),
+self.tr("Save Chat"),
-self.trUtf8("<p>The file <b>{0}</b> already exists."
+self.tr("<p>The file <b>{0}</b> already exists."
 " Overwrite it?</p>").format(fname),
 icon=E5MessageBox.Warning)
 if not res:
 return
 fname = Utilities.toNativeSeparators(fname)
 f.write(txt)
 f.close()
 except IOError as err:
 E5MessageBox.critical(
 self,
-self.trUtf8("Error saving Chat"),
+self.tr("Error saving Chat"),
-self.trUtf8("""<p>The chat contents could not be"""
+self.tr("""<p>The chat contents could not be"""
 """ written to <b>{0}</b></p>"""
 """<p>Reason: {1}</p>""") .format(
 fname, str(err)))
 def __copyChat(self):
 """
 Private slot to copy the contents of the chat display to the clipboard.
 """
 self.__usersMenu = QMenu(self)
 self.__kickUserAct = \
 self.__usersMenu.addAction(
 UI.PixmapCache.getIcon("chatKickUser.png"),
-self.trUtf8("Kick User"), self.__kickUser)
+self.tr("Kick User"), self.__kickUser)
 self.__banUserAct = \
 self.__usersMenu.addAction(
 UI.PixmapCache.getIcon("chatBanUser.png"),
-self.trUtf8("Ban User"), self.__banUser)
+self.tr("Ban User"), self.__banUser)
 self.__banKickUserAct = \
 self.__usersMenu.addAction(
 UI.PixmapCache.getIcon("chatBanKickUser.png"),
-self.trUtf8("Ban and Kick User"), self.__banKickUser)
+self.tr("Ban and Kick User"), self.__banKickUser)
 @pyqtSlot(QPoint)
 def on_usersList_customContextMenuRequested(self, pos):
 """
 Private slot to show the context menu for the users list.
 color = self.chatEdit.textColor()
 self.chatEdit.setTextColor(Qt.darkYellow)
 self.chatEdit.append(
 QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
 ":")
-self.chatEdit.append(self.trUtf8("* {0} has been kicked.\n").format(
+self.chatEdit.append(self.tr("* {0} has been kicked.\n").format(
 itm.text().split("@")[0]))
 self.chatEdit.setTextColor(color)
 def __banUser(self):
 """
 color = self.chatEdit.textColor()
 self.chatEdit.setTextColor(Qt.darkYellow)
 self.chatEdit.append(
 QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
 ":")
-self.chatEdit.append(self.trUtf8("* {0} has been banned.\n").format(
+self.chatEdit.append(self.tr("* {0} has been banned.\n").format(
 itm.text().split("@")[0]))
 self.chatEdit.setTextColor(color)
 def __banKickUser(self):
 """
 self.chatEdit.setTextColor(Qt.darkYellow)
 self.chatEdit.append(
 QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) +
 ":")
 self.chatEdit.append(
-self.trUtf8("* {0} has been banned and kicked.\n")
+self.tr("* {0} has been banned and kicked.\n")
 .format(itm.text().split("@")[0]))
 self.chatEdit.setTextColor(color)
 def shutdown(self):
 """

Mercurial Repositories > eric / file comparison

comparison: Cooperation/ChatWidget.py

Cooperation/ChatWidget.py