diff -r 831e08e94960 -r 2f1ccadee231 eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.ui
--- a/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.ui Sat Jul 02 17:22:06 2022 +0200
+++ b/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.ui Sat Jul 02 18:53:56 2022 +0200
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>700</width>
+ <width>750</width>
<height>550</height>
</rect>
</property>
@@ -55,19 +55,6 @@
</property>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</item>
<item>
@@ -100,7 +87,7 @@
<item>
<widget class="QTabWidget" name="dataTabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>8</number>
</property>
<widget class="QWidget" name="basicTab">
<attribute name="title">
@@ -114,7 +101,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="0" column="2">
<widget class="QLineEdit" name="nameEdit">
<property name="toolTip">
<string>Enter the package name</string>
@@ -134,7 +121,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="1" column="2">
<widget class="QLineEdit" name="versionEdit">
<property name="toolTip">
<string>Enter the version number in the form 'major.minor[.patch[.sub]]'</string>
@@ -154,7 +141,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="2" column="2">
<widget class="QLineEdit" name="authorEdit">
<property name="toolTip">
<string>Enter the author's name</string>
@@ -174,7 +161,7 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="3" column="2">
<widget class="QLineEdit" name="authorEmailEdit">
<property name="toolTip">
<string>Enter the author's email address</string>
@@ -197,7 +184,7 @@
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="4" column="2">
<widget class="QLineEdit" name="maintainerEdit">
<property name="toolTip">
<string>Enter the maintainer's name</string>
@@ -217,7 +204,7 @@
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="5" column="2">
<widget class="QLineEdit" name="maintainerEmailEdit">
<property name="toolTip">
<string>Enter the maintainer's email address</string>
@@ -230,7 +217,24 @@
</property>
</widget>
</item>
- <item row="6" column="1">
+ <item row="6" column="0" colspan="2">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Python Version:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
+ <widget class="QLineEdit" name="pyVersionEdit">
+ <property name="toolTip">
+ <string>Enter the Python version specifier</string>
+ </property>
+ <property name="maxLength">
+ <number>200</number>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -267,41 +271,61 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Description:</string>
+ <item row="1" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Description</string>
</property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="EricSpellCheckedPlainTextEdit" name="descriptionEdit">
+ <property name="toolTip">
+ <string>Enter the description of the package or files (one per line) to get it from.</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="descriptionFromFilesCheckBox">
+ <property name="toolTip">
+ <string>Select to get the description from files</string>
+ </property>
+ <property name="text">
+ <string>Get description from files</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="label_19">
+ <property name="text">
+ <string>Content Type:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="descriptionContentTypeComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
- <item row="1" column="1">
- <widget class="EricSpellCheckedPlainTextEdit" name="descriptionEdit">
- <property name="toolTip">
- <string>Enter the description of the package or files (one per line) to get it from.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QCheckBox" name="descriptionFromFilesCheckBox">
- <property name="toolTip">
- <string>Select to get the description from files</string>
- </property>
- <property name="text">
- <string>Get description from files</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Keywords:</string>
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="2" column="1">
<widget class="QLineEdit" name="keywordsEdit">
<property name="toolTip">
<string>Enter the keywords separated by comma</string>
@@ -322,19 +346,6 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>339</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="0" column="1">
<widget class="QLineEdit" name="homePageUrlEdit">
<property name="toolTip">
@@ -345,6 +356,112 @@
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>Download URL:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="downloadUrlEdit">
+ <property name="toolTip">
+ <string>Enter the download URL</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Project URLs:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QTreeWidget" name="projectUrlsList">
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>URL</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="urlDeleteButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Press to delete the selected URLs</string>
+ </property>
+ <property name="text">
+ <string>Delete</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="urlAddButton">
+ <property name="toolTip">
+ <string>Press to open a dialog to add a project URL</string>
+ </property>
+ <property name="text">
+ <string>Add...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="urlEditButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Press to open a dialog to edit the selected project URL</string>
+ </property>
+ <property name="text">
+ <string>Edit...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="licenseTab">
@@ -565,7 +682,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab">
+ <widget class="QWidget" name="modulesTab">
<attribute name="title">
<string>Modules</string>
</attribute>
@@ -625,28 +742,49 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="scriptsTab">
+ <widget class="QWidget" name="entryPointsTab">
<attribute name="title">
- <string>Scripts</string>
+ <string>Entry Points</string>
</attribute>
- <layout class="QVBoxLayout" name="verticalLayout_6">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
- <widget class="QListWidget" name="scriptsList">
+ <widget class="QTreeWidget" name="entryPointsList">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
+ <column>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Script Function</string>
+ </property>
+ </column>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
- <widget class="QPushButton" name="deleteScriptButton">
+ <widget class="QPushButton" name="deleteEntryPointButton">
<property name="enabled">
<bool>false</bool>
</property>
@@ -659,9 +797,9 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="addScriptButton">
+ <widget class="QPushButton" name="addEntryPointButton">
<property name="toolTip">
- <string>Add script files via a files selection dialog</string>
+ <string>Press to open a dialog to add an entry point</string>
</property>
<property name="text">
<string>Add...</string>
@@ -669,6 +807,19 @@
</widget>
</item>
<item>
+ <widget class="QPushButton" name="editEntryPointButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Press to open a dialog to edit the selected entry point</string>
+ </property>
+ <property name="text">
+ <string>Edit...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -751,11 +902,18 @@
<tabstop>authorEmailEdit</tabstop>
<tabstop>maintainerEdit</tabstop>
<tabstop>maintainerEmailEdit</tabstop>
+ <tabstop>pyVersionEdit</tabstop>
<tabstop>summaryEdit</tabstop>
<tabstop>descriptionEdit</tabstop>
<tabstop>descriptionFromFilesCheckBox</tabstop>
+ <tabstop>descriptionContentTypeComboBox</tabstop>
<tabstop>keywordsEdit</tabstop>
<tabstop>homePageUrlEdit</tabstop>
+ <tabstop>downloadUrlEdit</tabstop>
+ <tabstop>projectUrlsList</tabstop>
+ <tabstop>urlDeleteButton</tabstop>
+ <tabstop>urlAddButton</tabstop>
+ <tabstop>urlEditButton</tabstop>
<tabstop>licenseClassifierCheckBox</tabstop>
<tabstop>licenseClassifierComboBox</tabstop>
<tabstop>licenseEdit</tabstop>
@@ -764,16 +922,17 @@
<tabstop>classifiersList</tabstop>
<tabstop>sourceDirectoryPicker</tabstop>
<tabstop>excludePatternList</tabstop>
+ <tabstop>deleteExcludePatternButton</tabstop>
<tabstop>excludePatternEdit</tabstop>
<tabstop>addExludePatternButton</tabstop>
- <tabstop>deleteExcludePatternButton</tabstop>
<tabstop>includePackageDataCheckBox</tabstop>
<tabstop>modulesList</tabstop>
<tabstop>deleteModuleButton</tabstop>
<tabstop>addModuleButton</tabstop>
- <tabstop>scriptsList</tabstop>
- <tabstop>deleteScriptButton</tabstop>
- <tabstop>addScriptButton</tabstop>
+ <tabstop>entryPointsList</tabstop>
+ <tabstop>deleteEntryPointButton</tabstop>
+ <tabstop>addEntryPointButton</tabstop>
+ <tabstop>editEntryPointButton</tabstop>
<tabstop>projectButton</tabstop>
</tabstops>
<resources/>
@@ -785,8 +944,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>236</x>
- <y>540</y>
+ <x>663</x>
+ <y>539</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@@ -801,8 +960,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>304</x>
- <y>540</y>
+ <x>689</x>
+ <y>539</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
@@ -817,12 +976,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>99</x>
- <y>91</y>
+ <x>110</x>
+ <y>129</y>
</hint>
<hint type="destinationlabel">
- <x>110</x>
- <y>133</y>
+ <x>121</x>
+ <y>161</y>
</hint>
</hints>
</connection>
@@ -837,8 +996,8 @@
<y>107</y>
</hint>
<hint type="destinationlabel">
- <x>192</x>
- <y>141</y>
+ <x>203</x>
+ <y>193</y>
</hint>
</hints>
</connection>
