Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 67 |
1 files changed, 47 insertions, 20 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 82a1b57..8335d8b 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -65,16 +65,12 @@ | |||
65 | #include <unistd.h> | 65 | #include <unistd.h> |
66 | 66 | ||
67 | #include <qdatetime.h> | 67 | #include <qdatetime.h> |
68 | 68 | ||
69 | #include "picker.h" | 69 | #include "picker.h" |
70 | 70 | ||
71 | // Remove this for OPIE releae 1.0 ! | ||
72 | #define __DEBUG_RELEASE | ||
73 | |||
74 | |||
75 | static QString addressbookPersonalVCardName() | 71 | static QString addressbookPersonalVCardName() |
76 | { | 72 | { |
77 | QString filename = Global::applicationFileName("addressbook", | 73 | QString filename = Global::applicationFileName("addressbook", |
78 | "businesscard.vcf"); | 74 | "businesscard.vcf"); |
79 | return filename; | 75 | return filename; |
80 | } | 76 | } |
@@ -137,26 +133,37 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
137 | #if !defined(QT_NO_COP) | 133 | #if !defined(QT_NO_COP) |
138 | QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this ); | 134 | QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this ); |
139 | connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)), | 135 | connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)), |
140 | this, SLOT ( appMessage(const QCString &, const QByteArray &) ) ); | 136 | this, SLOT ( appMessage(const QCString &, const QByteArray &) ) ); |
141 | #endif | 137 | #endif |
142 | #endif | 138 | #endif |
143 | |||
144 | |||
145 | |||
146 | |||
147 | |||
148 | #ifndef MAKE_FOR_SHARP_ROM | ||
149 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), | 139 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), |
150 | QString::null, 0, this, 0 ); | 140 | QString::null, 0, this, 0 ); |
151 | actionFind = a; | 141 | actionFind = a; |
152 | connect( a, SIGNAL(activated()), this, SLOT(slotFind()) ); | 142 | connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) ); |
153 | a->addTo( edit ); | 143 | a->addTo( edit ); |
154 | a->addTo( listTools ); | 144 | a->addTo( listTools ); |
155 | #endif | ||
156 | 145 | ||
146 | // Much better search widget, taken from QTReader.. (se) | ||
147 | searchBar = new OFloatBar( "Search", this, QMainWindow::Top, TRUE ); | ||
148 | searchBar->setHorizontalStretchable( TRUE ); | ||
149 | searchBar->hide(); | ||
150 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); | ||
151 | // QFont f("unifont", 16 /*, QFont::Bold*/); | ||
152 | // searchEdit->setFont( f ); | ||
153 | searchBar->setStretchableWidget( searchEdit ); | ||
154 | connect( searchEdit, SIGNAL( returnPressed( ) ), | ||
155 | this, SLOT( slotFind( ) ) ); | ||
156 | |||
157 | a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | ||
158 | connect( a, SIGNAL( activated() ), this, SLOT( slotFindNext() ) ); | ||
159 | a->addTo( searchBar ); | ||
160 | |||
161 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | ||
162 | connect( a, SIGNAL( activated() ), this, SLOT( slotFindClose() ) ); | ||
163 | a->addTo( searchBar ); | ||
157 | 164 | ||
158 | a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ), | 165 | a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ), |
159 | QString::null, 0, this, 0 ); | 166 | QString::null, 0, this, 0 ); |
160 | //a->setEnabled( FALSE ); we got support for it now :) zecke | 167 | //a->setEnabled( FALSE ); we got support for it now :) zecke |
161 | actionMail = a; | 168 | actionMail = a; |
162 | connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) ); | 169 | connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) ); |
@@ -195,13 +202,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
195 | 202 | ||
196 | 203 | ||
197 | #ifdef __DEBUG_RELEASE | 204 | #ifdef __DEBUG_RELEASE |
198 | // Remove this function for public Release ! This is only | 205 | // Remove this function for public Release ! This is only |
199 | // for debug purposes .. | 206 | // for debug purposes .. |
200 | a = new QAction( tr( "Save all Data"), QString::null, 0, 0 ); | 207 | a = new QAction( tr( "Save all Data"), QString::null, 0, 0 ); |
201 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); | 208 | connect( a, SIGNAL( activated() ), this , SLOT( slotSave() ) ); |
202 | a->addTo( edit ); | 209 | a->addTo( edit ); |
203 | #endif | 210 | #endif |
204 | 211 | ||
205 | // Create Views | 212 | // Create Views |
206 | listContainer = new QWidget( this ); | 213 | listContainer = new QWidget( this ); |
207 | 214 | ||
@@ -750,12 +757,19 @@ bool AddressbookWindow::save() | |||
750 | else | 757 | else |
751 | return FALSE; | 758 | return FALSE; |
752 | } | 759 | } |
753 | return TRUE; | 760 | return TRUE; |
754 | } | 761 | } |
755 | 762 | ||
763 | #ifdef __DEBUG_RELEASE | ||
764 | void AddressbookWindow::slotSave() | ||
765 | { | ||
766 | save(); | ||
767 | } | ||
768 | #endif | ||
769 | |||
756 | void AddressbookWindow::slotSettings() | 770 | void AddressbookWindow::slotSettings() |
757 | { | 771 | { |
758 | AddressSettings frmSettings( this ); | 772 | AddressSettings frmSettings( this ); |
759 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 773 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) |
760 | frmSettings.showMaximized(); | 774 | frmSettings.showMaximized(); |
761 | #endif | 775 | #endif |
@@ -874,30 +888,43 @@ AbLabel *AddressbookWindow::abView() | |||
874 | mView->init( OContact() ); | 888 | mView->init( OContact() ); |
875 | connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) ); | 889 | connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) ); |
876 | } | 890 | } |
877 | return mView; | 891 | return mView; |
878 | } | 892 | } |
879 | 893 | ||
894 | void AddressbookWindow::slotFindOpen() | ||
895 | { | ||
896 | searchBar->show(); | ||
897 | } | ||
898 | void AddressbookWindow::slotFindClose() | ||
899 | { | ||
900 | searchBar->hide(); | ||
901 | } | ||
902 | void AddressbookWindow::slotFindNext() | ||
903 | { | ||
904 | } | ||
905 | |||
880 | void AddressbookWindow::slotFind() | 906 | void AddressbookWindow::slotFind() |
881 | { | 907 | { |
882 | #ifndef MAKE_FOR_SHARP_ROM | ||
883 | if ( centralWidget() == abView() ) | 908 | if ( centralWidget() == abView() ) |
884 | showList(); | 909 | showList(); |
885 | 910 | ||
886 | FindDialog frmFind( "Contacts", this ); | 911 | // FindDialog frmFind( "Contacts", this ); |
887 | QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int))); | 912 | // QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) ); |
888 | QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) ); | 913 | // QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); |
889 | QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); | 914 | // frmFind.exec(); |
915 | |||
916 | // QStringList categories = abList->categories(); | ||
917 | // abList->setShowCategory( book, cat ); | ||
918 | abList->slotDoFind( searchEdit->text(), false, false); | ||
890 | 919 | ||
891 | frmFind.exec(); | ||
892 | 920 | ||
893 | if ( abList->numSelections() ) | 921 | if ( abList->numSelections() ) |
894 | abList->clearSelection(); | 922 | abList->clearSelection(); |
895 | 923 | ||
896 | abList->clearFindRow(); | 924 | abList->clearFindRow(); |
897 | #endif | ||
898 | } | 925 | } |
899 | 926 | ||
900 | void AddressbookWindow::slotSetCategory( int c ) | 927 | void AddressbookWindow::slotSetCategory( int c ) |
901 | { | 928 | { |
902 | 929 | ||
903 | QString cat, book; | 930 | QString cat, book; |