-rw-r--r-- | kabc/addresseeview.cpp | 66 | ||||
-rw-r--r-- | kabc/addresseeview.h | 18 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 7 |
3 files changed, 89 insertions, 2 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index b4717d7..487e8a5 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -25,17 +25,22 @@ | |||
25 | #include <kglobal.h> | 25 | #include <kglobal.h> |
26 | //US#include <kglobalsettings.h> | 26 | //US#include <kglobalsettings.h> |
27 | #include <kiconloader.h> | 27 | #include <kiconloader.h> |
28 | #include <klocale.h> | 28 | #include <klocale.h> |
29 | //US #include <kstringhandler.h> | 29 | //US #include <kstringhandler.h> |
30 | #include <qscrollview.h> | 30 | #include <qscrollview.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | #include <qfile.h> | 32 | #include <qfile.h> |
33 | #include <qvbox.h> | ||
34 | #include <qlabel.h> | ||
35 | #include <qwidget.h> | ||
36 | #include <qlayout.h> | ||
33 | #include <qapplication.h> | 37 | #include <qapplication.h> |
38 | #include <qpushbutton.h> | ||
34 | 39 | ||
35 | 40 | ||
36 | #include "externalapphandler.h" | 41 | #include "externalapphandler.h" |
37 | #include "addresseeview.h" | 42 | #include "addresseeview.h" |
38 | 43 | ||
39 | 44 | ||
40 | //US #ifndef DESKTOP_VERSION | 45 | //US #ifndef DESKTOP_VERSION |
41 | //US #include <qtopia/qcopenvelope_qws.h> | 46 | //US #include <qtopia/qcopenvelope_qws.h> |
@@ -394,8 +399,69 @@ void AddresseeView::addTag(const QString & tag,const QString & text) | |||
394 | mText.append(tmpStr); | 399 | mText.append(tmpStr); |
395 | } | 400 | } |
396 | else | 401 | else |
397 | { | 402 | { |
398 | str += text + "</" + tag + ">"; | 403 | str += text + "</" + tag + ">"; |
399 | mText.append(str); | 404 | mText.append(str); |
400 | } | 405 | } |
401 | } | 406 | } |
407 | |||
408 | AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent, const char *name ) : KDialogBase(parent,name, | ||
409 | true ,i18n("Conflict! Please choose Adressee!"),Ok|User1|Close,Close, false) | ||
410 | { | ||
411 | findButton( Close )->setText( i18n("Cancel Sync")); | ||
412 | findButton( Ok )->setText( i18n("Remote")); | ||
413 | findButton( User1 )->setText( i18n("Local")); | ||
414 | QWidget* topframe = new QWidget( this ); | ||
415 | //QVBox* topframe = new QVBox( this ); | ||
416 | setMainWidget( topframe ); | ||
417 | QBoxLayout* bl; | ||
418 | if ( QApplication::desktop()->width() < 640 ) { | ||
419 | bl = new QVBoxLayout( topframe ); | ||
420 | |||
421 | } else { | ||
422 | bl = new QHBoxLayout( topframe ); | ||
423 | |||
424 | } | ||
425 | QVBox* subframe = new QVBox( topframe ); | ||
426 | bl->addWidget(subframe ); | ||
427 | QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); | ||
428 | AddresseeView * av = new AddresseeView( subframe ); | ||
429 | av->setAddressee( loc ); | ||
430 | subframe = new QVBox( topframe ); | ||
431 | bl->addWidget(subframe ); | ||
432 | lab = new QLabel( i18n("Remote Addressee"), subframe ); | ||
433 | av = new AddresseeView( subframe ); | ||
434 | av->setAddressee( rem ); | ||
435 | |||
436 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), | ||
437 | SLOT(slot_remote())); | ||
438 | QObject::connect(this,SIGNAL(user1Clicked()), | ||
439 | SLOT(slot_local())); | ||
440 | #ifndef DESKTOP_VERSION | ||
441 | showMaximized(); | ||
442 | #else | ||
443 | resize ( 640, 400 ); | ||
444 | #endif | ||
445 | } | ||
446 | |||
447 | int AddresseeChooser::executeD( bool local ) | ||
448 | { | ||
449 | mSyncResult = 3; | ||
450 | if ( local ) | ||
451 | findButton( User1 )->setFocus(); | ||
452 | else | ||
453 | findButton( Ok )->setFocus(); | ||
454 | exec(); | ||
455 | qDebug("returning %d ",mSyncResult ); | ||
456 | return mSyncResult; | ||
457 | } | ||
458 | void AddresseeChooser::slot_remote() | ||
459 | { | ||
460 | mSyncResult = 2; | ||
461 | accept(); | ||
462 | } | ||
463 | void AddresseeChooser::slot_local() | ||
464 | { | ||
465 | mSyncResult = 1; | ||
466 | accept(); | ||
467 | } | ||
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h index 1865fc4..689d997 100644 --- a/kabc/addresseeview.h +++ b/kabc/addresseeview.h | |||
@@ -18,16 +18,17 @@ | |||
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifndef KPIM_ADDRESSEEVIEW_H | 22 | #ifndef KPIM_ADDRESSEEVIEW_H |
23 | #define KPIM_ADDRESSEEVIEW_H | 23 | #define KPIM_ADDRESSEEVIEW_H |
24 | 24 | ||
25 | #include <kabc/addressee.h> | 25 | #include <kabc/addressee.h> |
26 | #include <kdialogbase.h> | ||
26 | 27 | ||
27 | //US #include <ktextbrowser.h> | 28 | //US #include <ktextbrowser.h> |
28 | #include <qtextbrowser.h> | 29 | #include <qtextbrowser.h> |
29 | 30 | ||
30 | namespace KPIM { | 31 | namespace KPIM { |
31 | 32 | ||
32 | //US class AddresseeView : public KTextBrowser | 33 | //US class AddresseeView : public KTextBrowser |
33 | class AddresseeView : public QTextBrowser | 34 | class AddresseeView : public QTextBrowser |
@@ -49,12 +50,29 @@ class AddresseeView : public QTextBrowser | |||
49 | 50 | ||
50 | private: | 51 | private: |
51 | KABC::Addressee mAddressee; | 52 | KABC::Addressee mAddressee; |
52 | QString mText; | 53 | QString mText; |
53 | void addTag(const QString & tag,const QString & text); | 54 | void addTag(const QString & tag,const QString & text); |
54 | class AddresseeViewPrivate; | 55 | class AddresseeViewPrivate; |
55 | AddresseeViewPrivate *d; | 56 | AddresseeViewPrivate *d; |
56 | }; | 57 | }; |
58 | class AddresseeChooser : public KDialogBase | ||
59 | { | ||
60 | Q_OBJECT | ||
61 | |||
62 | public: | ||
63 | AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent = 0, const char *name = 0 ); | ||
64 | |||
65 | int executeD( bool local ); | ||
66 | |||
67 | private: | ||
68 | int mSyncResult; | ||
69 | |||
70 | private slots: | ||
71 | void slot_remote(); | ||
72 | void slot_local(); | ||
73 | |||
74 | }; | ||
57 | 75 | ||
58 | } | 76 | } |
59 | 77 | ||
60 | #endif | 78 | #endif |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 74c10d2..b1a951c 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2647,19 +2647,21 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2647 | getEventViewerDialog()->addIncidence(remote); | 2647 | getEventViewerDialog()->addIncidence(remote); |
2648 | getEventViewerDialog()->setColorMode( 0 ); | 2648 | getEventViewerDialog()->setColorMode( 0 ); |
2649 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); | 2649 | //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); |
2650 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); | 2650 | getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); |
2651 | getEventViewerDialog()->showMe(); | 2651 | getEventViewerDialog()->showMe(); |
2652 | result = getEventViewerDialog()->executeS( localIsNew ); | 2652 | result = getEventViewerDialog()->executeS( localIsNew ); |
2653 | #endif | 2653 | #endif |
2654 | qDebug("conflict! ************************************** "); | 2654 | qDebug("conflict! ************************************** "); |
2655 | result = 1; | 2655 | { |
2656 | KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); | ||
2657 | result = acd.executeD(localIsNew); | ||
2656 | return result; | 2658 | return result; |
2657 | 2659 | } | |
2658 | break; | 2660 | break; |
2659 | case SYNC_PREF_FORCE_LOCAL: | 2661 | case SYNC_PREF_FORCE_LOCAL: |
2660 | return 1; | 2662 | return 1; |
2661 | break; | 2663 | break; |
2662 | case SYNC_PREF_FORCE_REMOTE: | 2664 | case SYNC_PREF_FORCE_REMOTE: |
2663 | return 2; | 2665 | return 2; |
2664 | break; | 2666 | break; |
2665 | 2667 | ||
@@ -2720,16 +2722,17 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2720 | if ( addresseeLSync.revision() != addresseeRSync.revision() ) { | 2722 | if ( addresseeLSync.revision() != addresseeRSync.revision() ) { |
2721 | 2723 | ||
2722 | // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); | 2724 | // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); |
2723 | //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); | 2725 | //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); |
2724 | fullDateRange = true; | 2726 | fullDateRange = true; |
2725 | qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); | 2727 | qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); |
2726 | } | 2728 | } |
2727 | } | 2729 | } |
2730 | fullDateRange = true; // debug only! | ||
2728 | if ( fullDateRange ) | 2731 | if ( fullDateRange ) |
2729 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); | 2732 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); |
2730 | else | 2733 | else |
2731 | mLastAddressbookSync = addresseeLSync.revision(); | 2734 | mLastAddressbookSync = addresseeLSync.revision(); |
2732 | // for resyncing if own file has changed | 2735 | // for resyncing if own file has changed |
2733 | // PENDING fixme later when implemented | 2736 | // PENDING fixme later when implemented |
2734 | #if 0 | 2737 | #if 0 |
2735 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 2738 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |