eric: comparison eric6/Network/IRC/IrcChannelWidget.py

-:f00d825fbdb3
+:d595f6f9cbf8
 from itertools import zip_longest
 import re
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, \
+from PyQt5.QtCore import (
-QTimer, QUrl, QCoreApplication
+pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, QTimer, QUrl,
+QCoreApplication
+)
 from PyQt5.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices
-from PyQt5.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication, \
+from PyQt5.QtWidgets import (
-QInputDialog, QLineEdit
+QWidget, QListWidgetItem, QMenu, QApplication, QInputDialog, QLineEdit
+)
 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
 from .Ui_IrcChannelWidget import Ui_IrcChannelWidget
 msgList = msg.split()
 cmd = msgList[0][1:].upper()
 if cmd in ["MSG", "QUERY"]:
 cmd = "PRIVMSG"
 if len(msgList) > 1:
-if msgList[1].strip().lower() in \
+if (
-self.__serviceNamesLower:
+msgList[1].strip().lower() in
-msg = "PRIVMSG " + \
+self.__serviceNamesLower
-msgList[1].strip().lower() + \
+):
+msg = (
+"PRIVMSG " +
+msgList[1].strip().lower() +
 " :" + " ".join(msgList[2:])
+)
 else:
 msg = "PRIVMSG {0} :{1}".format(
 msgList[1], " ".join(msgList[2:]))
 else:
 msgList[0] = cmd
 if Preferences.getIrc("ShowNotifications"):
 if Preferences.getIrc("NotifyMessage"):
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("irc48.png"),
 self.tr("Channel Message"), msg)
-elif Preferences.getIrc("NotifyNick") and \
+elif (
-self.__userName.lower() in msg.lower():
+Preferences.getIrc("NotifyNick") and
+self.__userName.lower() in msg.lower()
+):
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("irc48.png"),
 self.tr("Nick mentioned"), msg)
 def addUsers(self, users):
 msg = self.tr(
 "You have joined the channel {0} ({1}).").format(
 self.__name, match.group(2))
 self.__addManagementMessage(
 IrcChannelWidget.JoinIndicator, msg)
-if Preferences.getIrc("ShowNotifications") and \
+if (
-Preferences.getIrc("NotifyJoinPart"):
+Preferences.getIrc("ShowNotifications") and
+Preferences.getIrc("NotifyJoinPart")
+):
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("irc48.png"),
 self.tr("Join Channel"), msg)
 return True
 match.group(1), self.__name, ircFilter(match.group(3)))
 nmsg = self.tr("{0} has left {1}: {2}.").format(
 match.group(1), self.__name, match.group(3))
 self.__addManagementMessage(
 IrcChannelWidget.LeaveIndicator, msg)
-if Preferences.getIrc("ShowNotifications") and \
+if (
-Preferences.getIrc("NotifyJoinPart"):
+Preferences.getIrc("ShowNotifications") and
+Preferences.getIrc("NotifyJoinPart")
+):
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("irc48.png"),
 self.tr("Leave Channel"), nmsg)
 return True
 else:
 msg = self.tr("{0} has quit {1}: {2}.").format(
 match.group(1), self.__name, ircFilter(match.group(2)))
 self.__addManagementMessage(
 IrcChannelWidget.MessageIndicator, msg)
-if Preferences.getIrc("ShowNotifications") and \
+if (
-Preferences.getIrc("NotifyJoinPart"):
+Preferences.getIrc("ShowNotifications") and
+Preferences.getIrc("NotifyJoinPart")
+):
 self.__ui.showNotification(
 UI.PixmapCache.getPixmap("irc48.png"),
 self.tr("Quit"), msg)
 # always return False for other channels and server to process
 isPlus = False
 continue
 elif mode == "a":
 if isPlus:
 message = self.tr(
-"{0} sets the channel mode to 'anonymous'.")\
+"{0} sets the channel mode to 'anonymous'."
-.format(nick)
+).format(nick)
 else:
 message = self.tr(
 "{0} removes the 'anonymous' mode from the"
 " channel.").format(nick)
 elif mode == "b":
 "{0} removes the ban exception on {1}.").format(
 nick, modesParameters.pop(0))
 elif mode == "i":
 if isPlus:
 message = self.tr(
-"{0} sets the channel mode to 'invite only'.")\
+"{0} sets the channel mode to 'invite only'."
-.format(nick)
+).format(nick)
 else:
 message = self.tr(
 "{0} removes the 'invite only' mode from the"
 " channel.").format(nick)
 elif mode == "k":
 message = self.tr(
 "{0} removes the channel limit.").format(nick)
 elif mode == "m":
 if isPlus:
 message = self.tr(
-"{0} sets the channel mode to 'moderated'.")\
+"{0} sets the channel mode to 'moderated'."
-.format(nick)
+).format(nick)
 else:
 message = self.tr(
-"{0} sets the channel mode to 'unmoderated'.")\
+"{0} sets the channel mode to 'unmoderated'."
-.format(nick)
+).format(nick)
 elif mode == "n":
 if isPlus:
 message = self.tr(
 "{0} sets the channel mode to 'no messages from"
 " outside'.").format(nick)
 "{0} sets the channel mode to 'allow messages"
 " from outside'.").format(nick)
 elif mode == "p":
 if isPlus:
 message = self.tr(
-"{0} sets the channel mode to 'private'.")\
+"{0} sets the channel mode to 'private'."
-.format(nick)
+).format(nick)
 else:
 message = self.tr(
-"{0} sets the channel mode to 'public'.")\
+"{0} sets the channel mode to 'public'."
-.format(nick)
+).format(nick)
 elif mode == "q":
 if isPlus:
 message = self.tr(
-"{0} sets the channel mode to 'quiet'.")\
+"{0} sets the channel mode to 'quiet'."
-.format(nick)
+).format(nick)
 else:
 message = self.tr(
-"{0} removes the 'quiet' mode from the channel.")\
+"{0} removes the 'quiet' mode from the channel."
-.format(nick)
+).format(nick)
 elif mode == "r":
 continue
 elif mode == "s":
 if isPlus:
 message = self.tr(
-"{0} sets the channel mode to 'secret'.")\
+"{0} sets the channel mode to 'secret'."
-.format(nick)
+).format(nick)
 else:
 message = self.tr(
-"{0} sets the channel mode to 'visible'.")\
+"{0} sets the channel mode to 'visible'."
-.format(nick)
+).format(nick)
 elif mode == "t":
 if isPlus:
 message = self.tr(
 "{0} switches on 'topic protection'.").format(nick)
 else:
 message = self.tr(
-"{0} switches off 'topic protection'.")\
+"{0} switches off 'topic protection'."
-.format(nick)
+).format(nick)
 elif mode == "I":
 if isPlus:
 message = self.tr(
 "{0} sets invitation mask {1}.").format(
 nick, modesParameters.pop(0))
 """
 Private slot to append a message.
 @param message message to be appended (string)
 """
-if self.__hidden and \
+if (
-self.__markerLine == "" and \
+self.__hidden and
-Preferences.getIrc("MarkPositionWhenHidden"):
+self.__markerLine == "" and
+Preferences.getIrc("MarkPositionWhenHidden")
+):
 self.setMarkerLine()
 self.messages.append(message)
 def setMarkerLine(self):
 """
 Public method to draw a line to mark the current position.
 """
 self.unsetMarkerLine()
-self.__markerLine = \
+self.__markerLine = (
-'<span style=" color:{0}; background-color:{1};">{2}</span>'\
+'<span style=" color:{0}; background-color:{1};">{2}</span>'
 .format(Preferences.getIrc("MarkerLineForegroundColour"),
 Preferences.getIrc("MarkerLineBackgroundColour"),
 self.tr('--- New From Here ---'))
+)
 self.messages.append(self.__markerLine)
 def unsetMarkerLine(self):
 """
 Public method to remove the marker line.
 def __initMessagesMenu(self):
 """
 Private slot to initialize the context menu of the messages pane.
 """
 self.__messagesMenu = QMenu(self)
-self.__copyMessagesAct = \
+self.__copyMessagesAct = self.__messagesMenu.addAction(
-self.__messagesMenu.addAction(
+UI.PixmapCache.getIcon("editCopy.png"),
-UI.PixmapCache.getIcon("editCopy.png"),
+self.tr("Copy"), self.__copyMessages)
-self.tr("Copy"), self.__copyMessages)
 self.__messagesMenu.addSeparator()
-self.__cutAllMessagesAct = \
+self.__cutAllMessagesAct = self.__messagesMenu.addAction(
-self.__messagesMenu.addAction(
+UI.PixmapCache.getIcon("editCut.png"),
-UI.PixmapCache.getIcon("editCut.png"),
+self.tr("Cut all"), self.__cutAllMessages)
-self.tr("Cut all"), self.__cutAllMessages)
+self.__copyAllMessagesAct = self.__messagesMenu.addAction(
-self.__copyAllMessagesAct = \
+UI.PixmapCache.getIcon("editCopy.png"),
-self.__messagesMenu.addAction(
+self.tr("Copy all"), self.__copyAllMessages)
-UI.PixmapCache.getIcon("editCopy.png"),
-self.tr("Copy all"), self.__copyAllMessages)
 self.__messagesMenu.addSeparator()
-self.__clearMessagesAct = \
+self.__clearMessagesAct = self.__messagesMenu.addAction(
-self.__messagesMenu.addAction(
+UI.PixmapCache.getIcon("editDelete.png"),
-UI.PixmapCache.getIcon("editDelete.png"),
+self.tr("Clear"), self.__clearMessages)
-self.tr("Clear"), self.__clearMessages)
 self.__messagesMenu.addSeparator()
-self.__saveMessagesAct = \
+self.__saveMessagesAct = self.__messagesMenu.addAction(
-self.__messagesMenu.addAction(
+UI.PixmapCache.getIcon("fileSave.png"),
-UI.PixmapCache.getIcon("fileSave.png"),
+self.tr("Save"), self.__saveMessages)
-self.tr("Save"), self.__saveMessages)
 self.__messagesMenu.addSeparator()
 self.__setMarkerMessagesAct = self.__messagesMenu.addAction(
 self.tr("Mark Current Position"), self.setMarkerLine)
 self.__unsetMarkerMessagesAct = self.__messagesMenu.addAction(
 self.tr("Remove Position Marker"),
 # group(3)  host
 # group(4)  nick
 # group(5)  user flags
 # group(6)  real name
 if match.group(1).lower() == self.__name.lower():
-away = self.tr(" (Away)") if match.group(5).startswith("G") \
+away = (
-else ""
+self.tr(" (Away)")
+if match.group(5).startswith("G") else ""
+)
 self.__addManagementMessage(
 self.tr("Who"),
 self.tr("{0} is {1}@{2} ({3}){4}").format(
 match.group(4), match.group(2), match.group(3),
 match.group(6), away))
 # generate the list of channels the user is in
 channelList = match.group(2).split()
 for channel in channelList:
 if channel.startswith(("*", "&")):
 adminChannels.append(channel[1:])
-elif channel.startswith(("!", "~")) and \
+elif (
-self.__ircWidget.isChannelName(channel[1:]):
+channel.startswith(("!", "~")) and
+self.__ircWidget.isChannelName(channel[1:])
+):
 ownerChannels.append(channel[1:])
 elif channel.startswith("@+"):
 opChannels.append(channel[2:])
 elif channel.startswith("@"):
 opChannels.append(channel[1:])

Mercurial Repositories > eric / file comparison

comparison: eric6/Network/IRC/IrcChannelWidget.py

eric6/Network/IRC/IrcChannelWidget.py