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 | |
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 | 94 | ||||
-rw-r--r-- | kaddressbook/kabprefs.cpp | 3 | ||||
-rw-r--r-- | kaddressbook/kabprefs.h | 12 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 109 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.h | 8 | ||||
-rw-r--r-- | microkde/kdialogbase.cpp | 1 | ||||
-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 3 |
7 files changed, 196 insertions, 34 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a7ca0ce..2a54900 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -77,10 +77,16 @@ | |||
77 | #include <ktoolbar.h> | 77 | #include <ktoolbar.h> |
78 | 78 | ||
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> |
85 | 91 | ||
86 | 92 | ||
@@ -90,13 +96,19 @@ | |||
90 | #include <picture.h> | 96 | #include <picture.h> |
91 | #include <resource.h> | 97 | #include <resource.h> |
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" |
101 | #include "undocmds.h" | 113 | #include "undocmds.h" |
102 | #include "addresseeeditordialog.h" | 114 | #include "addresseeeditordialog.h" |
@@ -128,12 +140,9 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
128 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), | 140 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), |
129 | mReadWrite( readWrite ), mModified( false ) | 141 | mReadWrite( readWrite ), mModified( false ) |
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" ); |
138 | 147 | ||
139 | mAddressBook = KABC::StdAddressBook::self(); | 148 | mAddressBook = KABC::StdAddressBook::self(); |
@@ -195,14 +204,15 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
195 | SLOT( incrementalSearch( const QString& ) ) ); | 204 | SLOT( incrementalSearch( const QString& ) ) ); |
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& ) ) ); |
207 | 217 | ||
208 | mAddressBookService = new KAddressBookService( this ); | 218 | mAddressBookService = new KAddressBookService( this ); |
@@ -220,14 +230,8 @@ KABCore::~KABCore() | |||
220 | //KABPrefs::instance()->writeConfig(); | 230 | //KABPrefs::instance()->writeConfig(); |
221 | delete AddresseeConfig::instance(); | 231 | delete AddresseeConfig::instance(); |
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 | ||
232 | void KABCore::restoreSettings() | 236 | void KABCore::restoreSettings() |
233 | { | 237 | { |
@@ -450,40 +454,52 @@ void KABCore::setContactSelected( const QString &uid ) | |||
450 | } | 454 | } |
451 | 455 | ||
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; |
488 | if ( tempDir.status() != 0 ) { | 504 | if ( tempDir.status() != 0 ) { |
489 | kdWarning() << strerror( tempDir.status() ) << endl; | 505 | kdWarning() << strerror( tempDir.status() ) << endl; |
@@ -491,8 +507,13 @@ void KABCore::mailVCard( const QStringList& uids ) | |||
491 | } | 507 | } |
492 | 508 | ||
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 | ||
497 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 518 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
498 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 519 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
@@ -519,17 +540,28 @@ void KABCore::mailVCard( const QStringList& uids ) | |||
519 | 540 | ||
520 | urls.append( fileName ); | 541 | urls.append( fileName ); |
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 |
526 | QString::null, // body | 547 | QString::null, // body |
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 | } |
534 | 566 | ||
535 | void KABCore::browse( const QString& url ) | 567 | void KABCore::browse( const QString& url ) |
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index 5b3b1ab..8bd4b15 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp | |||
@@ -49,8 +49,11 @@ KABPrefs::KABPrefs() | |||
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 ); |
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h index 370fc5b..c81a9a9 100644 --- a/kaddressbook/kabprefs.h +++ b/kaddressbook/kabprefs.h | |||
@@ -36,8 +36,16 @@ class KABPrefs : public KPimPrefs | |||
36 | virtual ~KABPrefs(); | 36 | virtual ~KABPrefs(); |
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; |
42 | bool mAutomaticNameParsing; | 50 | bool mAutomaticNameParsing; |
43 | int mCurrentIncSearchField; | 51 | int mCurrentIncSearchField; |
@@ -48,8 +56,12 @@ class KABPrefs : public KPimPrefs | |||
48 | 56 | ||
49 | bool mToolBarHor; | 57 | bool mToolBarHor; |
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(); |
54 | 66 | ||
55 | /** Read preferences from config file */ | 67 | /** Read preferences from config file */ |
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 | |||
@@ -26,8 +26,12 @@ | |||
26 | #include <qgroupbox.h> | 26 | #include <qgroupbox.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
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> |
32 | #include <kdebug.h> | 36 | #include <kdebug.h> |
33 | #include <kdialog.h> | 37 | #include <kdialog.h> |
@@ -92,9 +96,9 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
92 | // General page | 96 | // General page |
93 | QWidget *generalPage = new QWidget( this ); | 97 | QWidget *generalPage = new QWidget( this ); |
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() ); |
99 | boxLayout->setAlignment( Qt::AlignTop ); | 103 | boxLayout->setAlignment( Qt::AlignTop ); |
100 | boxLayout->setMargin(KDialog::marginHintSmall() ); | 104 | boxLayout->setMargin(KDialog::marginHintSmall() ); |
@@ -108,8 +112,11 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
108 | boxLayout->addWidget( mNameParsing ); | 112 | boxLayout->addWidget( mNameParsing ); |
109 | 113 | ||
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() ); |
114 | boxLayout->setAlignment( Qt::AlignTop ); | 121 | boxLayout->setAlignment( Qt::AlignTop ); |
115 | boxLayout->setMargin(KDialog::marginHintSmall()); | 122 | boxLayout->setMargin(KDialog::marginHintSmall()); |
@@ -144,17 +151,109 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
144 | // Addressee page | 151 | // Addressee page |
145 | mAddresseeWidget = new AddresseeWidget( this ); | 152 | mAddresseeWidget = new AddresseeWidget( this ); |
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 | { |
152 | bool blocked = signalsBlocked(); | 247 | bool blocked = signalsBlocked(); |
153 | blockSignals( true ); | 248 | blockSignals( true ); |
154 | 249 | ||
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 | ||
159 | restoreExtensionSettings(); | 258 | restoreExtensionSettings(); |
160 | 259 | ||
@@ -166,8 +265,12 @@ void KABConfigWidget::restoreSettings() | |||
166 | void KABConfigWidget::saveSettings() | 265 | void KABConfigWidget::saveSettings() |
167 | { | 266 | { |
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 | ||
172 | saveExtensionSettings(); | 275 | saveExtensionSettings(); |
173 | KABPrefs::instance()->writeConfig(); | 276 | KABPrefs::instance()->writeConfig(); |
@@ -179,8 +282,12 @@ void KABConfigWidget::defaults() | |||
179 | { | 282 | { |
180 | mNameParsing->setChecked( true ); | 283 | mNameParsing->setChecked( true ); |
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 | } |
185 | 292 | ||
186 | void KABConfigWidget::modified() | 293 | void KABConfigWidget::modified() |
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 | |||
@@ -28,9 +28,10 @@ | |||
28 | 28 | ||
29 | class QCheckBox; | 29 | 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 | ||
35 | class AddresseeWidget; | 36 | class AddresseeWidget; |
36 | 37 | ||
@@ -50,12 +51,15 @@ class KABConfigWidget : public QWidget | |||
50 | 51 | ||
51 | public slots: | 52 | public slots: |
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: |
60 | void restoreExtensionSettings(); | 64 | void restoreExtensionSettings(); |
61 | void saveExtensionSettings(); | 65 | void saveExtensionSettings(); |
@@ -64,8 +68,10 @@ class KABConfigWidget : public QWidget | |||
64 | 68 | ||
65 | QCheckBox *mNameParsing; | 69 | QCheckBox *mNameParsing; |
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; |
70 | }; | 76 | }; |
71 | 77 | ||
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp index c953058..d1f7630 100644 --- a/microkde/kdialogbase.cpp +++ b/microkde/kdialogbase.cpp | |||
@@ -77,9 +77,8 @@ void KDialogBase::init( const QString &caption, int buttonMask, | |||
77 | } else { | 77 | } else { |
78 | mOkButton = 0; | 78 | mOkButton = 0; |
79 | } | 79 | } |
80 | if ( buttonMask & Default ) { | 80 | if ( buttonMask & Default ) { |
81 | qDebug("buttonMask & Default "); | ||
82 | mDefaultButton = new QPushButton( i18n("Default"), this ); | 81 | mDefaultButton = new QPushButton( i18n("Default"), this ); |
83 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); | 82 | connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); |
84 | } else { | 83 | } else { |
85 | mDefaultButton = 0; | 84 | mDefaultButton = 0; |
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index 4136622..13be2ce 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp | |||
@@ -42,8 +42,11 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch | |||
42 | parent, name, modal, true), d(0L) | 42 | parent, name, modal, true), d(0L) |
43 | { | 43 | { |
44 | enableButton(Apply, false); | 44 | enableButton(Apply, false); |
45 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); | 45 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); |
46 | |||
47 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); | ||
48 | |||
46 | _baseGroup = baseGroup; | 49 | _baseGroup = baseGroup; |
47 | mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); | 50 | mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); |
48 | setMainWidget(mMainWidget ); | 51 | setMainWidget(mMainWidget ); |
49 | #ifdef DESKTOP_VERSION | 52 | #ifdef DESKTOP_VERSION |