diff -r 9858a6c957f5 -r 5bcdef5207f6 eric7/CycloneDXInterface/CycloneDXConfigDialog.ui --- a/eric7/CycloneDXInterface/CycloneDXConfigDialog.ui Sat Jun 04 11:56:48 2022 +0200 +++ b/eric7/CycloneDXInterface/CycloneDXConfigDialog.ui Sat Jun 04 15:53:41 2022 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>650</width> - <height>278</height> + <height>308</height> </rect> </property> <property name="windowTitle"> @@ -99,14 +99,21 @@ <string>SBOM Output</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> <string>File Format:</string> </property> </widget> </item> - <item row="0" column="1"> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Schema Version:</string> + </property> + </widget> + </item> + <item row="1" column="1"> <widget class="QComboBox" name="fileFormatComboBox"> <property name="toolTip"> <string>Select the format of the SBOM file</string> @@ -123,7 +130,14 @@ </item> </widget> </item> - <item row="0" column="2"> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>File Name:</string> + </property> + </widget> + </item> + <item row="1" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -136,34 +150,33 @@ </property> </spacer> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Schema Version:</string> + <item row="3" column="1" colspan="2"> + <widget class="EricPathPicker" name="filePicker" native="true"> + <property name="focusPolicy"> + <enum>Qt::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="1" column="1"> + <item row="2" 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="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>File Name:</string> + <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> - </widget> - </item> - <item row="2" column="1" colspan="2"> - <widget class="EricPathPicker" name="filePicker" native="true"> - <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> + <property name="text"> + <string>Include Vulnerability Information</string> </property> - <property name="toolTip"> - <string>Enter the file path for the SBOM file (leave empty for default)</string> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> @@ -190,6 +203,16 @@ <container>1</container> </customwidget> </customwidgets> + <tabstops> + <tabstop>environmentButton</tabstop> + <tabstop>pipenvButton</tabstop> + <tabstop>poetryButton</tabstop> + <tabstop>requirementsButton</tabstop> + <tabstop>vulnerabilityCheckBox</tabstop> + <tabstop>fileFormatComboBox</tabstop> + <tabstop>schemaVersionComboBox</tabstop> + <tabstop>filePicker</tabstop> + </tabstops> <resources/> <connections> <connection>