Doc - A few fixes

RevBy:    TrustMe

diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc
index 31c67a1..e7ceb38 100644 (file)
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -43,7 +43,7 @@
     \page tutorials-addressbook-sdk.html
 
     \startpage {index.html}{Qt Reference Documentation}
-    \nextpage \l{Designing the User Interface}{Chapter 1}
+    \nextpage {Designing the User Interface}{Chapter 1}
 
     \title Address Book Tutorial
     \ingroup howto
@@ -99,7 +99,7 @@
 /*!
     \page tutorials-addressbook-sdk-part1.html
     \contentspage {Address Book Tutorial}{Contents}
-    \nextpage \l{examples/addressbook-sdk/part2}{Chapter 2}
+    \nextpage {examples/addressbook-sdk/part2}{Chapter 2}
     \example examples/addressbook-sdk/part1
     \title Address Book 1 - Designing the User Interface
 
@@ -253,7 +253,7 @@
     \page tutorials-addressbook-sdk-part2.html
     \previouspage Address Book 1 - Designing the User Interface
     \contentspage {Address Book Tutorial}{Contents}
-    \nextpage \l{examples/addressbook-sdk/part3}{Chapter 3}
+    \nextpage {examples/addressbook-sdk/part3}{Chapter 3}
     \example examples/addressbook-sdk/part2
     \title Address Book 2 - Adding Addresses
 
@@ -425,7 +425,7 @@
     \page tutorials-addressbook-sdk-part3.html
     \previouspage Address Book 2 - Adding Addresses
     \contentspage {Address Book Tutorial}{Contents}
-    \nextpage \l{examples/addressbook-sdk/part4}{Chapter 4}
+    \nextpage {examples/addressbook-sdk/part4}{Chapter 4}
     \example examples/addressbook-sdk/part3
     \title Address Book 3 - Navigating between Entries}
 
@@ -547,7 +547,7 @@
     \page tutorials-addressbook-sdk-part4.html
     \previouspage Address Book 3 - Navigating between Entries
     \contentspage {Address Book Tutorial}{Contents}
-    \nextpage \l{examples/addressbook-sdk/part5}{Chapter 5}
+    \nextpage {examples/addressbook-sdk/part5}{Chapter 5}
     \example examples/addressbook-sdk/part4
     \title Address Book 4 - Editing and Removing Addresses}
 
@@ -708,7 +708,7 @@
     \page tutorials-addressbook-sdk-part5.html
     \previouspage Address Book 4 - Editing and Removing Addresses
     \contentspage {Address Book Tutorial}{Contents}
-    \nextpage \l{examples/addressbook-sdk/part6}{Chapter 6}
+    \nextpage {examples/addressbook-sdk/part6}{Chapter 6}
     \example examples/addressbook-sdk/part5
     \title Address Book 5 - Adding a Find Function}
 
@@ -733,7 +733,7 @@
 
     We begin by adding a new \c{.ui} file to our project. Right click on your
     project and select \gui{Add New...}. In the \gui{New File} dialog, select
-    \gui{Qt Designer Form}. In the \gui{Qt Designer Form| dialog, select
+    \gui{Qt Designer Form}. In the \gui{Qt Designer Form} dialog, select
     \e{Dialog without buttons}. Name it \c{finddialog.ui} and add it to your
     project. The \QD plugin within Qt Creator will now display your new form.
 
@@ -749,7 +749,7 @@
     \page tutorials-addressbook-sdk-part6.html
     \previouspage Address Book 5 - Adding a Find Function
     \contentspage {Address Book Tutorial}{Contents}
-    \nextpage \l{examples/addressbook-sdk/part7}{Chapter 7}
+    \nextpage {examples/addressbook-sdk/part7}{Chapter 7}
     \example examples/addressbook-sdk/part6
     \title Address Book 6 - Loading and Saving}
 

diff --git a/doc/examples/addressbook-sdk/part5/finddialog.ui b/doc/examples/addressbook-sdk/part5/finddialog.ui
index e4e6b3f..500b70b 100644 (file)
--- a/doc/examples/addressbook-sdk/part5/finddialog.ui
+++ b/doc/examples/addressbook-sdk/part5/finddialog.ui
@@ -1,41 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
+<ui version="4.0" >
+ <class>FindDialog</class>
+ <widget class="QDialog" name="FindDialog" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>476</width>
-    <height>87</height>
+    <width>400</width>
+    <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_2">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Enter the name of a contact:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="lineEdit"/>
-     </item>
-     <item>
-      <widget class="QPushButton" name="findButton">
-       <property name="text">
-        <string>Find</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
  </widget>
  <resources/>
  <connections/>

diff --git a/doc/examples/addressbook-sdk/part5/part5.pro b/doc/examples/addressbook-sdk/part5/part5.pro
index e4b8954..f41e5e8 100644 (file)
--- a/doc/examples/addressbook-sdk/part5/part5.pro
+++ b/doc/examples/addressbook-sdk/part5/part5.pro
@@ -4,7 +4,9 @@
 TARGET = part5
 TEMPLATE = app
 SOURCES += main.cpp \
-    addressbook.cpp
-HEADERS += addressbook.h
+    addressbook.cpp \
+    finddialog.cpp
+HEADERS += addressbook.h \
+    finddialog.h
 FORMS += addressbook.ui \
     finddialog.ui