Mercurial Repositories > eric / file diff

--- 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