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
@@ -124,32 +124,46 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
124 a->addTo( listTools ); 124 a->addTo( listTools );
125 125
126 a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null, 126 a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
127 0, this, 0 ); 127 0, this, 0 );
128 actionEdit = a; 128 actionEdit = a;
129 connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) ); 129 connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
130 a->addTo( edit ); 130 a->addTo( edit );
131 a->addTo( listTools ); 131 a->addTo( listTools );
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
148 162
149 163
150 a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ), 164 a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
151 QString::null, 0, this, 0 ); 165 QString::null, 0, this, 0 );
152 //a->setEnabled( FALSE ); we got support for it now :) zecke 166 //a->setEnabled( FALSE ); we got support for it now :) zecke
153 actionMail = a; 167 actionMail = a;
154 connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) ); 168 connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
155 a->addTo( edit ); 169 a->addTo( edit );
@@ -237,32 +251,34 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
237 fontMenu->setCheckable( true ); 251 fontMenu->setCheckable( true );
238 connect( fontMenu, SIGNAL(activated(int)), this, SLOT(slotSetFont(int))); 252 connect( fontMenu, SIGNAL(activated(int)), this, SLOT(slotSetFont(int)));
239 253
240 fontMenu->insertItem(tr( "Small" ), 0); 254 fontMenu->insertItem(tr( "Small" ), 0);
241 fontMenu->insertItem(tr( "Normal" ), 1); 255 fontMenu->insertItem(tr( "Normal" ), 1);
242 fontMenu->insertItem(tr( "Large" ), 2); 256 fontMenu->insertItem(tr( "Large" ), 2);
243 257
244 defaultFont = new QFont( abList->font() ); 258 defaultFont = new QFont( abList->font() );
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;
261 277
262 switch (size) { 278 switch (size) {
263 case 0: 279 case 0:
264 fontMenu->setItemChecked(0, true); 280 fontMenu->setItemChecked(0, true);
265 fontMenu->setItemChecked(1, false); 281 fontMenu->setItemChecked(1, false);
266 fontMenu->setItemChecked(2, false); 282 fontMenu->setItemChecked(2, false);
267 abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) ); 283 abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
268 currentFont = new QFont (abList->font()); 284 currentFont = new QFont (abList->font());
@@ -280,33 +296,33 @@ void AddressbookWindow::slotSetFont( int size ) {
280 fontMenu->setItemChecked(0, false); 296 fontMenu->setItemChecked(0, false);
281 fontMenu->setItemChecked(1, false); 297 fontMenu->setItemChecked(1, false);
282 fontMenu->setItemChecked(2, true); 298 fontMenu->setItemChecked(2, true);
283 abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) ); 299 abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
284 currentFont = new QFont (abList->font()); 300 currentFont = new QFont (abList->font());
285 abList->resizeRows(currentFont->pixelSize() + 7); 301 abList->resizeRows(currentFont->pixelSize() + 7);
286 break; 302 break;
287 } 303 }
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 ) {
305// QString msg = tr("You received a vCard for\n%1.\nDo You want to add it to your\naddressbook?") 321// QString msg = tr("You received a vCard for\n%1.\nDo You want to add it to your\naddressbook?")
306// .arg( (*it).fullName() ); 322// .arg( (*it).fullName() );
307// if ( QMessageBox::information( this, tr("received contact"), msg, QMessageBox::Ok, QMessageBox::Cancel ) == 323// if ( QMessageBox::information( this, tr("received contact"), msg, QMessageBox::Ok, QMessageBox::Cancel ) ==
308// QMessageBox::Ok ) { 324// QMessageBox::Ok ) {
309 abList->addEntry( *it ); 325 abList->addEntry( *it );
310// } 326// }
311 } 327 }
312 328
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
@@ -46,33 +46,33 @@ protected:
46 void resizeEvent( QResizeEvent * e ); 46 void resizeEvent( QResizeEvent * e );
47 void showList(); 47 void showList();
48 void showView(); 48 void showView();
49 enum EntryMode { NewEntry=0, EditEntry }; 49 enum EntryMode { NewEntry=0, EditEntry };
50 void editPersonal(); 50 void editPersonal();
51 void editEntry( EntryMode ); 51 void editEntry( EntryMode );
52 void closeEvent( QCloseEvent *e ); 52 void closeEvent( QCloseEvent *e );
53 bool save(); 53 bool save();
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();
71 void writeMail(); 71 void writeMail();
72 void slotBeam(); 72 void slotBeam();
73 void beamDone( Ir * ); 73 void beamDone( Ir * );
74 void slotFind(); 74 void slotFind();
75 void slotSetCategory( int ); 75 void slotSetCategory( int );
76 void slotSetLetter( char ); 76 void slotSetLetter( char );
77 void slotUpdateToolbar(); 77 void slotUpdateToolbar();
78 void slotSetFont(int); 78 void slotSetFont(int);
@@ -81,28 +81,28 @@ private:
81 AbLabel *abView(); 81 AbLabel *abView();
82 void populateCategories(); 82 void populateCategories();
83 83
84 QPopupMenu *catMenu, *fontMenu; 84 QPopupMenu *catMenu, *fontMenu;
85 QPEToolBar *listTools; 85 QPEToolBar *listTools;
86 QToolButton *deleteButton; 86 QToolButton *deleteButton;
87 QValueList<int> allFields, 87 QValueList<int> allFields,
88 orderedFields; 88 orderedFields;
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;
106}; 106};
107 107
108#endif 108#endif