Fri, 07 Jun 2024 11:16:15 +0200
Added missing Ui_*.py files and modified ones.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Preferences/ConfigurationPages/Ui_EricServerPage.py Fri Jun 07 11:16:15 2024 +0200 @@ -0,0 +1,71 @@ +# Form implementation generated from reading ui file 'src/eric7/Preferences/ConfigurationPages/EricServerPage.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_EricServerPage(object): + def setupUi(self, EricServerPage): + EricServerPage.setObjectName("EricServerPage") + EricServerPage.resize(510, 452) + self.verticalLayout_2 = QtWidgets.QVBoxLayout(EricServerPage) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.headerLabel = QtWidgets.QLabel(parent=EricServerPage) + self.headerLabel.setObjectName("headerLabel") + self.verticalLayout_2.addWidget(self.headerLabel) + self.line11 = QtWidgets.QFrame(parent=EricServerPage) + self.line11.setFrameShape(QtWidgets.QFrame.Shape.HLine) + self.line11.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) + self.line11.setFrameShape(QtWidgets.QFrame.Shape.HLine) + self.line11.setObjectName("line11") + self.verticalLayout_2.addWidget(self.line11) + self.label_2 = QtWidgets.QLabel(parent=EricServerPage) + self.label_2.setWordWrap(True) + self.label_2.setObjectName("label_2") + self.verticalLayout_2.addWidget(self.label_2) + self.groupBox = QtWidgets.QGroupBox(parent=EricServerPage) + self.groupBox.setObjectName("groupBox") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox) + self.horizontalLayout.setObjectName("horizontalLayout") + self.label = QtWidgets.QLabel(parent=self.groupBox) + self.label.setObjectName("label") + self.horizontalLayout.addWidget(self.label) + self.timeoutSpinBox = QtWidgets.QSpinBox(parent=self.groupBox) + self.timeoutSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.timeoutSpinBox.setMinimum(5) + self.timeoutSpinBox.setMaximum(60) + self.timeoutSpinBox.setObjectName("timeoutSpinBox") + self.horizontalLayout.addWidget(self.timeoutSpinBox) + spacerItem = QtWidgets.QSpacerItem(294, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.verticalLayout_2.addWidget(self.groupBox) + self.groupBox_2 = QtWidgets.QGroupBox(parent=EricServerPage) + self.groupBox_2.setObjectName("groupBox_2") + self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox_2) + self.verticalLayout.setObjectName("verticalLayout") + self.startShellCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.startShellCheckBox.setObjectName("startShellCheckBox") + self.verticalLayout.addWidget(self.startShellCheckBox) + self.verticalLayout_2.addWidget(self.groupBox_2) + spacerItem1 = QtWidgets.QSpacerItem(20, 87, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + self.verticalLayout_2.addItem(spacerItem1) + + self.retranslateUi(EricServerPage) + QtCore.QMetaObject.connectSlotsByName(EricServerPage) + EricServerPage.setTabOrder(self.timeoutSpinBox, self.startShellCheckBox) + + def retranslateUi(self, EricServerPage): + _translate = QtCore.QCoreApplication.translate + self.headerLabel.setText(_translate("EricServerPage", "<b>Configure eric-ide Server Settings</b>")) + self.label_2.setText(_translate("EricServerPage", "<b>Note:</b> The eric-ide server is configured via command line parameters. The parameters of this page configure the interface to the eric-ide server.")) + self.groupBox.setTitle(_translate("EricServerPage", "Server Connection")) + self.label.setText(_translate("EricServerPage", "Default Timeout:")) + self.timeoutSpinBox.setSuffix(_translate("EricServerPage", " s")) + self.groupBox_2.setTitle(_translate("EricServerPage", "Shell")) + self.startShellCheckBox.setToolTip(_translate("EricServerPage", "Select this to start an eric-ide Server Shell when a connection to an eric-ide Server is established.")) + self.startShellCheckBox.setText(_translate("EricServerPage", "Start server Shell when server is conncted"))
--- a/src/eric7/Project/Ui_DebuggerPropertiesDialog.py Fri Jun 07 11:13:24 2024 +0200 +++ b/src/eric7/Project/Ui_DebuggerPropertiesDialog.py Fri Jun 07 11:16:15 2024 +0200 @@ -16,18 +16,18 @@ DebuggerPropertiesDialog.setSizeGripEnabled(True) self.verticalLayout = QtWidgets.QVBoxLayout(DebuggerPropertiesDialog) self.verticalLayout.setObjectName("verticalLayout") - self.groupBox = QtWidgets.QGroupBox(parent=DebuggerPropertiesDialog) - self.groupBox.setObjectName("groupBox") - self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox) + self.debugClientGroup = QtWidgets.QGroupBox(parent=DebuggerPropertiesDialog) + self.debugClientGroup.setObjectName("debugClientGroup") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.debugClientGroup) self.horizontalLayout.setObjectName("horizontalLayout") - self.debugClientPicker = EricComboPathPicker(parent=self.groupBox) + self.debugClientPicker = EricComboPathPicker(parent=self.debugClientGroup) self.debugClientPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.debugClientPicker.setObjectName("debugClientPicker") self.horizontalLayout.addWidget(self.debugClientPicker) - self.debugClientClearHistoryButton = QtWidgets.QToolButton(parent=self.groupBox) + self.debugClientClearHistoryButton = QtWidgets.QToolButton(parent=self.debugClientGroup) self.debugClientClearHistoryButton.setObjectName("debugClientClearHistoryButton") self.horizontalLayout.addWidget(self.debugClientClearHistoryButton) - self.verticalLayout.addWidget(self.groupBox) + self.verticalLayout.addWidget(self.debugClientGroup) self.venvGroupBox = QtWidgets.QGroupBox(parent=DebuggerPropertiesDialog) self.venvGroupBox.setObjectName("venvGroupBox") self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.venvGroupBox) @@ -145,7 +145,7 @@ def retranslateUi(self, DebuggerPropertiesDialog): _translate = QtCore.QCoreApplication.translate DebuggerPropertiesDialog.setWindowTitle(_translate("DebuggerPropertiesDialog", "Debugger Properties")) - self.groupBox.setTitle(_translate("DebuggerPropertiesDialog", "Debug Client")) + self.debugClientGroup.setTitle(_translate("DebuggerPropertiesDialog", "Debug Client")) self.debugClientPicker.setToolTip(_translate("DebuggerPropertiesDialog", "Enter the path of the Debug Client to be used. Leave empty to use the default.")) self.debugClientClearHistoryButton.setToolTip(_translate("DebuggerPropertiesDialog", "Press to clear the history of entered debug clients")) self.venvGroupBox.setTitle(_translate("DebuggerPropertiesDialog", "Virtual Environment"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/RemoteServerInterface/Ui_EricServerConnectionDialog.py Fri Jun 07 11:16:15 2024 +0200 @@ -0,0 +1,82 @@ +# Form implementation generated from reading ui file 'src/eric7/RemoteServerInterface/EricServerConnectionDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_EricServerConnectionDialog(object): + def setupUi(self, EricServerConnectionDialog): + EricServerConnectionDialog.setObjectName("EricServerConnectionDialog") + EricServerConnectionDialog.resize(400, 169) + EricServerConnectionDialog.setSizeGripEnabled(True) + self.gridLayout = QtWidgets.QGridLayout(EricServerConnectionDialog) + self.gridLayout.setObjectName("gridLayout") + self.nameLabel = QtWidgets.QLabel(parent=EricServerConnectionDialog) + self.nameLabel.setObjectName("nameLabel") + self.gridLayout.addWidget(self.nameLabel, 0, 0, 1, 1) + self.nameEdit = QtWidgets.QLineEdit(parent=EricServerConnectionDialog) + self.nameEdit.setClearButtonEnabled(True) + self.nameEdit.setObjectName("nameEdit") + self.gridLayout.addWidget(self.nameEdit, 0, 1, 1, 2) + self.label = QtWidgets.QLabel(parent=EricServerConnectionDialog) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 1, 0, 1, 1) + self.hostnameEdit = QtWidgets.QLineEdit(parent=EricServerConnectionDialog) + self.hostnameEdit.setClearButtonEnabled(True) + self.hostnameEdit.setObjectName("hostnameEdit") + self.gridLayout.addWidget(self.hostnameEdit, 1, 1, 1, 2) + self.label_2 = QtWidgets.QLabel(parent=EricServerConnectionDialog) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) + self.portSpinBox = QtWidgets.QSpinBox(parent=EricServerConnectionDialog) + self.portSpinBox.setWrapping(True) + self.portSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.portSpinBox.setAccelerated(True) + self.portSpinBox.setProperty("showGroupSeparator", True) + self.portSpinBox.setMinimum(1024) + self.portSpinBox.setMaximum(65535) + self.portSpinBox.setProperty("value", 1024) + self.portSpinBox.setObjectName("portSpinBox") + self.gridLayout.addWidget(self.portSpinBox, 2, 1, 1, 1) + spacerItem = QtWidgets.QSpacerItem(240, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.gridLayout.addItem(spacerItem, 2, 2, 1, 1) + self.label_3 = QtWidgets.QLabel(parent=EricServerConnectionDialog) + self.label_3.setObjectName("label_3") + self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) + self.timeoutSpinBox = QtWidgets.QSpinBox(parent=EricServerConnectionDialog) + self.timeoutSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.timeoutSpinBox.setMaximum(60) + self.timeoutSpinBox.setObjectName("timeoutSpinBox") + self.gridLayout.addWidget(self.timeoutSpinBox, 3, 1, 1, 1) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=EricServerConnectionDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.gridLayout.addWidget(self.buttonBox, 4, 0, 1, 3) + + self.retranslateUi(EricServerConnectionDialog) + self.buttonBox.accepted.connect(EricServerConnectionDialog.accept) # type: ignore + self.buttonBox.rejected.connect(EricServerConnectionDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(EricServerConnectionDialog) + EricServerConnectionDialog.setTabOrder(self.nameEdit, self.hostnameEdit) + EricServerConnectionDialog.setTabOrder(self.hostnameEdit, self.portSpinBox) + EricServerConnectionDialog.setTabOrder(self.portSpinBox, self.timeoutSpinBox) + + def retranslateUi(self, EricServerConnectionDialog): + _translate = QtCore.QCoreApplication.translate + EricServerConnectionDialog.setWindowTitle(_translate("EricServerConnectionDialog", "eric-ide Server Connection")) + self.nameLabel.setText(_translate("EricServerConnectionDialog", "Name:")) + self.nameEdit.setToolTip(_translate("EricServerConnectionDialog", "Enter the name for the eric-ide server connection profile.")) + self.label.setText(_translate("EricServerConnectionDialog", "Hostname:")) + self.hostnameEdit.setToolTip(_translate("EricServerConnectionDialog", "Enter the hostname or IP address of the eric-ide server to connect to.")) + self.label_2.setText(_translate("EricServerConnectionDialog", "Port:")) + self.portSpinBox.setToolTip(_translate("EricServerConnectionDialog", "Enter the port number the eric-ide server listens on (default: 42024).")) + self.portSpinBox.setSpecialValueText(_translate("EricServerConnectionDialog", "default")) + self.label_3.setText(_translate("EricServerConnectionDialog", "Timeout:")) + self.timeoutSpinBox.setSpecialValueText(_translate("EricServerConnectionDialog", "default")) + self.timeoutSpinBox.setSuffix(_translate("EricServerConnectionDialog", " s"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/RemoteServerInterface/Ui_EricServerFileDialog.py Fri Jun 07 11:16:15 2024 +0200 @@ -0,0 +1,115 @@ +# Form implementation generated from reading ui file 'src/eric7/RemoteServerInterface/EricServerFileDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_EricServerFileDialog(object): + def setupUi(self, EricServerFileDialog): + EricServerFileDialog.setObjectName("EricServerFileDialog") + EricServerFileDialog.resize(600, 450) + EricServerFileDialog.setSizeGripEnabled(True) + self.verticalLayout = QtWidgets.QVBoxLayout(EricServerFileDialog) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.label = QtWidgets.QLabel(parent=EricServerFileDialog) + self.label.setObjectName("label") + self.horizontalLayout.addWidget(self.label) + self.treeCombo = QtWidgets.QComboBox(parent=EricServerFileDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.treeCombo.sizePolicy().hasHeightForWidth()) + self.treeCombo.setSizePolicy(sizePolicy) + self.treeCombo.setObjectName("treeCombo") + self.horizontalLayout.addWidget(self.treeCombo) + self.backButton = QtWidgets.QToolButton(parent=EricServerFileDialog) + self.backButton.setObjectName("backButton") + self.horizontalLayout.addWidget(self.backButton) + self.forwardButton = QtWidgets.QToolButton(parent=EricServerFileDialog) + self.forwardButton.setObjectName("forwardButton") + self.horizontalLayout.addWidget(self.forwardButton) + self.upButton = QtWidgets.QToolButton(parent=EricServerFileDialog) + self.upButton.setObjectName("upButton") + self.horizontalLayout.addWidget(self.upButton) + self.newDirButton = QtWidgets.QToolButton(parent=EricServerFileDialog) + self.newDirButton.setObjectName("newDirButton") + self.horizontalLayout.addWidget(self.newDirButton) + self.reloadButton = QtWidgets.QToolButton(parent=EricServerFileDialog) + self.reloadButton.setObjectName("reloadButton") + self.horizontalLayout.addWidget(self.reloadButton) + self.verticalLayout.addLayout(self.horizontalLayout) + self.listing = QtWidgets.QTreeWidget(parent=EricServerFileDialog) + self.listing.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) + self.listing.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.listing.setAlternatingRowColors(True) + self.listing.setRootIsDecorated(False) + self.listing.setItemsExpandable(False) + self.listing.setObjectName("listing") + self.verticalLayout.addWidget(self.listing) + self.gridLayout = QtWidgets.QGridLayout() + self.gridLayout.setObjectName("gridLayout") + self.nameLabel = QtWidgets.QLabel(parent=EricServerFileDialog) + self.nameLabel.setObjectName("nameLabel") + self.gridLayout.addWidget(self.nameLabel, 0, 0, 1, 1) + self.nameEdit = QtWidgets.QLineEdit(parent=EricServerFileDialog) + self.nameEdit.setClearButtonEnabled(True) + self.nameEdit.setObjectName("nameEdit") + self.gridLayout.addWidget(self.nameEdit, 0, 1, 1, 1) + self.okButton = QtWidgets.QPushButton(parent=EricServerFileDialog) + self.okButton.setDefault(True) + self.okButton.setObjectName("okButton") + self.gridLayout.addWidget(self.okButton, 0, 2, 1, 1) + self.filterLabel = QtWidgets.QLabel(parent=EricServerFileDialog) + self.filterLabel.setObjectName("filterLabel") + self.gridLayout.addWidget(self.filterLabel, 1, 0, 1, 1) + self.filterCombo = QtWidgets.QComboBox(parent=EricServerFileDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.filterCombo.sizePolicy().hasHeightForWidth()) + self.filterCombo.setSizePolicy(sizePolicy) + self.filterCombo.setObjectName("filterCombo") + self.gridLayout.addWidget(self.filterCombo, 1, 1, 1, 1) + self.cancelButton = QtWidgets.QPushButton(parent=EricServerFileDialog) + self.cancelButton.setObjectName("cancelButton") + self.gridLayout.addWidget(self.cancelButton, 1, 2, 1, 1) + self.verticalLayout.addLayout(self.gridLayout) + + self.retranslateUi(EricServerFileDialog) + QtCore.QMetaObject.connectSlotsByName(EricServerFileDialog) + EricServerFileDialog.setTabOrder(self.nameEdit, self.filterCombo) + EricServerFileDialog.setTabOrder(self.filterCombo, self.okButton) + EricServerFileDialog.setTabOrder(self.okButton, self.cancelButton) + EricServerFileDialog.setTabOrder(self.cancelButton, self.treeCombo) + EricServerFileDialog.setTabOrder(self.treeCombo, self.backButton) + EricServerFileDialog.setTabOrder(self.backButton, self.forwardButton) + EricServerFileDialog.setTabOrder(self.forwardButton, self.upButton) + EricServerFileDialog.setTabOrder(self.upButton, self.newDirButton) + EricServerFileDialog.setTabOrder(self.newDirButton, self.reloadButton) + EricServerFileDialog.setTabOrder(self.reloadButton, self.listing) + + def retranslateUi(self, EricServerFileDialog): + _translate = QtCore.QCoreApplication.translate + EricServerFileDialog.setWindowTitle(_translate("EricServerFileDialog", "Open Files")) + self.label.setText(_translate("EricServerFileDialog", "Look in:")) + self.backButton.setToolTip(_translate("EricServerFileDialog", "Press to move back in history.")) + self.forwardButton.setToolTip(_translate("EricServerFileDialog", "Press to move forward in history.")) + self.upButton.setToolTip(_translate("EricServerFileDialog", "Press to move up one level.")) + self.newDirButton.setToolTip(_translate("EricServerFileDialog", "Press to create a new directory.")) + self.reloadButton.setToolTip(_translate("EricServerFileDialog", "Press to reload the directory listing.")) + self.listing.setSortingEnabled(False) + self.listing.headerItem().setText(0, _translate("EricServerFileDialog", "Name")) + self.listing.headerItem().setText(1, _translate("EricServerFileDialog", "Size")) + self.listing.headerItem().setText(2, _translate("EricServerFileDialog", "Type")) + self.listing.headerItem().setText(3, _translate("EricServerFileDialog", "Date Modified")) + self.nameLabel.setText(_translate("EricServerFileDialog", "File Name:")) + self.okButton.setText(_translate("EricServerFileDialog", "Open")) + self.filterLabel.setText(_translate("EricServerFileDialog", "Files of Type:")) + self.cancelButton.setText(_translate("EricServerFileDialog", "Cancel"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/RemoteServerInterface/Ui_EricServerProfilesDialog.py Fri Jun 07 11:16:15 2024 +0200 @@ -0,0 +1,64 @@ +# Form implementation generated from reading ui file 'src/eric7/RemoteServerInterface/EricServerProfilesDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_EricServerProfilesDialog(object): + def setupUi(self, EricServerProfilesDialog): + EricServerProfilesDialog.setObjectName("EricServerProfilesDialog") + EricServerProfilesDialog.resize(441, 281) + EricServerProfilesDialog.setSizeGripEnabled(True) + self.gridLayout = QtWidgets.QGridLayout(EricServerProfilesDialog) + self.gridLayout.setObjectName("gridLayout") + self.connectionsList = QtWidgets.QListWidget(parent=EricServerProfilesDialog) + self.connectionsList.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.connectionsList.setAlternatingRowColors(True) + self.connectionsList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) + self.connectionsList.setObjectName("connectionsList") + self.gridLayout.addWidget(self.connectionsList, 0, 0, 1, 1) + self.verticalLayout = QtWidgets.QVBoxLayout() + self.verticalLayout.setObjectName("verticalLayout") + self.addButton = QtWidgets.QPushButton(parent=EricServerProfilesDialog) + self.addButton.setObjectName("addButton") + self.verticalLayout.addWidget(self.addButton) + self.editButton = QtWidgets.QPushButton(parent=EricServerProfilesDialog) + self.editButton.setObjectName("editButton") + self.verticalLayout.addWidget(self.editButton) + self.removeButton = QtWidgets.QPushButton(parent=EricServerProfilesDialog) + self.removeButton.setObjectName("removeButton") + self.verticalLayout.addWidget(self.removeButton) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + self.verticalLayout.addItem(spacerItem) + self.resetButton = QtWidgets.QPushButton(parent=EricServerProfilesDialog) + self.resetButton.setObjectName("resetButton") + self.verticalLayout.addWidget(self.resetButton) + self.gridLayout.addLayout(self.verticalLayout, 0, 1, 1, 1) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=EricServerProfilesDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.gridLayout.addWidget(self.buttonBox, 1, 0, 1, 2) + + self.retranslateUi(EricServerProfilesDialog) + self.buttonBox.accepted.connect(EricServerProfilesDialog.accept) # type: ignore + self.buttonBox.rejected.connect(EricServerProfilesDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(EricServerProfilesDialog) + + def retranslateUi(self, EricServerProfilesDialog): + _translate = QtCore.QCoreApplication.translate + EricServerProfilesDialog.setWindowTitle(_translate("EricServerProfilesDialog", "Manage Server Connections")) + self.connectionsList.setSortingEnabled(True) + self.addButton.setToolTip(_translate("EricServerProfilesDialog", "Press to open a dialog to add a new server connection.")) + self.addButton.setText(_translate("EricServerProfilesDialog", "Add...")) + self.editButton.setToolTip(_translate("EricServerProfilesDialog", "Press to open a dialog to edit the selected server connection.")) + self.editButton.setText(_translate("EricServerProfilesDialog", "Edit...")) + self.removeButton.setToolTip(_translate("EricServerProfilesDialog", "Press to remove the selected server connections.")) + self.removeButton.setText(_translate("EricServerProfilesDialog", "Remove")) + self.resetButton.setToolTip(_translate("EricServerProfilesDialog", "Press to reset all changes performed.")) + self.resetButton.setText(_translate("EricServerProfilesDialog", "Reset"))
--- a/src/eric7/VirtualEnv/Ui_VirtualenvAddEditDialog.py Fri Jun 07 11:13:24 2024 +0200 +++ b/src/eric7/VirtualEnv/Ui_VirtualenvAddEditDialog.py Fri Jun 07 11:16:15 2024 +0200 @@ -12,7 +12,7 @@ class Ui_VirtualenvAddEditDialog(object): def setupUi(self, VirtualenvAddEditDialog): VirtualenvAddEditDialog.setObjectName("VirtualenvAddEditDialog") - VirtualenvAddEditDialog.resize(700, 300) + VirtualenvAddEditDialog.resize(700, 400) VirtualenvAddEditDialog.setSizeGripEnabled(True) self.gridLayout = QtWidgets.QGridLayout(VirtualenvAddEditDialog) self.gridLayout.setObjectName("gridLayout") @@ -23,9 +23,33 @@ self.nameEdit.setClearButtonEnabled(True) self.nameEdit.setObjectName("nameEdit") self.gridLayout.addWidget(self.nameEdit, 0, 1, 1, 1) + self.groupBox = QtWidgets.QGroupBox(parent=VirtualenvAddEditDialog) + self.groupBox.setObjectName("groupBox") + self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.standardRadioButton = QtWidgets.QRadioButton(parent=self.groupBox) + self.standardRadioButton.setChecked(True) + self.standardRadioButton.setObjectName("standardRadioButton") + self.horizontalLayout_2.addWidget(self.standardRadioButton) + self.anacondaRadioButton = QtWidgets.QRadioButton(parent=self.groupBox) + self.anacondaRadioButton.setObjectName("anacondaRadioButton") + self.horizontalLayout_2.addWidget(self.anacondaRadioButton) + self.remoteRadioButton = QtWidgets.QRadioButton(parent=self.groupBox) + self.remoteRadioButton.setObjectName("remoteRadioButton") + self.horizontalLayout_2.addWidget(self.remoteRadioButton) + self.serverRadioButton = QtWidgets.QRadioButton(parent=self.groupBox) + self.serverRadioButton.setObjectName("serverRadioButton") + self.horizontalLayout_2.addWidget(self.serverRadioButton) + self.verticalLayout.addLayout(self.horizontalLayout_2) + self.globalCheckBox = QtWidgets.QCheckBox(parent=self.groupBox) + self.globalCheckBox.setObjectName("globalCheckBox") + self.verticalLayout.addWidget(self.globalCheckBox) + self.gridLayout.addWidget(self.groupBox, 1, 0, 1, 2) self.label_2 = QtWidgets.QLabel(parent=VirtualenvAddEditDialog) self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) + self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) self.targetDirectoryPicker = EricPathPicker(parent=VirtualenvAddEditDialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -34,10 +58,10 @@ self.targetDirectoryPicker.setSizePolicy(sizePolicy) self.targetDirectoryPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.WheelFocus) self.targetDirectoryPicker.setObjectName("targetDirectoryPicker") - self.gridLayout.addWidget(self.targetDirectoryPicker, 1, 1, 1, 1) + self.gridLayout.addWidget(self.targetDirectoryPicker, 2, 1, 1, 1) self.label_3 = QtWidgets.QLabel(parent=VirtualenvAddEditDialog) self.label_3.setObjectName("label_3") - self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1) + self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) self.pythonExecPicker = EricPathPicker(parent=VirtualenvAddEditDialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -46,21 +70,7 @@ self.pythonExecPicker.setSizePolicy(sizePolicy) self.pythonExecPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.WheelFocus) self.pythonExecPicker.setObjectName("pythonExecPicker") - self.gridLayout.addWidget(self.pythonExecPicker, 2, 1, 1, 1) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.globalCheckBox = QtWidgets.QCheckBox(parent=VirtualenvAddEditDialog) - self.globalCheckBox.setObjectName("globalCheckBox") - self.horizontalLayout.addWidget(self.globalCheckBox) - self.anacondaCheckBox = QtWidgets.QCheckBox(parent=VirtualenvAddEditDialog) - self.anacondaCheckBox.setObjectName("anacondaCheckBox") - self.horizontalLayout.addWidget(self.anacondaCheckBox) - self.remoteCheckBox = QtWidgets.QCheckBox(parent=VirtualenvAddEditDialog) - self.remoteCheckBox.setObjectName("remoteCheckBox") - self.horizontalLayout.addWidget(self.remoteCheckBox) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.gridLayout.addLayout(self.horizontalLayout, 3, 0, 1, 2) + self.gridLayout.addWidget(self.pythonExecPicker, 3, 1, 1, 1) self.label_5 = QtWidgets.QLabel(parent=VirtualenvAddEditDialog) self.label_5.setObjectName("label_5") self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1) @@ -75,39 +85,56 @@ self.descriptionEdit = QtWidgets.QPlainTextEdit(parent=VirtualenvAddEditDialog) self.descriptionEdit.setObjectName("descriptionEdit") self.gridLayout.addWidget(self.descriptionEdit, 5, 1, 1, 1) + self.label_6 = QtWidgets.QLabel(parent=VirtualenvAddEditDialog) + self.label_6.setObjectName("label_6") + self.gridLayout.addWidget(self.label_6, 6, 0, 1, 1) + self.serverLineEdit = QtWidgets.QLineEdit(parent=VirtualenvAddEditDialog) + self.serverLineEdit.setReadOnly(True) + self.serverLineEdit.setObjectName("serverLineEdit") + self.gridLayout.addWidget(self.serverLineEdit, 6, 1, 1, 1) self.buttonBox = QtWidgets.QDialogButtonBox(parent=VirtualenvAddEditDialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) self.buttonBox.setObjectName("buttonBox") - self.gridLayout.addWidget(self.buttonBox, 6, 0, 1, 2) + self.gridLayout.addWidget(self.buttonBox, 7, 0, 1, 2) self.retranslateUi(VirtualenvAddEditDialog) self.buttonBox.accepted.connect(VirtualenvAddEditDialog.accept) # type: ignore self.buttonBox.rejected.connect(VirtualenvAddEditDialog.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(VirtualenvAddEditDialog) - VirtualenvAddEditDialog.setTabOrder(self.nameEdit, self.targetDirectoryPicker) + VirtualenvAddEditDialog.setTabOrder(self.nameEdit, self.standardRadioButton) + VirtualenvAddEditDialog.setTabOrder(self.standardRadioButton, self.anacondaRadioButton) + VirtualenvAddEditDialog.setTabOrder(self.anacondaRadioButton, self.remoteRadioButton) + VirtualenvAddEditDialog.setTabOrder(self.remoteRadioButton, self.serverRadioButton) + VirtualenvAddEditDialog.setTabOrder(self.serverRadioButton, self.globalCheckBox) + VirtualenvAddEditDialog.setTabOrder(self.globalCheckBox, self.targetDirectoryPicker) VirtualenvAddEditDialog.setTabOrder(self.targetDirectoryPicker, self.pythonExecPicker) - VirtualenvAddEditDialog.setTabOrder(self.pythonExecPicker, self.globalCheckBox) - VirtualenvAddEditDialog.setTabOrder(self.globalCheckBox, self.anacondaCheckBox) - VirtualenvAddEditDialog.setTabOrder(self.anacondaCheckBox, self.remoteCheckBox) - VirtualenvAddEditDialog.setTabOrder(self.remoteCheckBox, self.execPathEdit) + VirtualenvAddEditDialog.setTabOrder(self.pythonExecPicker, self.execPathEdit) + VirtualenvAddEditDialog.setTabOrder(self.execPathEdit, self.descriptionEdit) def retranslateUi(self, VirtualenvAddEditDialog): _translate = QtCore.QCoreApplication.translate self.label.setText(_translate("VirtualenvAddEditDialog", "Logical Name:")) self.nameEdit.setToolTip(_translate("VirtualenvAddEditDialog", "Enter a unique name for the virtual environment")) - self.label_2.setText(_translate("VirtualenvAddEditDialog", "Directory:")) - self.targetDirectoryPicker.setToolTip(_translate("VirtualenvAddEditDialog", "Enter the directory of the virtual environment")) - self.label_3.setText(_translate("VirtualenvAddEditDialog", "Python Interpreter:")) - self.pythonExecPicker.setToolTip(_translate("VirtualenvAddEditDialog", "Enter the Python interpreter of the virtual environment")) + self.groupBox.setTitle(_translate("VirtualenvAddEditDialog", "Environment Type")) + self.standardRadioButton.setToolTip(_translate("VirtualenvAddEditDialog", "Select to indicate a standard environment")) + self.standardRadioButton.setText(_translate("VirtualenvAddEditDialog", "Standard")) + self.anacondaRadioButton.setToolTip(_translate("VirtualenvAddEditDialog", "Select to indicate an Anaconda environment")) + self.anacondaRadioButton.setText(_translate("VirtualenvAddEditDialog", "Anaconda")) + self.remoteRadioButton.setToolTip(_translate("VirtualenvAddEditDialog", "Select to indicate a remotely (ssh) accessed environment")) + self.remoteRadioButton.setText(_translate("VirtualenvAddEditDialog", "Remote")) + self.serverRadioButton.setToolTip(_translate("VirtualenvAddEditDialog", "Select to indicate an eric IDE server environment.")) + self.serverRadioButton.setText(_translate("VirtualenvAddEditDialog", "eric IDE Server")) self.globalCheckBox.setToolTip(_translate("VirtualenvAddEditDialog", "Select,if this is a global environment (i.e. no virtual environment directory to be given)")) self.globalCheckBox.setWhatsThis(_translate("VirtualenvAddEditDialog", "<b>Global Environment</b>\n" "<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p>")) self.globalCheckBox.setText(_translate("VirtualenvAddEditDialog", "Global Environment")) - self.anacondaCheckBox.setToolTip(_translate("VirtualenvAddEditDialog", "Select, if this is a Conda environment")) - self.anacondaCheckBox.setText(_translate("VirtualenvAddEditDialog", "Conda Environment")) - self.remoteCheckBox.setToolTip(_translate("VirtualenvAddEditDialog", "Select, if this is a remotely accessed environment")) - self.remoteCheckBox.setText(_translate("VirtualenvAddEditDialog", "Remote Environment")) + self.label_2.setText(_translate("VirtualenvAddEditDialog", "Directory:")) + self.targetDirectoryPicker.setToolTip(_translate("VirtualenvAddEditDialog", "Enter the directory of the virtual environment")) + self.label_3.setText(_translate("VirtualenvAddEditDialog", "Python Interpreter:")) + self.pythonExecPicker.setToolTip(_translate("VirtualenvAddEditDialog", "Enter the Python interpreter of the virtual environment")) self.label_5.setText(_translate("VirtualenvAddEditDialog", "PATH Prefix:")) self.label_4.setText(_translate("VirtualenvAddEditDialog", "Description:")) + self.label_6.setText(_translate("VirtualenvAddEditDialog", "Server:")) + self.serverLineEdit.setToolTip(_translate("VirtualenvAddEditDialog", "Shows the host name of the server this entry belongs to (eric IDE Server environment only)")) from eric7.EricWidgets.EricPathPicker import EricPathPicker