Fixed the search function.

More search fixes..

diff --git a/ui/contactmodifyerbase.ui b/ui/contactmodifyerbase.ui
index 9c296b2fb850d28f3c8df3e4977f9adcd31601dc..f551da3c4fdd5108a70c3e1d7ae088a04990a695 100644 (file)
--- a/ui/contactmodifyerbase.ui
+++ b/ui/contactmodifyerbase.ui
@@ -12,7 +12,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
         <rect>
             <x>0</x>
             <y>0</y>

-            <width>430</width>
+            <width>422</width>

             <height>175</height>
         </rect>
     </property>
             <height>175</height>
         </rect>
     </property>


@@ -186,6 +186,10 @@
                                 <name>name</name>
                                 <cstring>TextLabel4</cstring>
                             </property>
                                 <name>name</name>
                                 <cstring>TextLabel4</cstring>
                             </property>

+                            <property stdset="1">
+                                <name>frameShadow</name>
+                                <enum>MShadow</enum>
+                            </property>

                             <property stdset="1">
                                 <name>text</name>
                                 <string>&amp;Telefonnummer</string>
                             <property stdset="1">
                                 <name>text</name>
                                 <string>&amp;Telefonnummer</string>


@@ -261,4 +265,12 @@
     </connection>
     <slot access="public">slotOK()</slot>
 </connections>
     </connection>
     <slot access="public">slotOK()</slot>
 </connections>

+<tabstops>
+    <tabstop>FirstnameLine</tabstop>
+    <tabstop>LastnameLine</tabstop>
+    <tabstop>AdressLine</tabstop>
+    <tabstop>PhoneNumberLine</tabstop>
+    <tabstop>buttonOk</tabstop>
+    <tabstop>buttonCancel</tabstop>
+</tabstops>

 </UI>
 </UI>

diff --git a/ui/mainwindowbase.ui b/ui/mainwindowbase.ui
index ac5c850646bef15714807bcc4afaee8edc525c00..4c11ad9f3427ba2422cf80b087998cabe9161875 100644 (file)
--- a/ui/mainwindowbase.ui
+++ b/ui/mainwindowbase.ui
@@ -12,7 +12,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
         <rect>
             <x>0</x>
             <y>0</y>

-            <width>534</width>
+            <width>530</width>

             <height>398</height>
         </rect>
     </property>
             <height>398</height>
         </rect>
     </property>


@@ -115,7 +115,7 @@
             </property>
             <property stdset="1">
                 <name>cursor</name>
             </property>
             <property stdset="1">
                 <name>cursor</name>

-                <cursor>13</cursor>
+                <cursor>0</cursor>

             </property>
             <property stdset="1">
                 <name>resizePolicy</name>
             </property>
             <property stdset="1">
                 <name>resizePolicy</name>


@@ -412,6 +412,12 @@
         <receiver>unnamed</receiver>
         <slot>slotModify(QListViewItem*)</slot>
     </connection>
         <receiver>unnamed</receiver>
         <slot>slotModify(QListViewItem*)</slot>
     </connection>

+    <connection>
+        <sender>SearchLine</sender>
+        <signal>returnPressed()</signal>
+        <receiver>unnamed</receiver>
+        <slot>slotSearch()</slot>
+    </connection>

     <slot access="public">slotModify()</slot>
     <slot access="public">slotAdd()</slot>
     <slot access="public">slotDel()</slot>
     <slot access="public">slotModify()</slot>
     <slot access="public">slotAdd()</slot>
     <slot access="public">slotDel()</slot>

diff --git a/ui/searchresultbase.ui b/ui/searchresultbase.ui
index 82b239490185eb740470c8ff08a9f2f35329c8a3..72b379540ac261df3a416a0747d8000b93c97255 100644 (file)
--- a/ui/searchresultbase.ui
+++ b/ui/searchresultbase.ui
@@ -5,14 +5,14 @@
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>

-        <cstring>MyDialog</cstring>
+        <cstring>SearchResultBase</cstring>

     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>

-            <width>515</width>
+            <width>507</width>

             <height>286</height>
         </rect>
     </property>
             <height>286</height>
         </rect>
     </property>


@@ -110,11 +110,11 @@
                 <cstring>ContactView</cstring>
             </property>
         </widget>
                 <cstring>ContactView</cstring>
             </property>
         </widget>

-        <widget row="2"  column="0" >
+        <widget row="1"  column="0" >

             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>

-                <cstring>Layout15</cstring>
+                <cstring>Layout4</cstring>

             </property>
             <hbox>
                 <property stdset="1">
             </property>
             <hbox>
                 <property stdset="1">


@@ -139,15 +139,11 @@
                         <name>autoDefault</name>
                         <bool>true</bool>
                     </property>
                         <name>autoDefault</name>
                         <bool>true</bool>
                     </property>

-                    <property stdset="1">
-                        <name>default</name>
-                        <bool>true</bool>
-                    </property>

                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>
                 </widget>
                 <spacer>
                     <property>
                         <name>name</name>

-                        <cstring>Horizontal Spacing2</cstring>
+                        <cstring>Spacer4</cstring>

                     </property>
                     <property stdset="1">
                         <name>orientation</name>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>


@@ -169,110 +165,60 @@
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>

-                        <cstring>buttonCancel</cstring>
+                        <cstring>DelButton</cstring>

                     </property>
                     <property stdset="1">
                         <name>text</name>
                     </property>
                     <property stdset="1">
                         <name>text</name>

-                        <string>&amp;Cancel</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
-                        <bool>true</bool>
+                        <string>&amp;Ta bort</string>

                     </property>
                 </widget>
                     </property>
                 </widget>

-            </hbox>
-        </widget>
-        <widget row="1"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout17</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer3</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>

                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>

-                        <cstring>DelButton</cstring>
+                        <cstring>ModifyButton</cstring>

                     </property>
                     <property stdset="1">
                         <name>text</name>
                     </property>
                     <property stdset="1">
                         <name>text</name>

-                        <string>&amp;Ta bort</string>
+                        <string>&amp;Modifiera</string>

                     </property>
                 </widget>
                     </property>
                 </widget>

-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer4</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>

             </hbox>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
             </hbox>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>

-        <sender>buttonOk</sender>
+        <sender>DelButton</sender>

         <signal>clicked()</signal>
         <signal>clicked()</signal>

-        <receiver>MyDialog</receiver>
-        <slot>accept()</slot>
+        <receiver>SearchResultBase</receiver>
+        <slot>slotDel()</slot>

     </connection>
     <connection>
     </connection>
     <connection>

-        <sender>buttonCancel</sender>
+        <sender>ModifyButton</sender>

         <signal>clicked()</signal>
         <signal>clicked()</signal>

-        <receiver>MyDialog</receiver>
-        <slot>reject()</slot>
+        <receiver>SearchResultBase</receiver>
+        <slot>slotModify()</slot>

     </connection>
     <connection>
     </connection>
     <connection>

-        <sender>DelButton</sender>
+        <sender>ContactView</sender>
+        <signal>doubleClicked(QListViewItem*)</signal>
+        <receiver>SearchResultBase</receiver>
+        <slot>slotModify()</slot>
+    </connection>
+    <connection>
+        <sender>ContactView</sender>
+        <signal>returnPressed(QListViewItem*)</signal>
+        <receiver>SearchResultBase</receiver>
+        <slot>slotModify()</slot>
+    </connection>
+    <connection>
+        <sender>buttonOk</sender>

         <signal>clicked()</signal>
         <signal>clicked()</signal>

-        <receiver>MyDialog</receiver>
-        <slot>slotDel()</slot>
+        <receiver>SearchResultBase</receiver>
+        <slot>accept()</slot>

     </connection>
     <slot access="public">slotDel()</slot>
     </connection>
     <slot access="public">slotDel()</slot>

+    <slot access="public">slotModify()</slot>

 </connections>
 </UI>
 </connections>
 </UI>