diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Network/IRC/IrcNetworkEditDialog.py
--- a/src/eric7/Network/IRC/IrcNetworkEditDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Network/IRC/IrcNetworkEditDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -23,10 +23,11 @@
"""
Class implementing a dialog for editing IRC network definitions.
"""
+
def __init__(self, manager, networkName, parent=None):
"""
Constructor
-
+
@param manager reference to the IRC network manager object
(IrcNetworkManager)
@param networkName name of the network to work on (string)
@@ -34,46 +35,42 @@
"""
super().__init__(parent)
self.setupUi(self)
-
+
self.__manager = manager
-
- self.editIdentitiesButton.setIcon(
- UI.PixmapCache.getIcon("ircConfigure"))
- self.editServerButton.setIcon(
- UI.PixmapCache.getIcon("ircConfigure"))
- self.editChannelButton.setIcon(
- UI.PixmapCache.getIcon("ircConfigure"))
+
+ self.editIdentitiesButton.setIcon(UI.PixmapCache.getIcon("ircConfigure"))
+ self.editServerButton.setIcon(UI.PixmapCache.getIcon("ircConfigure"))
+ self.editChannelButton.setIcon(UI.PixmapCache.getIcon("ircConfigure"))
self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus"))
self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus"))
-
- self.__okButton = self.buttonBox.button(
- QDialogButtonBox.StandardButton.Ok)
-
+
+ self.__okButton = self.buttonBox.button(QDialogButtonBox.StandardButton.Ok)
+
if networkName:
- self.__network = copy.deepcopy(
- self.__manager.getNetwork(networkName))
+ self.__network = copy.deepcopy(self.__manager.getNetwork(networkName))
else:
from .IrcNetworkManager import IrcNetwork
+
self.__network = IrcNetwork("")
-
+
# network name
self.networkEdit.setText(networkName)
-
+
# identities
self.__refreshIdentityCombo(self.__network.getIdentityName())
-
+
# server
self.serverEdit.setText(self.__network.getServerName())
-
+
# channels
for channelName in sorted(self.__network.getChannelNames()):
channel = self.__network.getChannel(channelName)
autoJoin = self.tr("Yes") if channel.autoJoin() else self.tr("No")
QTreeWidgetItem(self.channelList, [channelName, autoJoin])
-
+
self.__updateOkButton()
self.on_channelList_itemSelectionChanged()
-
+
def __updateOkButton(self):
"""
Private method to update the OK button state.
@@ -81,31 +78,32 @@
enable = True
enable &= self.networkEdit.text() != ""
enable &= self.serverEdit.text() != ""
-
+
self.__okButton.setEnabled(enable)
-
+
@pyqtSlot(str)
def on_networkEdit_textChanged(self, txt):
"""
Private slot to handle changes of the network name.
-
+
@param txt text entered into the network name edit (string)
"""
self.__updateOkButton()
-
+
def __refreshIdentityCombo(self, currentIdentity):
"""
Private method to refresh the identity combo.
-
+
@param currentIdentity name of the identity to select (string)
"""
self.identityCombo.clear()
-
+
from .IrcNetworkManager import IrcIdentity
+
identities = sorted(self.__manager.getIdentityNames())
- identities[identities.index(IrcIdentity.DefaultIdentityName)] = (
- IrcIdentity.DefaultIdentityDisplay
- )
+ identities[
+ identities.index(IrcIdentity.DefaultIdentityName)
+ ] = IrcIdentity.DefaultIdentityDisplay
self.identityCombo.addItems(identities)
if currentIdentity == IrcIdentity.DefaultIdentityName:
currentIdentity = IrcIdentity.DefaultIdentityDisplay
@@ -113,59 +111,61 @@
if index == -1:
index = 0
self.identityCombo.setCurrentIndex(index)
-
+
@pyqtSlot(str)
def on_identityCombo_currentTextChanged(self, identity):
"""
Private slot to handle the selection of an identity.
-
+
@param identity selected identity
@type str
"""
from .IrcNetworkManager import IrcIdentity
-
+
if identity == IrcIdentity.DefaultIdentityDisplay:
identity = IrcIdentity.DefaultIdentityName
self.__network.setIdentityName(identity)
-
+
@pyqtSlot()
def on_editIdentitiesButton_clicked(self):
"""
Private slot to edit the identities.
"""
from .IrcIdentitiesEditDialog import IrcIdentitiesEditDialog
+
currentIdentity = self.identityCombo.currentText()
dlg = IrcIdentitiesEditDialog(self.__manager, currentIdentity, self)
dlg.exec()
self.__refreshIdentityCombo(currentIdentity)
-
+
@pyqtSlot(str)
def on_serverEdit_textChanged(self, txt):
"""
Private slot to handle changes of the server name.
-
+
@param txt text entered into the server name edit (string)
"""
self.__updateOkButton()
-
+
@pyqtSlot()
def on_editServerButton_clicked(self):
"""
Private slot to edit the server configuration.
"""
from .IrcServerEditDialog import IrcServerEditDialog
+
dlg = IrcServerEditDialog(self.__network.getServer())
if dlg.exec() == QDialog.DialogCode.Accepted:
self.__network.setServer(dlg.getServer())
self.serverEdit.setText(self.__network.getServerName())
-
+
@pyqtSlot()
def on_addChannelButton_clicked(self):
"""
Private slot to add a channel.
"""
self.__editChannel(None)
-
+
@pyqtSlot()
def on_editChannelButton_clicked(self):
"""
@@ -174,7 +174,7 @@
itm = self.channelList.selectedItems()[0]
if itm:
self.__editChannel(itm)
-
+
@pyqtSlot()
def on_deleteChannelButton_clicked(self):
"""
@@ -185,26 +185,27 @@
res = EricMessageBox.yesNo(
self,
self.tr("Delete Channel"),
- self.tr(
- """Do you really want to delete channel <b>{0}</b>?""")
- .format(itm.text(0)))
+ self.tr("""Do you really want to delete channel <b>{0}</b>?""").format(
+ itm.text(0)
+ ),
+ )
if res:
self.__network.deleteChannel(itm.text(0))
-
+
index = self.channelList.indexOfTopLevelItem(itm)
self.channelList.takeTopLevelItem(index)
del itm
-
+
@pyqtSlot(QTreeWidgetItem, int)
def on_channelList_itemActivated(self, item, column):
"""
Private slot to handle the activation of a channel entry.
-
+
@param item reference to the activated item (QTreeWidgetItem)
@param column column the activation occurred in (integer)
"""
self.__editChannel(item)
-
+
@pyqtSlot()
def on_channelList_itemSelectionChanged(self):
"""
@@ -214,11 +215,11 @@
enable = bool(selectedItems)
self.editChannelButton.setEnabled(enable)
self.deleteChannelButton.setEnabled(enable)
-
+
def __editChannel(self, itm):
"""
Private method to edit a channel.
-
+
@param itm reference to the item to be edited (QTreeWidgetItem)
"""
if itm:
@@ -231,11 +232,13 @@
name = ""
key = ""
autoJoin = False
-
+
from .IrcChannelEditDialog import IrcChannelEditDialog
+
dlg = IrcChannelEditDialog(name, key, autoJoin, itm is not None, self)
if dlg.exec() == QDialog.DialogCode.Accepted:
from .IrcNetworkManager import IrcChannel
+
name, key, autoJoin = dlg.getData()
channel = IrcChannel(name)
channel.setKey(key)
@@ -253,11 +256,11 @@
autoJoinTxt = self.tr("No")
QTreeWidgetItem(self.channelList, [name, autoJoinTxt])
self.__network.addChannel(channel)
-
+
def getNetwork(self):
"""
Public method to get the network object.
-
+
@return edited network object (IrcNetwork)
"""
self.__network.setName(self.networkEdit.text())
