diff -r a2529214787a -r dc23e5ac706a src/eric7/CycloneDXInterface/CycloneDXConfigDialog.ui
--- a/src/eric7/CycloneDXInterface/CycloneDXConfigDialog.ui Sat May 10 18:39:45 2025 +0200
+++ b/src/eric7/CycloneDXInterface/CycloneDXConfigDialog.ui Tue May 13 15:58:12 2025 +0200
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>650</width>
- <height>368</height>
+ <height>330</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,7 +16,7 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
@@ -46,49 +46,111 @@
<property name="title">
<string>Input</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QRadioButton" name="environmentButton">
- <property name="toolTip">
- <string>Select to build SBOM from environment</string>
- </property>
- <property name="text">
- <string>Environment</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QRadioButton" name="environmentButton">
+ <property name="toolTip">
+ <string>Select to build SBOM from environment</string>
+ </property>
+ <property name="text">
+ <string>Environment</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="pipenvButton">
+ <property name="toolTip">
+ <string>Select to build SBOM from 'Pipfile.lock' file</string>
+ </property>
+ <property name="text">
+ <string>PipEnv</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="poetryButton">
+ <property name="toolTip">
+ <string>Select to build SBOM from 'poetry.lock' file</string>
+ </property>
+ <property name="text">
+ <string>Poetry</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="requirementsButton">
+ <property name="toolTip">
+ <string>Select to build SBOM from 'requirements.txt' file</string>
+ </property>
+ <property name="text">
+ <string>Requirements</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QRadioButton" name="pipenvButton">
- <property name="toolTip">
- <string>Select to build SBOM from 'Pipfile.lock' file</string>
- </property>
- <property name="text">
- <string>PipEnv</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="pyprojectLabel">
+ <property name="text">
+ <string>pyproject.toml File:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="EricPathPicker" name="pyprojectFilePicker" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::FocusPolicy::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enter the file path for the SBOM file (leave empty for default)</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QRadioButton" name="poetryButton">
- <property name="toolTip">
- <string>Select to build SBOM from 'poetry.lock' file</string>
- </property>
- <property name="text">
- <string>Poetry</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="requirementsButton">
- <property name="toolTip">
- <string>Select to build SBOM from 'requirements.txt' file</string>
- </property>
- <property name="text">
- <string>Requirements</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Main Component Type:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="mainComponentTypeComboBox">
+ <property name="toolTip">
+ <string>Select the type of the main component</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -99,7 +161,44 @@
<string>SBOM Output</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="2" column="1">
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>413</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>File Name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Spec Version:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="EricPathPicker" name="outputFilePicker" native="true">
+ <property name="focusPolicy">
+ <enum>Qt::FocusPolicy::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enter the file path for the SBOM file (leave empty for default)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
<widget class="QComboBox" name="fileFormatComboBox">
<property name="toolTip">
<string>Select the format of the SBOM file</string>
@@ -116,90 +215,17 @@
</item>
</widget>
</item>
- <item row="0" column="0" colspan="3">
- <widget class="QCheckBox" name="vulnerabilityCheckBox">
- <property name="toolTip">
- <string>Select to include vulnerability data in the generated SBOM (requires Schema 1.4 or newer)</string>
- </property>
- <property name="text">
- <string>Include Vulnerability Information</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="3">
- <widget class="QCheckBox" name="dependenciesCheckBox">
- <property name="toolTip">
- <string>Select to include dependency information in the generated SBOM</string>
- </property>
- <property name="text">
- <string>Include Dependencies</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
+ <item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>File Format:</string>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QComboBox" name="schemaVersionComboBox">
- <property name="toolTip">
- <string>Select the SBOM schema version of the SBOM file</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>413</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="5" column="1" colspan="2">
- <widget class="EricPathPicker" name="filePicker" native="true">
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="specVersionComboBox">
<property name="toolTip">
- <string>Enter the file path for the SBOM file (leave empty for default)</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>File Name:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Schema Version:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="3">
- <widget class="QCheckBox" name="readableCheckBox">
- <property name="toolTip">
- <string>Select to generate non-compact, readable output</string>
- </property>
- <property name="text">
- <string>Generate Readable Output</string>
+ <string>Select the SBOM spec version of the SBOM file</string>
</property>
</widget>
</item>
@@ -209,10 +235,10 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
@@ -231,12 +257,11 @@
<tabstop>pipenvButton</tabstop>
<tabstop>poetryButton</tabstop>
<tabstop>requirementsButton</tabstop>
- <tabstop>vulnerabilityCheckBox</tabstop>
- <tabstop>dependenciesCheckBox</tabstop>
+ <tabstop>pyprojectFilePicker</tabstop>
+ <tabstop>mainComponentTypeComboBox</tabstop>
<tabstop>fileFormatComboBox</tabstop>
- <tabstop>schemaVersionComboBox</tabstop>
- <tabstop>readableCheckBox</tabstop>
- <tabstop>filePicker</tabstop>
+ <tabstop>specVersionComboBox</tabstop>
+ <tabstop>outputFilePicker</tabstop>
</tabstops>
<resources/>
<connections>
