summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp18
-rw-r--r--core/pim/addressbook/addressbook.h4
2 files changed, 19 insertions, 3 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 86d1760..e11cf4c 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -132,16 +132,30 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
132 132
133 a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 133 a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
134 0, this, 0 ); 134 0, this, 0 );
135 actionTrash = a; 135 actionTrash = a;
136 connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) ); 136 connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
137 a->addTo( edit ); 137 a->addTo( edit );
138 a->addTo( listTools ); 138 a->addTo( listTools );
139 139
140
141 // make it possible to go directly to businesscard via qcop call
142#if defined(Q_WS_QWS)
143#if !defined(QT_NO_COP)
144 QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
145 connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
146 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
147#endif
148#endif
149
150
151
152
153
140#ifndef MAKE_FOR_SHARP_ROM 154#ifndef MAKE_FOR_SHARP_ROM
141 a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), 155 a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
142 QString::null, 0, this, 0 ); 156 QString::null, 0, this, 0 );
143 actionFind = a; 157 actionFind = a;
144 connect( a, SIGNAL(activated()), this, SLOT(slotFind()) ); 158 connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
145 a->addTo( edit ); 159 a->addTo( edit );
146 a->addTo( listTools ); 160 a->addTo( listTools );
147#endif 161#endif
@@ -245,16 +259,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
245 259
246 slotSetFont(startFontSize); 260 slotSetFont(startFontSize);
247 261
248 mbList->insertItem( tr("Font"), fontMenu); 262 mbList->insertItem( tr("Font"), fontMenu);
249 setCentralWidget(listContainer); 263 setCentralWidget(listContainer);
250 264
251 // qDebug("adressbook contrsuction: t=%d", t.elapsed() ); 265 // qDebug("adressbook contrsuction: t=%d", t.elapsed() );
252} 266}
267
268
253void AddressbookWindow::slotSetFont( int size ) { 269void AddressbookWindow::slotSetFont( int size ) {
254 270
255 if (size > 2 || size < 0) 271 if (size > 2 || size < 0)
256 size = 1; 272 size = 1;
257 273
258 startFontSize = size; 274 startFontSize = size;
259 275
260 QFont *currentFont; 276 QFont *currentFont;
@@ -288,17 +304,17 @@ void AddressbookWindow::slotSetFont( int size ) {
288} 304}
289 305
290 306
291 307
292void AddressbookWindow::importvCard() { 308void AddressbookWindow::importvCard() {
293 QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); 309 QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
294 if(!str.isEmpty() ) 310 if(!str.isEmpty() )
295 setDocument((const QString&) str ); 311 setDocument((const QString&) str );
296 312
297} 313}
298 314
299void AddressbookWindow::setDocument( const QString &filename ) 315void AddressbookWindow::setDocument( const QString &filename )
300{ 316{
301 if ( filename.find(".vcf") != int(filename.length()) - 4 ) return; 317 if ( filename.find(".vcf") != int(filename.length()) - 4 ) return;
302 318
303 QValueList<Contact> cl = Contact::readVCard( filename ); 319 QValueList<Contact> cl = Contact::readVCard( filename );
304 for( QValueList<Contact>::Iterator it = cl.begin(); it != cl.end(); ++it ) { 320 for( QValueList<Contact>::Iterator it = cl.begin(); it != cl.end(); ++it ) {
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index da43731..34ca85d 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -54,17 +54,17 @@ protected:
54 54
55public slots: 55public slots:
56 void flush(); 56 void flush();
57 void reload(); 57 void reload();
58 void appMessage(const QCString &, const QByteArray &); 58 void appMessage(const QCString &, const QByteArray &);
59 void setDocument( const QString & ); 59 void setDocument( const QString & );
60 60
61private slots: 61private slots:
62 void importvCard(); 62 void importvCard();
63 void slotListNew(); 63 void slotListNew();
64 void slotListView(); 64 void slotListView();
65 void slotListDelete(); 65 void slotListDelete();
66 void slotViewBack(); 66 void slotViewBack();
67 void slotViewEdit(); 67 void slotViewEdit();
68 void slotPersonalView(); 68 void slotPersonalView();
69 void listIsEmpty( bool ); 69 void listIsEmpty( bool );
70 void slotSettings(); 70 void slotSettings();
@@ -89,17 +89,17 @@ private:
89 QStringList slOrderedFields; 89 QStringList slOrderedFields;
90 enum Panes { paneList=0, paneView, paneEdit }; 90 enum Panes { paneList=0, paneView, paneEdit };
91 ContactEditor *abEditor; 91 ContactEditor *abEditor;
92 AbLabel *mView; 92 AbLabel *mView;
93 LetterPicker *pLabel; 93 LetterPicker *pLabel;
94 AbTable *abList; 94 AbTable *abList;
95 QWidget *listContainer; 95 QWidget *listContainer;
96 96
97 QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, 97 QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam,
98 *actionPersonal, *actionMail; 98 *actionPersonal, *actionMail;
99 99
100 bool bAbEditFirstTime; 100 bool bAbEditFirstTime;
101 int viewMargin; 101 int viewMargin;
102 102
103 bool syncing; 103 bool syncing;
104 QFont *defaultFont; 104 QFont *defaultFont;
105 int startFontSize; 105 int startFontSize;