Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 21 insertions, 1 deletions

diff --git a/library/categoryeditbase_p.ui b/library/categoryeditbase_p.ui
index a76e433..e192ae1 100644
--- a/library/categoryeditbase_p.ui
+++ b/library/categoryeditbase_p.ui
@@ -32,3 +32,3 @@
             <y>0</y>
-            <width>201</width>
+            <width>197</width>
             <height>287</height>
@@ -107,2 +107,6 @@
             </property>
+            <property>
+                <name>whatsThis</name>
+                <string>Check the categories this document belongs to.</string>
+            </property>
         </widget>
@@ -129,2 +133,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</string>
+                    </property>
                 </widget>
@@ -144,2 +152,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Enter a new category to the left and press to add it to the list.</string>
+                    </property>
                 </widget>
@@ -163,2 +175,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Press to delete the highlighted category.</string>
+                    </property>
                 </widget>
@@ -174,2 +190,6 @@
                     </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Check to make this property available to all applications.</string>
+                    </property>
                 </widget>