eric: comparison eric7/PluginManager/PluginRepositoryDialog.py

-:f254ab0d42fa
+:ce2034bc1c6e
 pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, QProcess, QPoint,
 QCoreApplication
 )
 from PyQt6.QtWidgets import (
 QWidget, QDialogButtonBox, QAbstractButton, QTreeWidgetItem, QDialog,
-QVBoxLayout, QMenu
+QVBoxLayout, QMenu, QLabel
 )
 from PyQt6.QtNetwork import (
 QNetworkAccessManager, QNetworkRequest, QNetworkReply, QNetworkInformation
 )
 PluginStatusNew = 1
 PluginStatusLocalUpdate = 2
 PluginStatusRemoteUpdate = 3
 PluginStatusError = 4
-def __init__(self, pluginManager, parent=None):
+def __init__(self, pluginManager, integrated=False, parent=None):
 """
 Constructor
 @param pluginManager reference to the plugin manager object
 @type PluginManager
+@param integrated flag indicating the integration into the sidebar
+@type bool
 @param parent parent of this dialog
 @type QWidget
 """
 super().__init__(parent)
 self.setupUi(self)
 self.__pluginManager = PluginManager()
 self.__external = True
 else:
 self.__pluginManager = pluginManager
 self.__external = False
+self.__integratedWidget = integrated
 self.__updateButton = self.buttonBox.addButton(
 self.tr("Update"), QDialogButtonBox.ButtonRole.ActionRole)
 self.__downloadButton = self.buttonBox.addButton(
 self.tr("Download"), QDialogButtonBox.ButtonRole.ActionRole)
 self.__downloadInstallButton.setEnabled(False)
 self.__downloadCancelButton = self.buttonBox.addButton(
 self.tr("Cancel"), QDialogButtonBox.ButtonRole.ActionRole)
 self.__downloadCancelButton.setEnabled(False)
 self.__installButton = self.buttonBox.addButton(
+self.tr("Install") if self.__integratedWidget else
 self.tr("Close && Install"),
 QDialogButtonBox.ButtonRole.ActionRole)
 self.__installButton.setEnabled(False)
-self.__closeButton = self.buttonBox.button(
+if not self.__integratedWidget:
-QDialogButtonBox.StandardButton.Close)
+self.__closeButton = self.buttonBox.addButton(
-self.__closeButton.setEnabled(True)
+self.tr("Close"), QDialogButtonBox.ButtonRole.RejectRole)
+self.__closeButton.setEnabled(True)
 self.repositoryUrlEdit.setText(
 Preferences.getUI("PluginRepositoryUrl7"))
-self.repositoryList.headerItem().setText(
+if self.__integratedWidget:
-self.repositoryList.columnCount(), "")
+self.repositoryList.setHeaderHidden(True)
-self.repositoryList.header().setSortIndicator(
+else:
-0, Qt.SortOrder.AscendingOrder)
+self.repositoryList.headerItem().setText(
+self.repositoryList.columnCount(), "")
+self.repositoryList.header().setSortIndicator(
+0, Qt.SortOrder.AscendingOrder)
 self.__pluginContextMenu = QMenu(self)
 self.__hideAct = self.__pluginContextMenu.addAction(
 self.tr("Hide"), self.__hidePlugin)
 self.__hideSelectedAct = self.__pluginContextMenu.addAction(
 self.__online = online
 self.__updateButton.setEnabled(online)
 self.on_repositoryList_itemSelectionChanged()
-msg = (
+if not self.__integratedWidget:
-self.tr("Internet Reachability Status: Reachable")
+msg = (
-if online else
+self.tr("Internet Reachability Status: Reachable")
-self.tr("Internet Reachability Status: Not Reachable")
+if online else
-)
+self.tr("Internet Reachability Status: Not Reachable")
-self.statusLabel.setText(msg)
+)
+self.statusLabel.setText(msg)
 @pyqtSlot(QAbstractButton)
 def on_buttonBox_clicked(self, button):
 """
 Private slot to handle the click of a button of the button box.
 @param button reference to the button pressed (QAbstractButton)
 """
 if button == self.__updateButton:
-self.__updateList()
+self.updateList()
 elif button == self.__downloadButton:
 self.__isDownloadInstall = False
 self.__downloadPlugins()
 elif button == self.__downloadInstallButton:
 self.__isDownloadInstall = True
 enable = bool(self.__selectedItems())
 self.__downloadButton.setEnabled(enable and self.__online)
 self.__downloadInstallButton.setEnabled(enable and self.__online)
 self.__installButton.setEnabled(enable)
-def __updateList(self):
+def updateList(self):
 """
-Private slot to download a new list and display the contents.
+Public slot to download a new list and display the contents.
 """
 url = self.repositoryUrlEdit.text()
 self.__downloadFile(url,
 self.pluginRepositoryFile,
 self.__downloadRepositoryFileDone)
 """
 if self.__online:
 self.__updateButton.setEnabled(False)
 self.__downloadButton.setEnabled(False)
 self.__downloadInstallButton.setEnabled(False)
-self.__closeButton.setEnabled(False)
+if not self.__integratedWidget:
+self.__closeButton.setEnabled(False)
 self.__downloadCancelButton.setEnabled(True)
 self.statusLabel.setText(url)
 request = QNetworkRequest(QUrl(url))
 @type str
 @param doneMethod method to be called when done
 @type func
 """
 self.__updateButton.setEnabled(True)
-self.__closeButton.setEnabled(True)
+if not self.__integratedWidget:
+self.__closeButton.setEnabled(True)
 self.__downloadCancelButton.setEnabled(False)
 ok = True
 if reply in self.__replies:
 self.__replies.remove(reply)
 if self.__unknownItem is None:
 self.__unknownItem = QTreeWidgetItem(
 self.repositoryList, [self.tr("Unknown")])
 self.__unknownItem.setExpanded(True)
 parent = self.__unknownItem
-itm = QTreeWidgetItem(parent, [name, version, short])
+if self.__integratedWidget:
+entryFormat = "<b>{0}</b> - Version: <i>{1}</i><br/>{2}"
+itm = QTreeWidgetItem(parent)
+itm.setFirstColumnSpanned(True)
+label = QLabel(entryFormat.format(name, version, short))
+self.repositoryList.setItemWidget(itm, 0, label)
+else:
+itm = QTreeWidgetItem(parent, [name, version, short])
 itm.setData(0, PluginRepositoryWidget.UrlRole, url)
 itm.setData(0, PluginRepositoryWidget.FilenameRole, filename)
 itm.setData(0, PluginRepositoryWidget.AuthorRole, author)
 itm.setData(0, PluginRepositoryWidget.DescrRole, description)
+iconColumn = 0 if self.__integratedWidget else 1
 updateStatus = self.__updateStatus(filename, version)
 if updateStatus == PluginRepositoryWidget.PluginStatusUpToDate:
-itm.setIcon(1, UI.PixmapCache.getIcon("empty"))
+itm.setIcon(iconColumn, UI.PixmapCache.getIcon("empty"))
-itm.setToolTip(1, self.tr("up-to-date"))
+itm.setToolTip(iconColumn, self.tr("up-to-date"))
 elif updateStatus == PluginRepositoryWidget.PluginStatusNew:
-itm.setIcon(1, UI.PixmapCache.getIcon("download"))
+itm.setIcon(iconColumn, UI.PixmapCache.getIcon("download"))
-itm.setToolTip(1, self.tr("new download available"))
+itm.setToolTip(iconColumn, self.tr("new download available"))
 self.__newItems += 1
 elif updateStatus == PluginRepositoryWidget.PluginStatusLocalUpdate:
-itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal"))
+itm.setIcon(iconColumn, UI.PixmapCache.getIcon("updateLocal"))
-itm.setToolTip(1, self.tr("update installable"))
+itm.setToolTip(iconColumn, self.tr("update installable"))
 self.__updateLocalItems += 1
 elif updateStatus == PluginRepositoryWidget.PluginStatusRemoteUpdate:
-itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote"))
+itm.setIcon(iconColumn, UI.PixmapCache.getIcon("updateRemote"))
-itm.setToolTip(1, self.tr("updated download available"))
+itm.setToolTip(iconColumn, self.tr("updated download available"))
 self.__updateRemoteItems += 1
 elif updateStatus == PluginRepositoryWidget.PluginStatusError:
-itm.setIcon(1, UI.PixmapCache.getIcon("warning"))
+itm.setIcon(iconColumn, UI.PixmapCache.getIcon("warning"))
-itm.setToolTip(1, self.tr("error determining status"))
+itm.setToolTip(iconColumn, self.tr("error determining status"))
 def __updateStatus(self, filename, version):
 """
 Private method to check the given archive update status.
 self.__layout = QVBoxLayout(self)
 self.__layout.setContentsMargins(0, 0, 0, 0)
 self.setLayout(self.__layout)
-self.cw = PluginRepositoryWidget(pluginManager, self)
+self.cw = PluginRepositoryWidget(pluginManager, parent=self)
 size = self.cw.size()
 self.__layout.addWidget(self.cw)
 self.resize(size)
 self.setWindowTitle(self.cw.windowTitle())
 Constructor
 @param parent reference to the parent widget (QWidget)
 """
 super().__init__(parent)
-self.cw = PluginRepositoryWidget(None, self)
+self.cw = PluginRepositoryWidget(None, parent=self)
 size = self.cw.size()
 self.setCentralWidget(self.cw)
 self.resize(size)
 self.setWindowTitle(self.cw.windowTitle())

Mercurial Repositories > eric / file comparison

comparison: eric7/PluginManager/PluginRepositoryDialog.py

eric7/PluginManager/PluginRepositoryDialog.py