I dunno

3 files changed, 127 insertions, 75 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
@@ -32,3 +32,3 @@
             <y>0</y>
-            <width>429</width>
+            <width>425</width>
             <height>321</height>
@@ -50,3 +50,3 @@
             <name>name</name>
-            <cstring>Layout22</cstring>
+            <cstring>Layout31</cstring>
         </property>
@@ -55,4 +55,4 @@
             <rect>
-                <x>0</x>
-                <y>5</y>
+                <x>1</x>
+                <y>6</y>
                 <width>240</width>
@@ -70,3 +70,3 @@
             </property>
-            <widget row="3"  column="0" >
+            <widget row="2"  column="0" >
                 <class>QLayoutWidget</class>
@@ -74,3 +74,3 @@
                     <name>name</name>
-                    <cstring>Layout18</cstring>
+                    <cstring>Layout19</cstring>
                 </property>
@@ -89,7 +89,3 @@
                             <name>name</name>
-                            <cstring>TextLabel3</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>frameShape</name>
-                            <enum>NoFrame</enum>
+                            <cstring>txtProg</cstring>
                         </property>
@@ -97,3 +93,3 @@
                             <name>text</name>
-                            <string>Category:</string>
+                            <string>Progress:</string>
                         </property>
@@ -101,12 +97,48 @@
                     <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>
@@ -116,3 +148,3 @@
             </widget>
-            <widget row="4"  column="0" >
+            <widget row="3"  column="0" >
                 <class>QLayoutWidget</class>
@@ -120,3 +152,3 @@
                     <name>name</name>
-                    <cstring>Layout4</cstring>
+                    <cstring>Layout18</cstring>
                 </property>
@@ -135,3 +167,7 @@
                             <name>name</name>
-                            <cstring>TextLabel1</cstring>
+                            <cstring>TextLabel3</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>frameShape</name>
+                            <enum>NoFrame</enum>
                         </property>
@@ -139,3 +175,3 @@
                             <name>text</name>
-                            <string>Summary:</string>
+                            <string>Category:</string>
                         </property>
@@ -143,6 +179,13 @@
                     <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>
@@ -227,2 +270,9 @@
             </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" >
@@ -281,3 +331,3 @@
             </widget>
-            <widget row="2"  column="0" >
+            <widget row="4"  column="0" >
                 <class>QLayoutWidget</class>
@@ -285,3 +335,3 @@
                     <name>name</name>
-                    <cstring>Layout19</cstring>
+                    <cstring>Layout30</cstring>
                 </property>
@@ -300,3 +350,3 @@
                             <name>name</name>
-                            <cstring>txtProg</cstring>
+                            <cstring>TextLabel1</cstring>
                         </property>
@@ -304,3 +354,3 @@
                             <name>text</name>
-                            <string>Progress:</string>
+                            <string>Summary:</string>
                         </property>
@@ -308,42 +358,20 @@
                     <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>
+                        <class>QLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>lneSum</cstring>
                             </property>
-                        </item>
+                    </widget>
+                    <widget>
+                        <class>OClickableLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>cmbProg</cstring>
+                            <cstring>lblDown</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>minimumSize</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
                         </property>
@@ -352,4 +380,4 @@
                             <size>
-                                <width>45</width>
-                                <height>32767</height>
+                                <width>20</width>
+                                <height>20</height>
                             </size>
@@ -359,9 +387,2 @@
             </widget>
-            <widget row="5"  column="0" >
-                <class>QMultiLineEdit</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>txtTodo</cstring>
-                </property>
-            </widget>
         </grid>
@@ -384,2 +405,19 @@
     </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>
@@ -398,4 +436,11 @@
     </connection>
+    <connection>
+        <sender>lblDown</sender>
+        <signal>clicked()</signal>
+        <receiver>NewTaskDialogBase</receiver>
+        <slot>slotCopy()</slot>
+    </connection>
     <slot access="protected">dateChanged( const QString &amp; )</slot>
     <slot access="protected">dateChanged( int, int, int )</slot>
+    <slot access="protected">slotCopy()</slot>
 </connections>
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
@@ -23,2 +23,3 @@
 
+#include <opie/oclickablelabel.h>
 #include <opie/todoevent.h>
@@ -29,2 +30,3 @@
 #include <qpe/global.h>
+#include <qpe/resource.h>
 #include <qpe/imageedit.h>
@@ -101,2 +103,3 @@ void NewTaskDialog::init()
     picker->setDate( date.year(), date.month(), date.day() );
+    lblDown->setPixmap(Resource::loadPixmap("down") );
 }
@@ -142,3 +145,7 @@ ToDoEvent NewTaskDialog::todoEntry()
 }
-
+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
@@ -49,3 +49,3 @@ protected slots:
     void dateChanged( int y, int m, int d );
-
+    void slotCopy();
 protected: