author | eilers <eilers> | 2002-10-18 15:42:57 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-18 15:42:57 (UTC) |
commit | 47e60a8dc20f46dd00b9405f7fde122792018627 (patch) (unidiff) | |
tree | b109ca9e9c200e7e47c0e61e8f2e86ba6bf4a37f /core/pim/addressbook | |
parent | c16dcab3fe45ae7193cbdfb2f62bf7e5482d449b (diff) | |
download | opie-47e60a8dc20f46dd00b9405f7fde122792018627.zip opie-47e60a8dc20f46dd00b9405f7fde122792018627.tar.gz opie-47e60a8dc20f46dd00b9405f7fde122792018627.tar.bz2 |
First attempt of new find entry field.. It still needs some finetuning !
-rw-r--r-- | core/pim/addressbook/TODO | 1 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 10 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.h | 2 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 67 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 17 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 3 | ||||
-rw-r--r-- | core/pim/addressbook/ofloatbar.h | 20 |
7 files changed, 96 insertions, 24 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO index 7bc906d..d8720b3 100644 --- a/core/pim/addressbook/TODO +++ b/core/pim/addressbook/TODO | |||
@@ -3,24 +3,25 @@ Stuff todo: | |||
3 | Urgent: | 3 | Urgent: |
4 | 4 | ||
5 | - Font menu is invisible using german translation | 5 | - Font menu is invisible using german translation |
6 | 6 | ||
7 | Important: | 7 | Important: |
8 | 8 | ||
9 | - Finishing of new View functions (List, Phonebook...) | 9 | - Finishing of new View functions (List, Phonebook...) |
10 | - Reload if contacts were changed externally | 10 | - Reload if contacts were changed externally |
11 | - "What's this" should be added | 11 | - "What's this" should be added |
12 | - The names of the countries are sorted by there english names, only.. | 12 | - The names of the countries are sorted by there english names, only.. |
13 | Even if they are translated.. :S | 13 | Even if they are translated.. :S |
14 | - Store last settings of combo-boxes | 14 | - Store last settings of combo-boxes |
15 | - Mail-Icon is missing | ||
15 | 16 | ||
16 | Less important: | 17 | Less important: |
17 | 18 | ||
18 | - Find widget should be replaced by something like | 19 | - Find widget should be replaced by something like |
19 | qpdf has. | 20 | qpdf has. |
20 | - The picker (alphabetical sort widget) should be | 21 | - The picker (alphabetical sort widget) should be |
21 | placed verticaly or horizontally (configurable) | 22 | placed verticaly or horizontally (configurable) |
22 | 23 | ||
23 | 24 | ||
24 | Should be Fixed (not absolute sure, need validation): | 25 | Should be Fixed (not absolute sure, need validation): |
25 | - "Nonenglish" translation bug has to be fixed. | 26 | - "Nonenglish" translation bug has to be fixed. |
26 | 27 | ||
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 91a7171..9297d6a 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -626,26 +626,34 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) | |||
626 | 626 | ||
627 | // int AbTable::rowPos( int row ) const | 627 | // int AbTable::rowPos( int row ) const |
628 | // { | 628 | // { |
629 | // return 18*row; | 629 | // return 18*row; |
630 | // } | 630 | // } |
631 | 631 | ||
632 | // int AbTable::rowAt( int pos ) const | 632 | // int AbTable::rowAt( int pos ) const |
633 | // { | 633 | // { |
634 | // return QMIN( pos/18, numRows()-1 ); | 634 | // return QMIN( pos/18, numRows()-1 ); |
635 | // } | 635 | // } |
636 | 636 | ||
637 | void AbTable::slotDoFind( const QString &findString, bool caseSensitive, | 637 | void AbTable::slotDoFind( const QString &findString, bool caseSensitive, |
638 | bool backwards, int category ) | 638 | bool backwards, QString cat /* int category */ ) |
639 | { | 639 | { |
640 | int category = 0; | ||
641 | if ( cat.isEmpty() ) | ||
642 | category = -2; // mCat.id("Contacts", "All"); | ||
643 | else | ||
644 | category = mCat.id("Contacts", cat ); | ||
645 | |||
646 | qWarning ("Found in Category %d", category); | ||
647 | |||
640 | if ( currFindRow < -1 ) | 648 | if ( currFindRow < -1 ) |
641 | currFindRow = currentRow() - 1; | 649 | currFindRow = currentRow() - 1; |
642 | clearSelection( TRUE ); | 650 | clearSelection( TRUE ); |
643 | int rows, row; | 651 | int rows, row; |
644 | AbTableItem *ati; | 652 | AbTableItem *ati; |
645 | QRegExp r( findString ); | 653 | QRegExp r( findString ); |
646 | r.setCaseSensitive( caseSensitive ); | 654 | r.setCaseSensitive( caseSensitive ); |
647 | rows = numRows(); | 655 | rows = numRows(); |
648 | static bool wrapAround = true; | 656 | static bool wrapAround = true; |
649 | 657 | ||
650 | if ( !backwards ) { | 658 | if ( !backwards ) { |
651 | for ( row = currFindRow + 1; row < rows; row++ ) { | 659 | for ( row = currFindRow + 1; row < rows; row++ ) { |
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h index 80c3ca0..a603e17 100644 --- a/core/pim/addressbook/abtable.h +++ b/core/pim/addressbook/abtable.h | |||
@@ -91,25 +91,25 @@ public: | |||
91 | QString showCategory() const; | 91 | QString showCategory() const; |
92 | QStringList categories(); | 92 | QStringList categories(); |
93 | 93 | ||
94 | void resizeRows(); | 94 | void resizeRows(); |
95 | 95 | ||
96 | void show(); | 96 | void show(); |
97 | void setPaintingEnabled( bool e ); | 97 | void setPaintingEnabled( bool e ); |
98 | 98 | ||
99 | QString showBook() const; | 99 | QString showBook() const; |
100 | 100 | ||
101 | public slots: | 101 | public slots: |
102 | void slotDoFind( const QString &str, bool caseSensitive, bool backwards, | 102 | void slotDoFind( const QString &str, bool caseSensitive, bool backwards, |
103 | int category ); | 103 | QString category = QString::null ); |
104 | signals: | 104 | signals: |
105 | void empty( bool ); | 105 | void empty( bool ); |
106 | void details(); | 106 | void details(); |
107 | void signalNotFound(); | 107 | void signalNotFound(); |
108 | void signalWrapAround(); | 108 | void signalWrapAround(); |
109 | 109 | ||
110 | protected: | 110 | protected: |
111 | virtual void keyPressEvent( QKeyEvent *e ); | 111 | virtual void keyPressEvent( QKeyEvent *e ); |
112 | 112 | ||
113 | // int rowHeight( int ) const; | 113 | // int rowHeight( int ) const; |
114 | // int rowPos( int row ) const; | 114 | // int rowPos( int row ) const; |
115 | // virtual int rowAt( int pos ) const; | 115 | // virtual int rowAt( int pos ) const; |
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 | |||
@@ -59,28 +59,24 @@ | |||
59 | #include <qwhatsthis.h> | 59 | #include <qwhatsthis.h> |
60 | 60 | ||
61 | #include <stdlib.h> | 61 | #include <stdlib.h> |
62 | #include <sys/stat.h> | 62 | #include <sys/stat.h> |
63 | #include <sys/types.h> | 63 | #include <sys/types.h> |
64 | #include <fcntl.h> | 64 | #include <fcntl.h> |
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 | } |
81 | 77 | ||
82 | 78 | ||
83 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | 79 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, |
84 | WFlags f ) | 80 | WFlags f ) |
85 | : QMainWindow( parent, name, f ), | 81 | : QMainWindow( parent, name, f ), |
86 | abEditor(0), | 82 | abEditor(0), |
@@ -131,38 +127,49 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
131 | a->addTo( edit ); | 127 | a->addTo( edit ); |
132 | a->addTo( listTools ); | 128 | a->addTo( listTools ); |
133 | 129 | ||
134 | 130 | ||
135 | // make it possible to go directly to businesscard via qcop call | 131 | // make it possible to go directly to businesscard via qcop call |
136 | #if defined(Q_WS_QWS) | 132 | #if defined(Q_WS_QWS) |
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() ) ); |
163 | a->addTo( edit ); | 170 | a->addTo( edit ); |
164 | a->addTo( listTools ); | 171 | a->addTo( listTools ); |
165 | 172 | ||
166 | 173 | ||
167 | 174 | ||
168 | if ( Ir::supported() ) { | 175 | if ( Ir::supported() ) { |
@@ -189,25 +196,25 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
189 | a->addTo( edit ); | 196 | a->addTo( edit ); |
190 | 197 | ||
191 | // Do we need this function ? (se) | 198 | // Do we need this function ? (se) |
192 | // a = new QAction( tr( "Arrange Edit Fields"), QString::null, 0, 0 ); | 199 | // a = new QAction( tr( "Arrange Edit Fields"), QString::null, 0, 0 ); |
193 | // connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); | 200 | // connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); |
194 | // a->addTo( edit ); | 201 | // a->addTo( edit ); |
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 | ||
208 | QVBoxLayout *vb = new QVBoxLayout( listContainer ); | 215 | QVBoxLayout *vb = new QVBoxLayout( listContainer ); |
209 | 216 | ||
210 | abList = new AbTable( &orderedFields, listContainer, "table" ); | 217 | abList = new AbTable( &orderedFields, listContainer, "table" ); |
211 | vb->addWidget(abList); | 218 | vb->addWidget(abList); |
212 | // abList->setHScrollBarMode( QScrollView::AlwaysOff ); | 219 | // abList->setHScrollBarMode( QScrollView::AlwaysOff ); |
213 | connect( abList, SIGNAL( empty( bool ) ), this, SLOT( listIsEmpty( bool ) ) ); | 220 | connect( abList, SIGNAL( empty( bool ) ), this, SLOT( listIsEmpty( bool ) ) ); |
@@ -744,24 +751,31 @@ bool AddressbookWindow::save() | |||
744 | "and try again.\n" | 751 | "and try again.\n" |
745 | "\nQuit anyway?"), | 752 | "\nQuit anyway?"), |
746 | QMessageBox::Yes|QMessageBox::Escape, | 753 | QMessageBox::Yes|QMessageBox::Escape, |
747 | QMessageBox::No|QMessageBox::Default ) | 754 | QMessageBox::No|QMessageBox::Default ) |
748 | != QMessageBox::No ) | 755 | != QMessageBox::No ) |
749 | return TRUE; | 756 | return TRUE; |
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 |
762 | 776 | ||
763 | if ( frmSettings.exec() ) { | 777 | if ( frmSettings.exec() ) { |
764 | allFields.clear(); | 778 | allFields.clear(); |
765 | orderedFields.clear(); | 779 | orderedFields.clear(); |
766 | slOrderedFields.clear(); | 780 | slOrderedFields.clear(); |
767 | initFields(); | 781 | initFields(); |
@@ -868,42 +882,55 @@ void AddressbookWindow::initFields() | |||
868 | 882 | ||
869 | 883 | ||
870 | AbLabel *AddressbookWindow::abView() | 884 | AbLabel *AddressbookWindow::abView() |
871 | { | 885 | { |
872 | if ( !mView ) { | 886 | if ( !mView ) { |
873 | mView = new AbLabel( this, "viewer" ); | 887 | mView = new AbLabel( this, "viewer" ); |
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; |
904 | 931 | ||
905 | if ( c <= 0 ) | 932 | if ( c <= 0 ) |
906 | return; | 933 | return; |
907 | 934 | ||
908 | // Checkmark Book Menu Item Selected | 935 | // Checkmark Book Menu Item Selected |
909 | if ( c < 6 ) | 936 | if ( c < 6 ) |
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index bf36407..b7cf355 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h | |||
@@ -11,27 +11,32 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef Addressbook_H | 20 | #ifndef Addressbook_H |
21 | #define Addressbook_H | 21 | #define Addressbook_H |
22 | 22 | ||
23 | // Remove this for OPIE releae 1.0 ! | ||
24 | #define __DEBUG_RELEASE | ||
25 | |||
23 | #include <qmainwindow.h> | 26 | #include <qmainwindow.h> |
24 | #include <qvaluelist.h> | 27 | #include <qvaluelist.h> |
25 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <qlineedit.h> | ||
30 | #include "ofloatbar.h" | ||
26 | 31 | ||
27 | class ContactEditor; | 32 | class ContactEditor; |
28 | class AbLabel; | 33 | class AbLabel; |
29 | class AbTable; | 34 | class AbTable; |
30 | class QPEToolBar; | 35 | class QPEToolBar; |
31 | class QPopupMenu; | 36 | class QPopupMenu; |
32 | class QToolButton; | 37 | class QToolButton; |
33 | class QDialog; | 38 | class QDialog; |
34 | class Ir; | 39 | class Ir; |
35 | class QAction; | 40 | class QAction; |
36 | class LetterPicker; | 41 | class LetterPicker; |
37 | 42 | ||
@@ -48,61 +53,71 @@ protected: | |||
48 | void showView(); | 53 | void showView(); |
49 | enum EntryMode { NewEntry=0, EditEntry }; | 54 | enum EntryMode { NewEntry=0, EditEntry }; |
50 | void editPersonal(); | 55 | void editPersonal(); |
51 | void editEntry( EntryMode ); | 56 | void editEntry( EntryMode ); |
52 | void closeEvent( QCloseEvent *e ); | 57 | void closeEvent( QCloseEvent *e ); |
53 | bool save(); | 58 | bool save(); |
54 | 59 | ||
55 | public slots: | 60 | public slots: |
56 | void flush(); | 61 | void flush(); |
57 | void reload(); | 62 | void reload(); |
58 | void appMessage(const QCString &, const QByteArray &); | 63 | void appMessage(const QCString &, const QByteArray &); |
59 | void setDocument( const QString & ); | 64 | void setDocument( const QString & ); |
65 | #ifdef __DEBUG_RELEASE | ||
66 | void slotSave(); | ||
67 | #endif | ||
60 | 68 | ||
61 | private slots: | 69 | private slots: |
62 | void importvCard(); | 70 | void importvCard(); |
63 | void slotListNew(); | 71 | void slotListNew(); |
64 | void slotListView(); | 72 | void slotListView(); |
65 | void slotListDelete(); | 73 | void slotListDelete(); |
66 | void slotViewBack(); | 74 | void slotViewBack(); |
67 | void slotViewEdit(); | 75 | void slotViewEdit(); |
68 | void slotPersonalView(); | 76 | void slotPersonalView(); |
69 | void listIsEmpty( bool ); | 77 | void listIsEmpty( bool ); |
70 | void slotSettings(); | 78 | void slotSettings(); |
71 | void writeMail(); | 79 | void writeMail(); |
72 | void slotBeam(); | 80 | void slotBeam(); |
73 | void beamDone( Ir * ); | 81 | void beamDone( Ir * ); |
74 | void slotFind(); | ||
75 | void slotSetCategory( int ); | 82 | void slotSetCategory( int ); |
76 | void slotSetLetter( char ); | 83 | void slotSetLetter( char ); |
77 | void slotUpdateToolbar(); | 84 | void slotUpdateToolbar(); |
78 | void slotSetFont(int); | 85 | void slotSetFont(int); |
79 | 86 | ||
87 | void slotFindOpen(); | ||
88 | void slotFindClose(); | ||
89 | void slotFind(); | ||
90 | void slotFindNext(); | ||
91 | |||
80 | private: | 92 | private: |
81 | void initFields(); // inititialize our fields... | 93 | void initFields(); // inititialize our fields... |
82 | AbLabel *abView(); | 94 | AbLabel *abView(); |
83 | void populateCategories(); | 95 | void populateCategories(); |
84 | 96 | ||
85 | QPopupMenu *catMenu, *fontMenu; | 97 | QPopupMenu *catMenu, *fontMenu; |
86 | QPEToolBar *listTools; | 98 | QPEToolBar *listTools; |
87 | QToolButton *deleteButton; | 99 | QToolButton *deleteButton; |
88 | QValueList<int> allFields, orderedFields; | 100 | QValueList<int> allFields, orderedFields; |
89 | QStringList slOrderedFields; | 101 | QStringList slOrderedFields; |
90 | enum Panes { paneList=0, paneView, paneEdit }; | 102 | enum Panes { paneList=0, paneView, paneEdit }; |
91 | ContactEditor *abEditor; | 103 | ContactEditor *abEditor; |
92 | AbLabel *mView; | 104 | AbLabel *mView; |
93 | LetterPicker *pLabel; | 105 | LetterPicker *pLabel; |
94 | AbTable *abList; | 106 | AbTable *abList; |
95 | QWidget *listContainer; | 107 | QWidget *listContainer; |
96 | 108 | ||
109 | OFloatBar* searchBar; | ||
110 | QLineEdit* searchEdit; | ||
111 | |||
97 | QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail; | 112 | QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail; |
98 | 113 | ||
99 | bool bAbEditFirstTime; | 114 | bool bAbEditFirstTime; |
100 | int viewMargin; | 115 | int viewMargin; |
101 | 116 | ||
102 | bool syncing; | 117 | bool syncing; |
103 | QFont *defaultFont; | 118 | QFont *defaultFont; |
104 | int startFontSize; | 119 | int startFontSize; |
105 | 120 | ||
106 | bool isLoading; | 121 | bool isLoading; |
107 | }; | 122 | }; |
108 | 123 | ||
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index 24bdd8c..05aa5ec 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro | |||
@@ -1,21 +1,22 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS= addressbook.h \ | 4 | HEADERS= addressbook.h \ |
5 | contacteditor.h \ | 5 | contacteditor.h \ |
6 | ablabel.h \ | 6 | ablabel.h \ |
7 | abtable.h \ | 7 | abtable.h \ |
8 | addresssettings.h \ | 8 | addresssettings.h \ |
9 | picker.h | 9 | picker.h \ |
10 | ofloatbar.h | ||
10 | SOURCES= main.cpp \ | 11 | SOURCES= main.cpp \ |
11 | addressbook.cpp \ | 12 | addressbook.cpp \ |
12 | contacteditor.cpp \ | 13 | contacteditor.cpp \ |
13 | ablabel.cpp \ | 14 | ablabel.cpp \ |
14 | abtable.cpp \ | 15 | abtable.cpp \ |
15 | addresssettings.cpp \ | 16 | addresssettings.cpp \ |
16 | picker.cpp | 17 | picker.cpp |
17 | INTERFACES= addresssettingsbase.ui | 18 | INTERFACES= addresssettingsbase.ui |
18 | TARGET = addressbook | 19 | TARGET = addressbook |
19 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH+= $(OPIEDIR)/include | 21 | DEPENDPATH+= $(OPIEDIR)/include |
21 | LIBS += -lqpe -lopie | 22 | LIBS += -lqpe -lopie |
diff --git a/core/pim/addressbook/ofloatbar.h b/core/pim/addressbook/ofloatbar.h new file mode 100644 index 0000000..85a0c4f --- a/dev/null +++ b/core/pim/addressbook/ofloatbar.h | |||
@@ -0,0 +1,20 @@ | |||
1 | #ifndef __OFLOATBAR_H | ||
2 | #define __OFLOATBAR_H | ||
3 | |||
4 | #include <qtoolbar.h> | ||
5 | #include <qevent.h> | ||
6 | |||
7 | class OFloatBar : public QToolBar | ||
8 | { | ||
9 | Q_OBJECT | ||
10 | virtual void hideEvent(QHideEvent* e) | ||
11 | { | ||
12 | /*if (e->spontaneous())*/ emit OnHide(); | ||
13 | } | ||
14 | public: | ||
15 | OFloatBar(char* t, QMainWindow* mw, QMainWindow::ToolBarDock td, bool f) : QToolBar(t, mw, td, f) {} | ||
16 | signals: | ||
17 | void OnHide(); | ||
18 | }; | ||
19 | |||
20 | #endif | ||