author | zecke <zecke> | 2002-06-16 16:34:50 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-16 16:34:50 (UTC) |
commit | 98f3588c957217c720779945a02bc01a164bfaa5 (patch) (side-by-side diff) | |
tree | fcf86a620f334d9354bd39cf2b436c5372de6d53 /core/pim | |
parent | 3b8192d0f5a41c40092af48df8abc39aa3d1c355 (diff) | |
download | opie-98f3588c957217c720779945a02bc01a164bfaa5.zip opie-98f3588c957217c720779945a02bc01a164bfaa5.tar.gz opie-98f3588c957217c720779945a02bc01a164bfaa5.tar.bz2 |
Progress
-rw-r--r-- | core/pim/todo/todoentry.ui | 226 | ||||
-rw-r--r-- | core/pim/todo/todoentryimpl.cpp | 4 |
2 files changed, 154 insertions, 76 deletions
diff --git a/core/pim/todo/todoentry.ui b/core/pim/todo/todoentry.ui index 87ee68c..5da4bb7 100644 --- a/core/pim/todo/todoentry.ui +++ b/core/pim/todo/todoentry.ui @@ -27,13 +27,13 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>245</width> + <width>429</width> <height>321</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>New Task</string> @@ -45,81 +45,79 @@ <name>layoutSpacing</name> </property> <widget> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout3</cstring> + <cstring>Layout22</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> - <x>1</x> - <y>25</y> - <width>243</width> - <height>17</height> + <x>0</x> + <y>5</y> + <width>240</width> + <height>310</height> </rect> </property> - <hbox> + <grid> <property stdset="1"> <name>margin</name> <number>0</number> </property> <property stdset="1"> <name>spacing</name> <number>6</number> </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel3</cstring> - </property> - <property stdset="1"> - <name>frameShape</name> - <enum>NoFrame</enum> - </property> - <property stdset="1"> - <name>text</name> - <string>Category:</string> - </property> - </widget> - <widget> - <class>CategorySelect</class> + <widget row="3" column="0" > + <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>comboCategory</cstring> + <cstring>Layout18</cstring> </property> + <hbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel3</cstring> + </property> + <property stdset="1"> + <name>frameShape</name> + <enum>NoFrame</enum> + </property> + <property stdset="1"> + <name>text</name> + <string>Category:</string> + </property> + </widget> + <widget> + <class>CategorySelect</class> + <property stdset="1"> + <name>name</name> + <cstring>comboCategory</cstring> + </property> + <property stdset="1"> + <name>minimumSize</name> + <size> + <width>60</width> + <height>0</height> + </size> + </property> + </widget> + </hbox> </widget> - </hbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout6</cstring> - </property> - <property stdset="1"> - <name>geometry</name> - <rect> - <x>0</x> - <y>0</y> - <width>240</width> - <height>320</height> - </rect> - </property> - <grid> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget row="2" column="0" > + <widget row="4" column="0" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout4</cstring> </property> <hbox> @@ -148,24 +146,93 @@ <name>name</name> <cstring>lneSum</cstring> </property> </widget> </hbox> </widget> - <widget row="3" column="0" > - <class>QMultiLineEdit</class> + <widget row="0" column="0" > + <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>txtTodo</cstring> + <cstring>Layout20</cstring> </property> + <hbox> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Priority:</string> + </property> + </widget> + <widget> + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>1 - Very High</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>2 - High</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>3 - Normal</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>4 - Low</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>5 - Very Low</string> + </property> + </item> + <property stdset="1"> + <name>name</name> + <cstring>comboPriority</cstring> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> + <name>currentItem</name> + <number>2</number> + </property> + </widget> + </hbox> </widget> <widget row="1" column="0" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout4</cstring> + <cstring>Layout21</cstring> </property> <hbox> <property stdset="1"> <name>margin</name> <number>0</number> </property> @@ -209,17 +276,17 @@ <name>text</name> <string>1 Jan 2001</string> </property> </widget> </hbox> </widget> - <widget row="0" column="0" > + <widget row="2" column="0" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout4</cstring> + <cstring>Layout19</cstring> </property> <hbox> <property stdset="1"> <name>margin</name> <number>0</number> </property> @@ -228,69 +295,78 @@ <number>6</number> </property> <widget> <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel2</cstring> + <cstring>txtProg</cstring> </property> <property stdset="1"> <name>text</name> - <string>Priority:</string> + <string>Progress:</string> </property> </widget> <widget> <class>QComboBox</class> <item> <property> <name>text</name> - <string>1 - Very High</string> + <string>0%</string> </property> </item> <item> <property> <name>text</name> - <string>2 - High</string> + <string>20%</string> </property> </item> <item> <property> <name>text</name> - <string>3 - Normal</string> + <string>40%</string> </property> </item> <item> <property> <name>text</name> - <string>4 - Low</string> + <string>60%</string> </property> </item> <item> <property> <name>text</name> - <string>5 - Very Low</string> + <string>80%</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>100%</string> </property> </item> <property stdset="1"> <name>name</name> - <cstring>comboPriority</cstring> + <cstring>cmbProg</cstring> </property> <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>currentItem</name> - <number>2</number> + <name>maximumSize</name> + <size> + <width>45</width> + <height>32767</height> + </size> </property> </widget> </hbox> </widget> + <widget row="5" column="0" > + <class>QMultiLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>txtTodo</cstring> + </property> + </widget> </grid> </widget> </widget> <customwidgets> <customwidget> <class>CategorySelect</class> diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp index dfaf9b4..f8e2f4d 100644 --- a/core/pim/todo/todoentryimpl.cpp +++ b/core/pim/todo/todoentryimpl.cpp @@ -60,12 +60,13 @@ NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, checkCompleted->setChecked( task.isCompleted() ); checkDate->setChecked( task.hasDate() ); buttonDate->setText( TimeString::longDateString( date ) ); txtTodo->setText( task.description() ); lneSum->setText( task.summary() ); + cmbProg->setCurrentItem( task.progress()/20 ); } /* * Constructs a NewTaskDialog which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * @@ -132,13 +133,14 @@ ToDoEvent NewTaskDialog::todoEntry() } todo.setPriority( comboPriority->currentItem() + 1 ); todo.setCompleted( checkCompleted->isChecked() ); todo.setDescription( txtTodo->text() ); todo.setSummary( lneSum->text() ); - + QString text = cmbProg->currentText(); + todo.setProgress( text.remove( text.length()-1, 1 ).toUShort() ); return todo; } /*! |