author | ulf69 <ulf69> | 2004-08-05 22:50:37 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-05 22:50:37 (UTC) |
commit | c807547c32dd25e9d181d396590af9915b7a1166 (patch) (unidiff) | |
tree | 0950df8ef9653ab30e2faebf67bdd254e0ec1b8a /kaddressbook | |
parent | bb1dd236b41cbd5cc4aed3b320801aa07974122d (diff) | |
download | kdepimpi-c807547c32dd25e9d181d396590af9915b7a1166.zip kdepimpi-c807547c32dd25e9d181d396590af9915b7a1166.tar.gz kdepimpi-c807547c32dd25e9d181d396590af9915b7a1166.tar.bz2 |
enabled the sending of emails to selected contacts, and mailing of vCards
-rw-r--r-- | kaddressbook/kabcore.cpp | 254 | ||||
-rw-r--r-- | kaddressbook/kabprefs.cpp | 47 | ||||
-rw-r--r-- | kaddressbook/kabprefs.h | 58 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 167 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.h | 48 |
5 files changed, 367 insertions, 207 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a7ca0ce..2a54900 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -22,5 +22,5 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "kabcore.h" | 24 | #include "kabcore.h" |
25 | 25 | ||
26 | #include <stdaddressbook.h> | 26 | #include <stdaddressbook.h> |
@@ -79,6 +79,12 @@ | |||
79 | #include <kcmkabconfig.h> | 79 | #include <kcmkabconfig.h> |
80 | 80 | ||
81 | //US#include <qpe/resource.h> // needed for Resource::loadPixmap | ||
82 | //#include <qlabel.h> | 81 | //#include <qlabel.h> |
82 | |||
83 | |||
84 | #ifdef Q_WS_QWS | ||
85 | #include <qtopia/services.h> | ||
86 | #include <qtopia/qcopenvelope_qws.h> | ||
87 | #endif | ||
88 | |||
83 | #endif // KAB_EMBEDDED | 89 | #endif // KAB_EMBEDDED |
84 | #include <kcmkabconfig.h> | 90 | #include <kcmkabconfig.h> |
@@ -92,9 +98,15 @@ | |||
92 | 98 | ||
93 | //US#include <qsplitter.h> | 99 | //US#include <qsplitter.h> |
100 | #include <qmap.h> | ||
101 | #include <qdir.h> | ||
102 | #include <qfile.h> | ||
94 | #include <qvbox.h> | 103 | #include <qvbox.h> |
95 | #include <qlayout.h> | 104 | #include <qlayout.h> |
96 | #include <qclipboard.h> | 105 | #include <qclipboard.h> |
106 | #include <qtextstream.h> | ||
97 | 107 | ||
98 | #include <libkdepim/categoryselectdialog.h> | 108 | #include <libkdepim/categoryselectdialog.h> |
109 | #include <kabc/vcardconverter.h> | ||
110 | |||
99 | 111 | ||
100 | #include "addresseeutil.h" | 112 | #include "addresseeutil.h" |
@@ -130,8 +142,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
130 | #endif //KAB_EMBEDDED | 142 | #endif //KAB_EMBEDDED |
131 | { | 143 | { |
132 | #ifdef KAB_EMBEDDED | 144 | |
133 | //US we define here our own global actioncollection. | ||
134 | //mActionCollection = new KActionCollection(this); | ||
135 | #endif //KAB_EMBEDDED | ||
136 | mExtensionBarSplitter = 0; | 145 | mExtensionBarSplitter = 0; |
137 | mIsPart = !parent->inherits( "KAddressBookMain" ); | 146 | mIsPart = !parent->inherits( "KAddressBookMain" ); |
@@ -143,5 +152,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
143 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); | 152 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); |
144 | #endif //KAB_EMBEDDED | 153 | #endif //KAB_EMBEDDED |
145 | 154 | ||
146 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), | 155 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), |
147 | SLOT( addressBookChanged() ) ); | 156 | SLOT( addressBookChanged() ) ); |
@@ -163,6 +172,6 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
163 | mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, | 172 | mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, |
164 | "X-Anniversary", "KADDRESSBOOK" ); | 173 | "X-Anniversary", "KADDRESSBOOK" ); |
165 | 174 | ||
166 | //US added this field to become compatible with Opie/qtopia addressbook | 175 | //US added this field to become compatible with Opie/qtopia addressbook |
167 | // values can be "female" or "male" or "". An empty field represents undefined. | 176 | // values can be "female" or "male" or "". An empty field represents undefined. |
168 | mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, | 177 | mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, |
@@ -196,11 +205,12 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
196 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 205 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
197 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 206 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
198 | 207 | ||
208 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | ||
209 | SLOT( sendMail( const QString& ) ) ); | ||
210 | |||
199 | #ifndef KAB_EMBEDDED | 211 | #ifndef KAB_EMBEDDED |
200 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 212 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
201 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 213 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
202 | 214 | ||
203 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | ||
204 | SLOT( sendMail( const QString& ) ) ); | ||
205 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 215 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
206 | SLOT( browse( const QString& ) ) ); | 216 | SLOT( browse( const QString& ) ) ); |
@@ -222,10 +232,4 @@ KABCore::~KABCore() | |||
222 | mAddressBook = 0; | 232 | mAddressBook = 0; |
223 | KABC::StdAddressBook::close(); | 233 | KABC::StdAddressBook::close(); |
224 | |||
225 | #ifdef KAB_EMBEDDED | ||
226 | //US we define here our own global actioncollection. | ||
227 | // delete mActionCollection; | ||
228 | #endif //KAB_EMBEDDED | ||
229 | |||
230 | } | 234 | } |
231 | 235 | ||
@@ -236,5 +240,5 @@ void KABCore::restoreSettings() | |||
236 | mActionJumpBar->setChecked( state ); | 240 | mActionJumpBar->setChecked( state ); |
237 | setJumpButtonBarVisible( state ); | 241 | setJumpButtonBarVisible( state ); |
238 | 242 | ||
239 | state = KABPrefs::instance()->mDetailsPageVisible; | 243 | state = KABPrefs::instance()->mDetailsPageVisible; |
240 | 244 | ||
@@ -295,7 +299,7 @@ void KABCore::saveSettings() | |||
295 | mExtensionManager->saveSettings(); | 299 | mExtensionManager->saveSettings(); |
296 | mViewManager->saveSettings(); | 300 | mViewManager->saveSettings(); |
297 | 301 | ||
298 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); | 302 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); |
299 | 303 | ||
300 | } | 304 | } |
301 | 305 | ||
@@ -379,7 +383,7 @@ void KABCore::createAboutData() | |||
379 | return about; | 383 | return about; |
380 | #endif //KAB_EMBEDDED | 384 | #endif //KAB_EMBEDDED |
381 | 385 | ||
382 | QString version; | 386 | QString version; |
383 | #include <../version> | 387 | #include <../version> |
384 | QMessageBox::about( this, "About KAddressbook/Pi", | 388 | QMessageBox::about( this, "About KAddressbook/Pi", |
385 | "KAddressbook/Platform-independent\n" | 389 | "KAddressbook/Platform-independent\n" |
@@ -391,5 +395,5 @@ void KABCore::createAboutData() | |||
391 | "for: Zaurus 5500 / 7x0 / 8x0\n" | 395 | "for: Zaurus 5500 / 7x0 / 8x0\n" |
392 | #endif | 396 | #endif |
393 | 397 | ||
394 | "(c) 2004 Ulf Schenk\n" | 398 | "(c) 2004 Ulf Schenk\n" |
395 | "(c) 1997-2003, The KDE PIM Team\n" | 399 | "(c) 1997-2003, The KDE PIM Team\n" |
@@ -419,5 +423,5 @@ void KABCore::setContactSelected( const QString &uid ) | |||
419 | if ( pic.isIntern() ) { | 423 | if ( pic.isIntern() ) { |
420 | //US emit contactSelected( pic.data() ); | 424 | //US emit contactSelected( pic.data() ); |
421 | //US instead use: | 425 | //US instead use: |
422 | QPixmap px; | 426 | QPixmap px; |
423 | if (pic.data().isNull() != true) | 427 | if (pic.data().isNull() != true) |
@@ -425,5 +429,5 @@ void KABCore::setContactSelected( const QString &uid ) | |||
425 | px.convertFromImage(pic.data()); | 429 | px.convertFromImage(pic.data()); |
426 | } | 430 | } |
427 | 431 | ||
428 | emit contactSelected( px ); | 432 | emit contactSelected( px ); |
429 | } | 433 | } |
@@ -452,36 +456,48 @@ void KABCore::setContactSelected( const QString &uid ) | |||
452 | void KABCore::sendMail() | 456 | void KABCore::sendMail() |
453 | { | 457 | { |
454 | #ifndef KAB_EMBEDDED | ||
455 | sendMail( mViewManager->selectedEmails().join( ", " ) ); | 458 | sendMail( mViewManager->selectedEmails().join( ", " ) ); |
456 | #else //KAB_EMBEDDED | ||
457 | qDebug("KABCore::sendMail() ust be fixed"); | ||
458 | #endif //KAB_EMBEDDED | ||
459 | } | 459 | } |
460 | 460 | ||
461 | void KABCore::sendMail( const QString& email ) | 461 | void KABCore::sendMail( const QString& email ) |
462 | { | 462 | { |
463 | #ifndef KAB_EMBEDDED | 463 | //US original kde implementation : kapp->invokeMailer( email, "" ); |
464 | kapp->invokeMailer( email, "" ); | 464 | |
465 | #else //KAB_EMBEDDED | 465 | /*US original qtopia implementation |
466 | qDebug("KABCore::sendMail(const QString& email) ust be fixed"); | 466 | PimContact c = abList->currentEntry(); |
467 | #endif //KAB_EMBEDDED | 467 | QString name = c.fileAs(); |
468 | QString email = c.defaultEmail(); | ||
469 | #ifndef QT_NO_COP | ||
470 | QCopEnvelope e(Service::channel("Email"), "writeMail(QString,QString)"); | ||
471 | e << name << email; | ||
472 | #else | ||
473 | */ | ||
474 | |||
475 | |||
476 | #ifndef QT_NO_COP | ||
477 | QCString channel = KABPrefs::instance()->mEmailChannel.latin1(); | ||
478 | qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")"); | ||
479 | |||
480 | QCopEnvelope e(channel, "writeMail(QString,QString)"); | ||
481 | //US we need no names in the To field. The emailadresses are enough | ||
482 | e << "" << email; | ||
483 | #else | ||
484 | KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) ); | ||
485 | #endif | ||
468 | } | 486 | } |
469 | 487 | ||
470 | void KABCore::mailVCard() | 488 | void KABCore::mailVCard() |
471 | { | 489 | { |
472 | #ifndef KAB_EMBEDDED | ||
473 | QStringList uids = mViewManager->selectedUids(); | 490 | QStringList uids = mViewManager->selectedUids(); |
474 | if ( !uids.isEmpty() ) | 491 | if ( !uids.isEmpty() ) |
475 | mailVCard( uids ); | 492 | mailVCard( uids ); |
476 | #else //KAB_EMBEDDED | ||
477 | qDebug("KABCore::mailVCard() must be fixed"); | ||
478 | #endif //KAB_EMBEDDED | ||
479 | } | 493 | } |
480 | 494 | ||
481 | void KABCore::mailVCard( const QStringList& uids ) | 495 | void KABCore::mailVCard( const QStringList& uids ) |
482 | { | 496 | { |
483 | #ifndef KAB_EMBEDDED | ||
484 | QStringList urls; | 497 | QStringList urls; |
485 | 498 | ||
499 | QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); | ||
500 | |||
501 | /*US | ||
486 | // Create a temp dir, so that we can put the files in it with proper names | 502 | // Create a temp dir, so that we can put the files in it with proper names |
487 | KTempFile tempDir; | 503 | KTempFile tempDir; |
@@ -493,4 +509,9 @@ void KABCore::mailVCard( const QStringList& uids ) | |||
493 | QString dirName = tempDir.name(); | 509 | QString dirName = tempDir.name(); |
494 | tempDir.unlink(); | 510 | tempDir.unlink(); |
511 | */ | ||
512 | QString dirName = tmpdir + "/" + KApplication::randomString( 8 ); | ||
513 | |||
514 | |||
515 | |||
495 | QDir().mkdir( dirName, true ); | 516 | QDir().mkdir( dirName, true ); |
496 | 517 | ||
@@ -521,5 +542,5 @@ void KABCore::mailVCard( const QStringList& uids ) | |||
521 | } | 542 | } |
522 | } | 543 | } |
523 | 544 | /*US | |
524 | kapp->invokeMailer( QString::null, QString::null, QString::null, | 545 | kapp->invokeMailer( QString::null, QString::null, QString::null, |
525 | QString::null, // subject | 546 | QString::null, // subject |
@@ -527,7 +548,18 @@ void KABCore::mailVCard( const QStringList& uids ) | |||
527 | QString::null, | 548 | QString::null, |
528 | urls ); // attachments | 549 | urls ); // attachments |
529 | #else //KAB_EMBEDDED | 550 | */ |
530 | qDebug("KABCore::mailVCard( must be fixed"); | 551 | #ifndef QT_NO_COP |
531 | #endif //KAB_EMBEDDED | 552 | QCString channel = KABPrefs::instance()->mEmailChannel.latin1(); |
553 | qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")"); | ||
554 | |||
555 | QMap<QString, QString> parameterMap; | ||
556 | parameterMap.insert("ATTACHMENT<n>", urls.join(", ")); | ||
557 | |||
558 | QCopEnvelope e(channel, "writeMail(QMap(QString,QString))"); | ||
559 | e << parameterMap; | ||
560 | #else | ||
561 | KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) ); | ||
562 | #endif | ||
563 | |||
532 | 564 | ||
533 | } | 565 | } |
@@ -753,5 +785,5 @@ void KABCore::setModified( bool modified ) | |||
753 | mViewManager->refreshView(); | 785 | mViewManager->refreshView(); |
754 | mDetails->refreshView(); | 786 | mDetails->refreshView(); |
755 | 787 | ||
756 | } | 788 | } |
757 | 789 | ||
@@ -763,5 +795,5 @@ bool KABCore::modified() const | |||
763 | void KABCore::contactModified( const KABC::Addressee &addr ) | 795 | void KABCore::contactModified( const KABC::Addressee &addr ) |
764 | { | 796 | { |
765 | 797 | ||
766 | Command *command = 0; | 798 | Command *command = 0; |
767 | QString uid; | 799 | QString uid; |
@@ -807,12 +839,12 @@ void KABCore::newContact() | |||
807 | addr.setResource( resource ); | 839 | addr.setResource( resource ); |
808 | mEditorDialog->setAddressee( addr ); | 840 | mEditorDialog->setAddressee( addr ); |
809 | KApplication::execDialog ( mEditorDialog ); | 841 | KApplication::execDialog ( mEditorDialog ); |
810 | 842 | ||
811 | } else | 843 | } else |
812 | return; | 844 | return; |
813 | 845 | ||
814 | // mEditorDict.insert( dialog->addressee().uid(), dialog ); | 846 | // mEditorDict.insert( dialog->addressee().uid(), dialog ); |
815 | 847 | ||
816 | 848 | ||
817 | } | 849 | } |
818 | 850 | ||
@@ -889,5 +921,5 @@ void KABCore::importVCard( const QString &vCard, bool showPreview ) | |||
889 | } | 921 | } |
890 | 922 | ||
891 | //US added a second method without defaultparameter | 923 | //US added a second method without defaultparameter |
892 | void KABCore::editContact2() { | 924 | void KABCore::editContact2() { |
893 | editContact( QString::null ); | 925 | editContact( QString::null ); |
@@ -982,5 +1014,5 @@ void KABCore::setDetailsVisible( bool visible ) | |||
982 | void KABCore::extensionModified( const KABC::Addressee::List &list ) | 1014 | void KABCore::extensionModified( const KABC::Addressee::List &list ) |
983 | { | 1015 | { |
984 | 1016 | ||
985 | if ( list.count() != 0 ) { | 1017 | if ( list.count() != 0 ) { |
986 | KABC::Addressee::List::ConstIterator it; | 1018 | KABC::Addressee::List::ConstIterator it; |
@@ -989,5 +1021,5 @@ void KABCore::extensionModified( const KABC::Addressee::List &list ) | |||
989 | if ( list.count() > 1 ) | 1021 | if ( list.count() > 1 ) |
990 | setModified(); | 1022 | setModified(); |
991 | else | 1023 | else |
992 | setModifiedWOrefresh(); | 1024 | setModifiedWOrefresh(); |
993 | } | 1025 | } |
@@ -997,5 +1029,5 @@ void KABCore::extensionModified( const KABC::Addressee::List &list ) | |||
997 | mViewManager->refreshView( list[ 0 ].uid() ); | 1029 | mViewManager->refreshView( list[ 0 ].uid() ); |
998 | 1030 | ||
999 | 1031 | ||
1000 | 1032 | ||
1001 | } | 1033 | } |
@@ -1029,5 +1061,5 @@ QString KABCore::getNameByPhone( const QString &phone ) | |||
1029 | return ""; | 1061 | return ""; |
1030 | #endif //KAB_EMBEDDED | 1062 | #endif //KAB_EMBEDDED |
1031 | 1063 | ||
1032 | } | 1064 | } |
1033 | 1065 | ||
@@ -1186,5 +1218,5 @@ void KABCore::initGUI() | |||
1186 | 1218 | ||
1187 | #else //KAB_EMBEDDED | 1219 | #else //KAB_EMBEDDED |
1188 | //US initialize viewMenu before settingup viewmanager. | 1220 | //US initialize viewMenu before settingup viewmanager. |
1189 | // Viewmanager needs this menu to plugin submenues. | 1221 | // Viewmanager needs this menu to plugin submenues. |
1190 | viewMenu = new QPopupMenu( this ); | 1222 | viewMenu = new QPopupMenu( this ); |
@@ -1203,5 +1235,5 @@ void KABCore::initGUI() | |||
1203 | // = new QHBoxLayout( this ); | 1235 | // = new QHBoxLayout( this ); |
1204 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); | 1236 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); |
1205 | 1237 | ||
1206 | // QWidget *mainBox = new QWidget( this ); | 1238 | // QWidget *mainBox = new QWidget( this ); |
1207 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); | 1239 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); |
@@ -1210,8 +1242,8 @@ void KABCore::initGUI() | |||
1210 | topLayout = new QHBoxLayout( this ); | 1242 | topLayout = new QHBoxLayout( this ); |
1211 | 1243 | ||
1212 | 1244 | ||
1213 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1245 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1214 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1246 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1215 | 1247 | ||
1216 | topLayout->addWidget(mMiniSplitter ); | 1248 | topLayout->addWidget(mMiniSplitter ); |
1217 | 1249 | ||
@@ -1232,16 +1264,16 @@ void KABCore::initGUI() | |||
1232 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1264 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1233 | } | 1265 | } |
1234 | 1266 | ||
1235 | topLayout->addWidget(mMiniSplitter ); | 1267 | topLayout->addWidget(mMiniSplitter ); |
1236 | mViewManager = new ViewManager( this, mMiniSplitter ); | 1268 | mViewManager = new ViewManager( this, mMiniSplitter ); |
1237 | mDetails = new ViewContainer( mMiniSplitter ); | 1269 | mDetails = new ViewContainer( mMiniSplitter ); |
1238 | 1270 | ||
1239 | 1271 | ||
1240 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); | 1272 | mExtensionManager = new ExtensionManager( this, mMiniSplitter ); |
1241 | #endif | 1273 | #endif |
1242 | //eh->hide(); | 1274 | //eh->hide(); |
1243 | // topLayout->addWidget(mExtensionManager ); | 1275 | // topLayout->addWidget(mExtensionManager ); |
1244 | 1276 | ||
1245 | 1277 | ||
1246 | /*US | 1278 | /*US |
1247 | #ifndef KAB_NOSPLITTER | 1279 | #ifndef KAB_NOSPLITTER |
@@ -1258,5 +1290,5 @@ void KABCore::initGUI() | |||
1258 | 1290 | ||
1259 | mDetails = new ViewContainer( mDetailsSplitter ); | 1291 | mDetails = new ViewContainer( mDetailsSplitter ); |
1260 | 1292 | ||
1261 | topLayout->addWidget( mDetailsSplitter ); | 1293 | topLayout->addWidget( mDetailsSplitter ); |
1262 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1294 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
@@ -1281,5 +1313,5 @@ void KABCore::initGUI() | |||
1281 | */ | 1313 | */ |
1282 | 1314 | ||
1283 | 1315 | ||
1284 | #endif //KAB_EMBEDDED | 1316 | #endif //KAB_EMBEDDED |
1285 | initActions(); | 1317 | initActions(); |
@@ -1299,24 +1331,24 @@ void KABCore::initGUI() | |||
1299 | SLOT( incrementalSearch( const QString& ) ) ); | 1331 | SLOT( incrementalSearch( const QString& ) ) ); |
1300 | 1332 | ||
1301 | 1333 | ||
1302 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1334 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1303 | 1335 | ||
1304 | topLayout->addWidget( mJumpButtonBar ); | 1336 | topLayout->addWidget( mJumpButtonBar ); |
1305 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); | 1337 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); |
1306 | 1338 | ||
1307 | // mMainWindow->getIconToolBar()->raise(); | 1339 | // mMainWindow->getIconToolBar()->raise(); |
1308 | 1340 | ||
1309 | #endif //KAB_EMBEDDED | 1341 | #endif //KAB_EMBEDDED |
1310 | 1342 | ||
1311 | } | 1343 | } |
1312 | void KABCore::initActions() | 1344 | void KABCore::initActions() |
1313 | { | 1345 | { |
1314 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 1346 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
1315 | 1347 | ||
1316 | #ifndef KAB_EMBEDDED | 1348 | #ifndef KAB_EMBEDDED |
1317 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), | 1349 | connect( QApplication::clipboard(), SIGNAL( dataChanged() ), |
1318 | SLOT( clipboardDataChanged() ) ); | 1350 | SLOT( clipboardDataChanged() ) ); |
1319 | #endif //KAB_EMBEDDED | 1351 | #endif //KAB_EMBEDDED |
1320 | 1352 | ||
1321 | // file menu | 1353 | // file menu |
1322 | if ( mIsPart ) { | 1354 | if ( mIsPart ) { |
@@ -1331,11 +1363,11 @@ void KABCore::initActions() | |||
1331 | mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); | 1363 | mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); |
1332 | } | 1364 | } |
1333 | 1365 | ||
1334 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, | 1366 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, |
1335 | SLOT( save() ), actionCollection(), "file_sync" ); | 1367 | SLOT( save() ), actionCollection(), "file_sync" ); |
1336 | 1368 | ||
1337 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, | 1369 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, |
1338 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); | 1370 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); |
1339 | 1371 | ||
1340 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, | 1372 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, |
1341 | this, SLOT( mailVCard() ), | 1373 | this, SLOT( mailVCard() ), |
@@ -1352,5 +1384,5 @@ void KABCore::initActions() | |||
1352 | actionCollection(), "quit" ); | 1384 | actionCollection(), "quit" ); |
1353 | #endif //KAB_EMBEDDED | 1385 | #endif //KAB_EMBEDDED |
1354 | 1386 | ||
1355 | // edit menu | 1387 | // edit menu |
1356 | if ( mIsPart ) { | 1388 | if ( mIsPart ) { |
@@ -1388,5 +1420,5 @@ void KABCore::initActions() | |||
1388 | mActionUndo->setEnabled( false ); | 1420 | mActionUndo->setEnabled( false ); |
1389 | mActionRedo->setEnabled( false ); | 1421 | mActionRedo->setEnabled( false ); |
1390 | 1422 | ||
1391 | // settings menu | 1423 | // settings menu |
1392 | #ifdef KAB_EMBEDDED | 1424 | #ifdef KAB_EMBEDDED |
@@ -1397,10 +1429,10 @@ void KABCore::initActions() | |||
1397 | "kaddressbook_configure_resources" ); | 1429 | "kaddressbook_configure_resources" ); |
1398 | #endif //KAB_EMBEDDED | 1430 | #endif //KAB_EMBEDDED |
1399 | 1431 | ||
1400 | if ( mIsPart ) { | 1432 | if ( mIsPart ) { |
1401 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, | 1433 | mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, |
1402 | SLOT( openConfigDialog() ), actionCollection(), | 1434 | SLOT( openConfigDialog() ), actionCollection(), |
1403 | "kaddressbook_configure" ); | 1435 | "kaddressbook_configure" ); |
1404 | 1436 | ||
1405 | mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, | 1437 | mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, |
1406 | this, SLOT( configureKeyBindings() ), actionCollection(), | 1438 | this, SLOT( configureKeyBindings() ), actionCollection(), |
@@ -1410,22 +1442,22 @@ void KABCore::initActions() | |||
1410 | mActionConfigureToolbars->setEnabled( false ); | 1442 | mActionConfigureToolbars->setEnabled( false ); |
1411 | #endif //KAB_EMBEDDED | 1443 | #endif //KAB_EMBEDDED |
1412 | 1444 | ||
1413 | } else { | 1445 | } else { |
1414 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); | 1446 | mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); |
1415 | 1447 | ||
1416 | mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); | 1448 | mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); |
1417 | } | 1449 | } |
1418 | 1450 | ||
1419 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, | 1451 | mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, |
1420 | actionCollection(), "options_show_jump_bar" ); | 1452 | actionCollection(), "options_show_jump_bar" ); |
1421 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); | 1453 | connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); |
1422 | 1454 | ||
1423 | mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0, | 1455 | mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0, |
1424 | actionCollection(), "options_show_details" ); | 1456 | actionCollection(), "options_show_details" ); |
1425 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); | 1457 | connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); |
1426 | 1458 | ||
1427 | // misc | 1459 | // misc |
1428 | // only enable LDAP lookup if we can handle the protocol | 1460 | // only enable LDAP lookup if we can handle the protocol |
1429 | #ifndef KAB_EMBEDDED | 1461 | #ifndef KAB_EMBEDDED |
1430 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { | 1462 | if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { |
1431 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, | 1463 | new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, |
@@ -1433,8 +1465,8 @@ void KABCore::initActions() | |||
1433 | "ldap_lookup" ); | 1465 | "ldap_lookup" ); |
1434 | } | 1466 | } |
1435 | #else //KAB_EMBEDDED | 1467 | #else //KAB_EMBEDDED |
1436 | //qDebug("KABCore::initActions() LDAP has to be implemented"); | 1468 | //qDebug("KABCore::initActions() LDAP has to be implemented"); |
1437 | #endif //KAB_EMBEDDED | 1469 | #endif //KAB_EMBEDDED |
1438 | 1470 | ||
1439 | 1471 | ||
1440 | mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, | 1472 | mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, |
@@ -1458,5 +1490,5 @@ void KABCore::initActions() | |||
1458 | "kaddressbook_about_data" ); | 1490 | "kaddressbook_about_data" ); |
1459 | #endif //KAB_EMBEDDED | 1491 | #endif //KAB_EMBEDDED |
1460 | 1492 | ||
1461 | clipboardDataChanged(); | 1493 | clipboardDataChanged(); |
1462 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 1494 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
@@ -1479,5 +1511,5 @@ void KABCore::addActionsManually() | |||
1479 | #ifdef DESKTOP_VERSION | 1511 | #ifdef DESKTOP_VERSION |
1480 | QMenuBar* mb = mMainWindow->menuBar(); | 1512 | QMenuBar* mb = mMainWindow->menuBar(); |
1481 | 1513 | ||
1482 | //US setup menubar. | 1514 | //US setup menubar. |
1483 | //Disable the following block if you do not want to have a menubar. | 1515 | //Disable the following block if you do not want to have a menubar. |
@@ -1490,6 +1522,6 @@ void KABCore::addActionsManually() | |||
1490 | mIncSearchWidget = new IncSearchWidget( tb ); | 1522 | mIncSearchWidget = new IncSearchWidget( tb ); |
1491 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 1523 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
1492 | 1524 | ||
1493 | #else | 1525 | #else |
1494 | //US setup toolbar | 1526 | //US setup toolbar |
1495 | QMenuBar *menuBarTB = new QMenuBar( tb ); | 1527 | QMenuBar *menuBarTB = new QMenuBar( tb ); |
@@ -1498,5 +1530,5 @@ void KABCore::addActionsManually() | |||
1498 | tb->insertWidget(-1, 0, menuBarTB); | 1530 | tb->insertWidget(-1, 0, menuBarTB); |
1499 | mIncSearchWidget = new IncSearchWidget( tb ); | 1531 | mIncSearchWidget = new IncSearchWidget( tb ); |
1500 | 1532 | ||
1501 | tb->enableMoving(false); | 1533 | tb->enableMoving(false); |
1502 | popupBarTB->insertItem( "&File", fileMenu ); | 1534 | popupBarTB->insertItem( "&File", fileMenu ); |
@@ -1519,8 +1551,8 @@ void KABCore::addActionsManually() | |||
1519 | mActionMail->plug( fileMenu ); | 1551 | mActionMail->plug( fileMenu ); |
1520 | fileMenu->insertSeparator(); | 1552 | fileMenu->insertSeparator(); |
1521 | 1553 | ||
1522 | mActionNewContact->plug( fileMenu ); | 1554 | mActionNewContact->plug( fileMenu ); |
1523 | mActionNewContact->plug( tb ); | 1555 | mActionNewContact->plug( tb ); |
1524 | 1556 | ||
1525 | mActionEditAddressee->plug( fileMenu ); | 1557 | mActionEditAddressee->plug( fileMenu ); |
1526 | fileMenu->insertSeparator(); | 1558 | fileMenu->insertSeparator(); |
@@ -1534,5 +1566,5 @@ void KABCore::addActionsManually() | |||
1534 | #ifdef _WIN32_ | 1566 | #ifdef _WIN32_ |
1535 | mActionImportOL->plug( ImportMenu ); | 1567 | mActionImportOL->plug( ImportMenu ); |
1536 | #endif | 1568 | #endif |
1537 | // edit menu | 1569 | // edit menu |
1538 | mActionUndo->plug( editMenu ); | 1570 | mActionUndo->plug( editMenu ); |
@@ -1545,5 +1577,5 @@ void KABCore::addActionsManually() | |||
1545 | editMenu->insertSeparator(); | 1577 | editMenu->insertSeparator(); |
1546 | mActionSelectAll->plug( editMenu ); | 1578 | mActionSelectAll->plug( editMenu ); |
1547 | 1579 | ||
1548 | mActionRemoveVoice->plug( changeMenu ); | 1580 | mActionRemoveVoice->plug( changeMenu ); |
1549 | // settings menu | 1581 | // settings menu |
@@ -1554,15 +1586,15 @@ void KABCore::addActionsManually() | |||
1554 | 1586 | ||
1555 | mActionConfigKAddressbook->plug( settingsMenu ); | 1587 | mActionConfigKAddressbook->plug( settingsMenu ); |
1556 | 1588 | ||
1557 | if ( mIsPart ) { | 1589 | if ( mIsPart ) { |
1558 | mActionConfigShortcuts->plug( settingsMenu ); | 1590 | mActionConfigShortcuts->plug( settingsMenu ); |
1559 | mActionConfigureToolbars->plug( settingsMenu ); | 1591 | mActionConfigureToolbars->plug( settingsMenu ); |
1560 | 1592 | ||
1561 | } else { | 1593 | } else { |
1562 | mActionKeyBindings->plug( settingsMenu ); | 1594 | mActionKeyBindings->plug( settingsMenu ); |
1563 | } | 1595 | } |
1564 | 1596 | ||
1565 | settingsMenu->insertSeparator(); | 1597 | settingsMenu->insertSeparator(); |
1566 | 1598 | ||
1567 | mActionJumpBar->plug( settingsMenu ); | 1599 | mActionJumpBar->plug( settingsMenu ); |
1568 | mActionDetails->plug( settingsMenu ); | 1600 | mActionDetails->plug( settingsMenu ); |
@@ -1571,13 +1603,13 @@ void KABCore::addActionsManually() | |||
1571 | mActionWhoAmI->plug( settingsMenu ); | 1603 | mActionWhoAmI->plug( settingsMenu ); |
1572 | mActionCategories->plug( settingsMenu ); | 1604 | mActionCategories->plug( settingsMenu ); |
1573 | 1605 | ||
1574 | mActionAboutKAddressbook->plug( helpMenu ); | 1606 | mActionAboutKAddressbook->plug( helpMenu ); |
1575 | 1607 | ||
1576 | 1608 | ||
1577 | if (QApplication::desktop()->width() > 320 ) { | 1609 | if (QApplication::desktop()->width() > 320 ) { |
1578 | 1610 | ||
1579 | mActionEditAddressee->plug( tb ); | 1611 | mActionEditAddressee->plug( tb ); |
1580 | mActionSave->plug( tb ); | 1612 | mActionSave->plug( tb ); |
1581 | mViewManager->getFilterAction()->plug ( tb); | 1613 | mViewManager->getFilterAction()->plug ( tb); |
1582 | if (QApplication::desktop()->width() > 480 ) { | 1614 | if (QApplication::desktop()->width() > 480 ) { |
1583 | mActionUndo->plug( tb ); | 1615 | mActionUndo->plug( tb ); |
@@ -1588,20 +1620,20 @@ void KABCore::addActionsManually() | |||
1588 | //mActionQuit->plug ( tb ); | 1620 | //mActionQuit->plug ( tb ); |
1589 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); | 1621 | // tb->insertWidget(-1, 0, mIncSearchWidget, 6); |
1590 | 1622 | ||
1591 | //US link the searchwidget first to this. | 1623 | //US link the searchwidget first to this. |
1592 | // The real linkage to the toolbar happens later. | 1624 | // The real linkage to the toolbar happens later. |
1593 | //US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); | 1625 | //US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); |
1594 | //US tb->insertItem( mIncSearchWidget ); | 1626 | //US tb->insertItem( mIncSearchWidget ); |
1595 | /*US | 1627 | /*US |
1596 | mIncSearchWidget = new IncSearchWidget( tb ); | 1628 | mIncSearchWidget = new IncSearchWidget( tb ); |
1597 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1629 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1598 | SLOT( incrementalSearch( const QString& ) ) ); | 1630 | SLOT( incrementalSearch( const QString& ) ) ); |
1599 | 1631 | ||
1600 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1632 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1601 | 1633 | ||
1602 | //US topLayout->addWidget( mJumpButtonBar ); | 1634 | //US topLayout->addWidget( mJumpButtonBar ); |
1603 | this->layout()->add( mJumpButtonBar ); | 1635 | this->layout()->add( mJumpButtonBar ); |
1604 | */ | 1636 | */ |
1605 | 1637 | ||
1606 | #endif //KAB_EMBEDDED | 1638 | #endif //KAB_EMBEDDED |
1607 | } | 1639 | } |
@@ -1624,5 +1656,5 @@ void KABCore::removeVoice() | |||
1624 | } | 1656 | } |
1625 | } | 1657 | } |
1626 | 1658 | ||
1627 | } | 1659 | } |
1628 | if ( found ) | 1660 | if ( found ) |
@@ -1635,5 +1667,5 @@ void KABCore::removeVoice() | |||
1635 | void KABCore::clipboardDataChanged() | 1667 | void KABCore::clipboardDataChanged() |
1636 | { | 1668 | { |
1637 | 1669 | ||
1638 | if ( mReadWrite ) | 1670 | if ( mReadWrite ) |
1639 | mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); | 1671 | mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); |
@@ -1674,5 +1706,5 @@ void KABCore::configureResources() | |||
1674 | { | 1706 | { |
1675 | KRES::KCMKResources dlg( this, "" , 0 ); | 1707 | KRES::KCMKResources dlg( this, "" , 0 ); |
1676 | 1708 | ||
1677 | if ( !dlg.exec() ) | 1709 | if ( !dlg.exec() ) |
1678 | return; | 1710 | return; |
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index 5b3b1ab..8bd4b15 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp | |||
@@ -1,22 +1,22 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> | 3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
@@ -47,10 +47,13 @@ KABPrefs::KABPrefs() | |||
47 | addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 ); | 47 | addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 ); |
48 | 48 | ||
49 | #ifdef KAB_EMBEDDED | 49 | #ifdef KAB_EMBEDDED |
50 | addItemBool("AskForQuit",&mAskForQuit,false); | 50 | addItemBool("AskForQuit",&mAskForQuit,false); |
51 | addItemBool("ToolBarHor",&mToolBarHor, true ); | 51 | addItemBool("ToolBarHor",&mToolBarHor, true ); |
52 | addItemBool("ToolBarUp",&mToolBarUp, false ); | 52 | addItemBool("ToolBarUp",&mToolBarUp, false ); |
53 | addItemInt( "EmailChannelType", &mEmailClient, OMPI ); | ||
54 | addItemString( "EmailChannelOther", &mEmailChannel, "" ); | ||
55 | |||
53 | #endif //KAB_EMBEDDED | 56 | #endif //KAB_EMBEDDED |
54 | 57 | ||
55 | KPrefs::setCurrentGroup( "MainWindow" ); | 58 | KPrefs::setCurrentGroup( "MainWindow" ); |
56 | addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false ); | 59 | addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false ); |
@@ -98,5 +101,5 @@ void KABPrefs::setCategoryDefaults() | |||
98 | { | 101 | { |
99 | mCustomCategories.clear(); | 102 | mCustomCategories.clear(); |
100 | 103 | ||
101 | mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" ) | 104 | mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" ) |
102 | << i18n( "Customer" ) << i18n( "Friend" ); | 105 | << i18n( "Customer" ) << i18n( "Friend" ); |
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h index 370fc5b..c81a9a9 100644 --- a/kaddressbook/kabprefs.h +++ b/kaddressbook/kabprefs.h | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> | 3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KABPREFS_H | 24 | #ifndef KABPREFS_H |
@@ -37,5 +37,13 @@ class KABPrefs : public KPimPrefs | |||
37 | 37 | ||
38 | static KABPrefs *instance(); | 38 | static KABPrefs *instance(); |
39 | 39 | ||
40 | enum EMailClients { | ||
41 | OMPI = 0, | ||
42 | QTOPIA = 1, | ||
43 | OPIE = 2, | ||
44 | OTHER = 3 | ||
45 | }; | ||
46 | |||
47 | |||
40 | // General | 48 | // General |
41 | bool mHonorSingleClick; | 49 | bool mHonorSingleClick; |
@@ -50,4 +58,8 @@ class KABPrefs : public KPimPrefs | |||
50 | bool mToolBarUp; | 58 | bool mToolBarUp; |
51 | bool mAskForQuit; | 59 | bool mAskForQuit; |
60 | |||
61 | int mEmailClient; | ||
62 | QString mEmailChannel; | ||
63 | |||
52 | /** Set preferences to default values */ | 64 | /** Set preferences to default values */ |
53 | // void usrSetDefaults(); | 65 | // void usrSetDefaults(); |
@@ -60,5 +72,5 @@ class KABPrefs : public KPimPrefs | |||
60 | #endif //KAB_EMBEDDED | 72 | #endif //KAB_EMBEDDED |
61 | 73 | ||
62 | 74 | ||
63 | // GUI | 75 | // GUI |
64 | bool mJumpButtonBarVisible; | 76 | bool mJumpButtonBarVisible; |
@@ -79,8 +91,8 @@ class KABPrefs : public KPimPrefs | |||
79 | 91 | ||
80 | void setCategoryDefaults(); | 92 | void setCategoryDefaults(); |
81 | 93 | ||
82 | private: | 94 | private: |
83 | KABPrefs(); | 95 | KABPrefs(); |
84 | 96 | ||
85 | static KABPrefs *sInstance; | 97 | static KABPrefs *sInstance; |
86 | }; | 98 | }; |
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 38c7946..1bac26f 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
@@ -28,4 +28,8 @@ | |||
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qtabwidget.h> | 29 | #include <qtabwidget.h> |
30 | #include <qcombobox.h> | ||
31 | #include <qlineedit.h> | ||
32 | #include <qlabel.h> | ||
33 | #include <qfile.h> | ||
30 | 34 | ||
31 | #include <kconfig.h> | 35 | #include <kconfig.h> |
@@ -76,7 +80,7 @@ class ExtensionItem : public QCheckListItem | |||
76 | QString mName; | 80 | QString mName; |
77 | QString mComment; | 81 | QString mComment; |
78 | 82 | ||
79 | #endif //KAB_EMBEDDED | 83 | #endif //KAB_EMBEDDED |
80 | 84 | ||
81 | }; | 85 | }; |
82 | 86 | ||
@@ -94,5 +98,5 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
94 | QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(), | 98 | QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(), |
95 | KDialog::spacingHintSmall() ); | 99 | KDialog::spacingHintSmall() ); |
96 | 100 | //general groupbox | |
97 | QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); | 101 | QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); |
98 | QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() ); | 102 | QVBoxLayout *boxLayout = new QVBoxLayout( groupBox->layout() ); |
@@ -110,4 +114,7 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
110 | layout->addWidget( groupBox ); | 114 | layout->addWidget( groupBox ); |
111 | 115 | ||
116 | |||
117 | //extensions groupbox | ||
118 | |||
112 | groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage ); | 119 | groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions" ), generalPage ); |
113 | boxLayout = new QVBoxLayout( groupBox->layout() ); | 120 | boxLayout = new QVBoxLayout( groupBox->layout() ); |
@@ -122,5 +129,5 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
122 | mExtensionView->addColumn( i18n( "Description" ) ); | 129 | mExtensionView->addColumn( i18n( "Description" ) ); |
123 | mExtensionView->setMaximumHeight(80); | 130 | mExtensionView->setMaximumHeight(80); |
124 | 131 | ||
125 | boxLayout->addWidget( mExtensionView ); | 132 | boxLayout->addWidget( mExtensionView ); |
126 | 133 | ||
@@ -146,6 +153,94 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
146 | tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) ); | 153 | tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) ); |
147 | connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) ); | 154 | connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) ); |
155 | |||
156 | // mailclient page | ||
157 | QWidget *mailclientPage = new QWidget( this ); | ||
158 | layout = new QVBoxLayout( mailclientPage, KDialog::marginHintSmall(), | ||
159 | KDialog::spacingHintSmall() ); | ||
160 | |||
161 | groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), mailclientPage ); | ||
162 | boxLayout = new QVBoxLayout( groupBox->layout() ); | ||
163 | boxLayout->setAlignment( Qt::AlignTop ); | ||
164 | // boxLayout->setMargin(KDialog::marginHintSmall() ); | ||
165 | // groupBox->layout()->setMargin(KDialog::marginHintSmall()) ; | ||
166 | // groupBox->layout()->setSpacing(KDialog::spacingHintSmall()); | ||
167 | // boxLayout->setSpacing( KDialog::spacingHintSmall() ); | ||
168 | |||
169 | mEmailClient = new QComboBox( groupBox ); | ||
170 | mEmailClient->insertItem( i18n("OM/Pi"), KABPrefs::OMPI ); | ||
171 | mEmailClient->insertItem( i18n("Qtopia mail"), KABPrefs::QTOPIA ); | ||
172 | mEmailClient->insertItem( i18n("Opie mail"), KABPrefs::OPIE ); | ||
173 | mEmailClient->insertItem( i18n("Other"), KABPrefs::OTHER ); | ||
174 | boxLayout->addWidget( mEmailClient ); | ||
175 | |||
176 | connect( mEmailClient, SIGNAL( activated( int ) ), | ||
177 | this, SLOT (emailclient_changed( int ) ) ); | ||
178 | |||
179 | QLabel* lab = new QLabel( i18n("Channel:"), groupBox); | ||
180 | boxLayout->addWidget( lab ); | ||
181 | mEmailChannel = new QLineEdit(groupBox); | ||
182 | mEmailChannel->setReadOnly(true); | ||
183 | boxLayout->addWidget( mEmailChannel ); | ||
184 | |||
185 | layout->addWidget( groupBox ); | ||
186 | tabWidget->addTab( mailclientPage, i18n( "Mail" ) ); | ||
187 | |||
188 | |||
189 | |||
148 | } | 190 | } |
149 | 191 | ||
192 | |||
193 | |||
194 | void KABConfigWidget::emailclient_changed( int newClient ) | ||
195 | { | ||
196 | if (newClient == KABPrefs::OTHER) | ||
197 | mEmailChannel->setReadOnly(false); | ||
198 | else | ||
199 | mEmailChannel->setReadOnly(true); | ||
200 | |||
201 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); | ||
202 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); | ||
203 | |||
204 | if (opiepath.isEmpty()) | ||
205 | opiepath = qtopiapath; | ||
206 | |||
207 | QString text = mEmailChannel->text(); | ||
208 | |||
209 | if (newClient == KABPrefs::OPIE) | ||
210 | { | ||
211 | if ( QFile::exists( opiepath + "/bin/opiemail" )) | ||
212 | text = "QPE/Application/opiemail"; | ||
213 | else | ||
214 | text = "FILENOTFOUND: " + opiepath + "/bin/opiemail"; | ||
215 | } | ||
216 | else if (newClient == KABPrefs::QTOPIA) | ||
217 | { | ||
218 | if ( QFile::exists( qtopiapath + "/bin/qtmail" )) | ||
219 | text = "QPE/Application/qtmail"; | ||
220 | else | ||
221 | text = "FILENOTFOUND: " + qtopiapath + "/bin/qtmail"; | ||
222 | |||
223 | } | ||
224 | else if (newClient == KABPrefs::OMPI) | ||
225 | { | ||
226 | if ( QFile::exists( qtopiapath + "/bin/ompi" )) | ||
227 | text = "QPE/Application/ompi"; | ||
228 | else if ( QFile::exists( opiepath + "/bin/ompi" )) | ||
229 | text = "QPE/Application/ompi"; | ||
230 | else | ||
231 | text = "FILENOTFOUND: " + qtopiapath + "/bin/ompi"; | ||
232 | |||
233 | } | ||
234 | else | ||
235 | { | ||
236 | //do nothing if we choosed other | ||
237 | } | ||
238 | |||
239 | mEmailChannel->setText( text ); | ||
240 | |||
241 | |||
242 | } | ||
243 | |||
244 | |||
150 | void KABConfigWidget::restoreSettings() | 245 | void KABConfigWidget::restoreSettings() |
151 | { | 246 | { |
@@ -155,4 +250,8 @@ void KABConfigWidget::restoreSettings() | |||
155 | mNameParsing->setChecked( KABPrefs::instance()->mAutomaticNameParsing ); | 250 | mNameParsing->setChecked( KABPrefs::instance()->mAutomaticNameParsing ); |
156 | mViewsSingleClickBox->setChecked( KABPrefs::instance()->mHonorSingleClick ); | 251 | mViewsSingleClickBox->setChecked( KABPrefs::instance()->mHonorSingleClick ); |
252 | |||
253 | mEmailChannel->setText( KABPrefs::instance()->mEmailChannel ); | ||
254 | mEmailClient->setCurrentItem(KABPrefs::instance()->mEmailClient); | ||
255 | |||
157 | mAddresseeWidget->restoreSettings(); | 256 | mAddresseeWidget->restoreSettings(); |
158 | 257 | ||
@@ -168,4 +267,8 @@ void KABConfigWidget::saveSettings() | |||
168 | KABPrefs::instance()->mAutomaticNameParsing = mNameParsing->isChecked(); | 267 | KABPrefs::instance()->mAutomaticNameParsing = mNameParsing->isChecked(); |
169 | KABPrefs::instance()->mHonorSingleClick = mViewsSingleClickBox->isChecked(); | 268 | KABPrefs::instance()->mHonorSingleClick = mViewsSingleClickBox->isChecked(); |
269 | |||
270 | KABPrefs::instance()->mEmailClient = mEmailClient->currentItem(); | ||
271 | KABPrefs::instance()->mEmailChannel = mEmailChannel->text(); | ||
272 | |||
170 | mAddresseeWidget->saveSettings(); | 273 | mAddresseeWidget->saveSettings(); |
171 | 274 | ||
@@ -181,4 +284,8 @@ void KABConfigWidget::defaults() | |||
181 | mViewsSingleClickBox->setChecked( false ); | 284 | mViewsSingleClickBox->setChecked( false ); |
182 | 285 | ||
286 | mEmailClient->setCurrentItem(KABPrefs::OMPI); | ||
287 | emailclient_changed( KABPrefs::OMPI ); | ||
288 | |||
289 | |||
183 | emit changed( true ); | 290 | emit changed( true ); |
184 | } | 291 | } |
@@ -211,22 +318,22 @@ void KABConfigWidget::restoreExtensionSettings() | |||
211 | 318 | ||
212 | ExtensionItem *item = new ExtensionItem( mExtensionView, "Merge", "Merge", "Merge contacts"); | 319 | ExtensionItem *item = new ExtensionItem( mExtensionView, "Merge", "Merge", "Merge contacts"); |
213 | 320 | ||
214 | item->setFactory( extensionFactory ); | 321 | item->setFactory( extensionFactory ); |
215 | if ( activeExtensions.contains( extensionFactory->identifier() ) ) | 322 | if ( activeExtensions.contains( extensionFactory->identifier() ) ) |
216 | item->setOn( true ); | 323 | item->setOn( true ); |
217 | |||
218 | 324 | ||
219 | 325 | ||
326 | |||
220 | extensionFactory = new DistributionListFactory(); | 327 | extensionFactory = new DistributionListFactory(); |
221 | 328 | ||
222 | item = new ExtensionItem( mExtensionView, "Distribution List", "Distribution List", "Manage Distribution Lists"); | 329 | item = new ExtensionItem( mExtensionView, "Distribution List", "Distribution List", "Manage Distribution Lists"); |
223 | 330 | ||
224 | item->setFactory( extensionFactory ); | 331 | item->setFactory( extensionFactory ); |
225 | if ( activeExtensions.contains( extensionFactory->identifier() ) ) | 332 | if ( activeExtensions.contains( extensionFactory->identifier() ) ) |
226 | item->setOn( true ); | 333 | item->setOn( true ); |
227 | 334 | ||
228 | 335 | ||
229 | #endif //KAB_EMBEDDED | 336 | #endif //KAB_EMBEDDED |
230 | 337 | ||
231 | } | 338 | } |
232 | 339 | ||
@@ -318,5 +425,5 @@ bool ExtensionItem::configWidgetAvailable() const | |||
318 | if ( !extensionFactory ) | 425 | if ( !extensionFactory ) |
319 | return false; | 426 | return false; |
320 | 427 | ||
321 | return extensionFactory->configureWidgetAvailable(); | 428 | return extensionFactory->configureWidgetAvailable(); |
322 | #else //KAB_EMBEDDED | 429 | #else //KAB_EMBEDDED |
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index 0f36d9e..9d1363b 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h | |||
@@ -1,24 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KABCONFIGWIDGET_H | 24 | #ifndef KABCONFIGWIDGET_H |
@@ -30,5 +30,6 @@ class QCheckBox; | |||
30 | class QListViewItem; | 30 | class QListViewItem; |
31 | class QPushButton; | 31 | class QPushButton; |
32 | 32 | class QComboBox; | |
33 | class QLineEdit; | ||
33 | class KListView; | 34 | class KListView; |
34 | 35 | ||
@@ -38,8 +39,8 @@ class KABConfigWidget : public QWidget | |||
38 | { | 39 | { |
39 | Q_OBJECT | 40 | Q_OBJECT |
40 | 41 | ||
41 | public: | 42 | public: |
42 | KABConfigWidget( QWidget *parent, const char *name = 0 ); | 43 | KABConfigWidget( QWidget *parent, const char *name = 0 ); |
43 | 44 | ||
44 | void restoreSettings(); | 45 | void restoreSettings(); |
45 | void saveSettings(); | 46 | void saveSettings(); |
@@ -52,8 +53,11 @@ class KABConfigWidget : public QWidget | |||
52 | void modified(); | 53 | void modified(); |
53 | 54 | ||
55 | |||
56 | |||
54 | private slots: | 57 | private slots: |
55 | void configureExtension(); | 58 | void configureExtension(); |
56 | void selectionChanged( QListViewItem* ); | 59 | void selectionChanged( QListViewItem* ); |
57 | void itemClicked( QListViewItem* ); | 60 | void itemClicked( QListViewItem* ); |
61 | void emailclient_changed( int newClient ); | ||
58 | 62 | ||
59 | private: | 63 | private: |
@@ -66,4 +70,6 @@ class KABConfigWidget : public QWidget | |||
66 | QCheckBox *mViewsSingleClickBox; | 70 | QCheckBox *mViewsSingleClickBox; |
67 | QPushButton *mConfigureButton; | 71 | QPushButton *mConfigureButton; |
72 | QComboBox* mEmailClient; | ||
73 | QLineEdit* mEmailChannel; | ||
68 | 74 | ||
69 | AddresseeWidget *mAddresseeWidget; | 75 | AddresseeWidget *mAddresseeWidget; |