author | zecke <zecke> | 2002-06-16 16:55:40 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-16 16:55:40 (UTC) |
commit | f63c4f952daeeda9787b8b700a9d50f20cdff88c (patch) (side-by-side diff) | |
tree | fee143b48834b24ab56f7373571c8ef94f6314f3 /core/pim/todo | |
parent | 98f3588c957217c720779945a02bc01a164bfaa5 (diff) | |
download | opie-f63c4f952daeeda9787b8b700a9d50f20cdff88c.zip opie-f63c4f952daeeda9787b8b700a9d50f20cdff88c.tar.gz opie-f63c4f952daeeda9787b8b700a9d50f20cdff88c.tar.bz2 |
I dunno
-rw-r--r-- | core/pim/todo/todoentry.ui | 193 | ||||
-rw-r--r-- | core/pim/todo/todoentryimpl.cpp | 9 | ||||
-rw-r--r-- | core/pim/todo/todoentryimpl.h | 2 |
3 files changed, 128 insertions, 76 deletions
diff --git a/core/pim/todo/todoentry.ui b/core/pim/todo/todoentry.ui index 5da4bb7..9ffa89b 100644 --- a/core/pim/todo/todoentry.ui +++ b/core/pim/todo/todoentry.ui @@ -30,7 +30,7 @@ <rect> <x>0</x> <y>0</y> - <width>429</width> + <width>425</width> <height>321</height> </rect> </property> @@ -48,13 +48,13 @@ <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout22</cstring> + <cstring>Layout31</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> - <x>0</x> - <y>5</y> + <x>1</x> + <y>6</y> <width>240</width> <height>310</height> </rect> @@ -68,11 +68,11 @@ <name>spacing</name> <number>6</number> </property> - <widget row="3" column="0" > + <widget row="2" column="0" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout18</cstring> + <cstring>Layout19</cstring> </property> <hbox> <property stdset="1"> @@ -87,38 +87,70 @@ <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel3</cstring> - </property> - <property stdset="1"> - <name>frameShape</name> - <enum>NoFrame</enum> + <cstring>txtProg</cstring> </property> <property stdset="1"> <name>text</name> - <string>Category:</string> + <string>Progress:</string> </property> </widget> <widget> - <class>CategorySelect</class> + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>0%</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>20%</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>40%</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>60%</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>80%</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>100%</string> + </property> + </item> <property stdset="1"> <name>name</name> - <cstring>comboCategory</cstring> + <cstring>cmbProg</cstring> </property> <property stdset="1"> - <name>minimumSize</name> + <name>maximumSize</name> <size> - <width>60</width> - <height>0</height> + <width>45</width> + <height>32767</height> </size> </property> </widget> </hbox> </widget> - <widget row="4" column="0" > + <widget row="3" column="0" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout4</cstring> + <cstring>Layout18</cstring> </property> <hbox> <property stdset="1"> @@ -133,18 +165,29 @@ <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel1</cstring> + <cstring>TextLabel3</cstring> + </property> + <property stdset="1"> + <name>frameShape</name> + <enum>NoFrame</enum> </property> <property stdset="1"> <name>text</name> - <string>Summary:</string> + <string>Category:</string> </property> </widget> <widget> - <class>QLineEdit</class> + <class>CategorySelect</class> <property stdset="1"> <name>name</name> - <cstring>lneSum</cstring> + <cstring>comboCategory</cstring> + </property> + <property stdset="1"> + <name>minimumSize</name> + <size> + <width>60</width> + <height>0</height> + </size> </property> </widget> </hbox> @@ -225,6 +268,13 @@ </widget> </hbox> </widget> + <widget row="5" column="0" > + <class>QMultiLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>txtTodo</cstring> + </property> + </widget> <widget row="1" column="0" > <class>QLayoutWidget</class> <property stdset="1"> @@ -279,11 +329,11 @@ </widget> </hbox> </widget> - <widget row="2" column="0" > + <widget row="4" column="0" > <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout19</cstring> + <cstring>Layout30</cstring> </property> <hbox> <property stdset="1"> @@ -298,72 +348,43 @@ <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>txtProg</cstring> + <cstring>TextLabel1</cstring> </property> <property stdset="1"> <name>text</name> - <string>Progress:</string> + <string>Summary:</string> </property> </widget> <widget> - <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>0%</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>20%</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>40%</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>60%</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>80%</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>100%</string> - </property> - </item> + <class>QLineEdit</class> <property stdset="1"> <name>name</name> - <cstring>cmbProg</cstring> + <cstring>lneSum</cstring> + </property> + </widget> + <widget> + <class>OClickableLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>lblDown</cstring> + </property> + <property stdset="1"> + <name>minimumSize</name> + <size> + <width>20</width> + <height>20</height> + </size> </property> <property stdset="1"> <name>maximumSize</name> <size> - <width>45</width> - <height>32767</height> + <width>20</width> + <height>20</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> @@ -382,6 +403,23 @@ </sizepolicy> <pixmap>image0</pixmap> </customwidget> + <customwidget> + <class>OClickableLabel</class> + <header location="global">opie/oclickablelabel.h</header> + <sizehint> + <width>-1</width> + <height>-1</height> + </sizehint> + <container>0</container> + <sizepolicy> + <hordata>5</hordata> + <verdata>5</verdata> + </sizepolicy> + <pixmap>image0</pixmap> + <signal>clicked()</signal> + <signal>toggled(bool)</signal> + <slot access="public">slotOn(bool)</slot> + </customwidget> </customwidgets> <images> <image> @@ -396,7 +434,14 @@ <receiver>buttonDate</receiver> <slot>setEnabled(bool)</slot> </connection> + <connection> + <sender>lblDown</sender> + <signal>clicked()</signal> + <receiver>NewTaskDialogBase</receiver> + <slot>slotCopy()</slot> + </connection> <slot access="protected">dateChanged( const QString & )</slot> <slot access="protected">dateChanged( int, int, int )</slot> + <slot access="protected">slotCopy()</slot> </connections> </UI> diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp index f8e2f4d..dd01130 100644 --- a/core/pim/todo/todoentryimpl.cpp +++ b/core/pim/todo/todoentryimpl.cpp @@ -21,12 +21,14 @@ #include "todoentryimpl.h" +#include <opie/oclickablelabel.h> #include <opie/todoevent.h> #include <opie/tododb.h> #include <qpe/categoryselect.h> #include <qpe/datebookmonth.h> #include <qpe/global.h> +#include <qpe/resource.h> #include <qpe/imageedit.h> #include <qpe/timestring.h> #include <qpe/palmtoprecord.h> @@ -99,6 +101,7 @@ void NewTaskDialog::init() buttonDate->setText( TimeString::longDateString( date ) ); picker->setDate( date.year(), date.month(), date.day() ); + lblDown->setPixmap(Resource::loadPixmap("down") ); } /* @@ -140,7 +143,11 @@ ToDoEvent NewTaskDialog::todoEntry() todo.setProgress( text.remove( text.length()-1, 1 ).toUShort() ); return todo; } - +void NewTaskDialog::slotCopy() +{ + txtTodo->clear(); + txtTodo->setText( lneSum->text() ); +} /*! diff --git a/core/pim/todo/todoentryimpl.h b/core/pim/todo/todoentryimpl.h index 6407eb4..49d1274 100644 --- a/core/pim/todo/todoentryimpl.h +++ b/core/pim/todo/todoentryimpl.h @@ -47,7 +47,7 @@ public: protected slots: void dateChanged( int y, int m, int d ); - + void slotCopy(); protected: virtual void accept(); |