diff -r 7015247cbb05 -r 17d03699f151 eric6/Tasks/TaskPropertiesDialog.ui --- a/eric6/Tasks/TaskPropertiesDialog.ui Sun May 02 10:59:00 2021 +0200 +++ b/eric6/Tasks/TaskPropertiesDialog.ui Sun May 02 15:09:14 2021 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>579</width> - <height>297</height> + <width>600</width> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -16,7 +16,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout"> + <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> @@ -27,7 +27,7 @@ </property> </widget> </item> - <item row="0" column="1" colspan="3"> + <item row="0" column="1"> <widget class="QLineEdit" name="summaryEdit"> <property name="toolTip"> <string>Enter the task summary</string> @@ -35,7 +35,7 @@ </widget> </item> <item row="1" column="0"> - <widget class="QLabel" name="textLabel1"> + <widget class="QLabel" name="descriptionLabel"> <property name="text"> <string>&Description:</string> </property> @@ -47,66 +47,129 @@ </property> </widget> </item> - <item row="1" column="1" colspan="3"> + <item row="1" column="1"> <widget class="QTextEdit" name="descriptionEdit"> <property name="toolTip"> <string>Enter the task description</string> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="textLabel2"> - <property name="text"> - <string>Creation Time:</string> + <item row="2" column="0" colspan="2"> + <widget class="QFrame" name="manualTaskFrame"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - </widget> - </item> - <item row="2" column="1" colspan="3"> - <widget class="QLabel" name="creationLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="textLabel4"> - <property name="text"> - <string>&Priority:</string> - </property> - <property name="buddy"> - <cstring>priorityCombo</cstring> - </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="textLabel2"> + <property name="text"> + <string>Creation Time:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="creationLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="textLabel4"> + <property name="text"> + <string>&Priority:</string> + </property> + <property name="buddy"> + <cstring>priorityCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="priorityCombo"> + <property name="toolTip"> + <string>Select the task priority</string> + </property> + <property name="currentIndex"> + <number>1</number> + </property> + <item> + <property name="text"> + <string>High</string> + </property> + </item> + <item> + <property name="text"> + <string>Normal</string> + </property> + </item> + <item> + <property name="text"> + <string>Low</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Type:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="typeCombo"> + <property name="toolTip"> + <string>Select the task type</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <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> + <widget class="QCheckBox" name="completedCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select to mark this task as completed</string> + </property> + <property name="text"> + <string>T&ask completed</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="3" column="1"> - <widget class="QComboBox" name="priorityCombo"> - <property name="toolTip"> - <string>Select the task priority</string> - </property> - <property name="currentIndex"> - <number>1</number> - </property> - <item> - <property name="text"> - <string>High</string> - </property> - </item> - <item> - <property name="text"> - <string>Normal</string> - </property> - </item> - <item> - <property name="text"> - <string>Low</string> - </property> - </item> - </widget> - </item> - <item row="3" column="2"> + <item row="3" column="0" colspan="2"> <widget class="QCheckBox" name="projectCheckBox"> <property name="toolTip"> <string>Select to indicate a task related to the current project</string> @@ -116,57 +179,65 @@ </property> </widget> </item> - <item row="3" column="3"> - <widget class="QCheckBox" name="completedCheckBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item row="4" column="0" colspan="2"> + <widget class="QFrame" name="fileTaskFrame"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <property name="toolTip"> - <string>Select to mark this task as completed</string> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - <property name="text"> - <string>T&ask completed</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="textLabel5"> - <property name="text"> - <string>Filename:</string> - </property> + <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item row="1" column="1"> + <widget class="QLineEdit" name="linenoEdit"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="linenoLabel"> + <property name="text"> + <string>Line:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="filenameLabel"> + <property name="text"> + <string>Filename:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="filenameEdit"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="4" column="1" colspan="3"> - <widget class="QLineEdit" name="filenameEdit"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="textLabel6"> - <property name="text"> - <string>Line:</string> - </property> - </widget> - </item> - <item row="5" column="1" colspan="3"> - <widget class="QLineEdit" name="linenoEdit"> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="6" column="0" colspan="4"> + <item row="5" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -183,9 +254,9 @@ <tabstop>summaryEdit</tabstop> <tabstop>descriptionEdit</tabstop> <tabstop>priorityCombo</tabstop> - <tabstop>projectCheckBox</tabstop> + <tabstop>typeCombo</tabstop> <tabstop>completedCheckBox</tabstop> - <tabstop>buttonBox</tabstop> + <tabstop>projectCheckBox</tabstop> </tabstops> <resources/> <connections>