Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 123 insertions, 0 deletions

diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
new file mode 100644
index 000000000..53acba799
--- /dev/null
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -0,0 +1,123 @@
+/*
+    This file is part of KitchenSync.
+
+    Copyright (c) 2005 Tobias Koenig <[email protected]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#include <kdialog.h>
+#include <klocale.h>
+
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpushbutton.h>
+
+#include "addresseediffalgo.h"
+#include "genericdiffalgo.h"
+#include "htmldiffalgodisplay.h"
+#include "memberinfo.h"
+
+#include "singleconflictdialog.h"
+
+SingleConflictDialog::SingleConflictDialog( QSync::SyncMapping &mapping, QWidget *parent )
+  : ConflictDialog( mapping, parent ), mDiffAlgo( 0 )
+{
+  initGUI();
+
+  QString format = mapping.changeAt( 0 ).objectFormatName();
+  QSync::SyncChange leftChange = mapping.changeAt( 0 );
+  QSync::SyncChange rightChange = mapping.changeAt( 1 );
+
+  if ( format == "file" ) {
+    mDiffAlgo = new KSync::GenericDiffAlgo( leftChange.data(), rightChange.data() );
+  } else if ( format == "vcard" ) {
+  } else if ( format == "calendar" ) {
+  } else if ( format == "xml-contact" ) {
+    mDiffAlgo = new KSync::AddresseeDiffAlgo( leftChange.data(), rightChange.data() );
+  }
+
+  MemberInfo miLeft( leftChange.member() );
+  mDiffAlgoDisplay->setLeftSourceTitle( miLeft.name() );
+  MemberInfo miRight( rightChange.member() );
+  mDiffAlgoDisplay->setRightSourceTitle( miRight.name() );
+
+  if ( mDiffAlgo ) {
+    mDiffAlgo->addDisplay( mDiffAlgoDisplay );
+    mDiffAlgo->run();
+  }
+}
+
+SingleConflictDialog::~SingleConflictDialog()
+{
+  delete mDiffAlgo;
+  mDiffAlgo = 0;
+}
+
+void SingleConflictDialog::useFirstChange()
+{
+  mMapping.solve( mMapping.changeAt( 0 ) );
+
+  accept();
+}
+
+void SingleConflictDialog::useSecondChange()
+{
+  mMapping.solve( mMapping.changeAt( 1 ) );
+
+  accept();
+}
+
+void SingleConflictDialog::duplicateChange()
+{
+  mMapping.duplicate();
+
+  accept();
+}
+
+void SingleConflictDialog::ignoreChange()
+{
+  mMapping.ignore();
+
+  accept();
+}
+
+void SingleConflictDialog::initGUI()
+{
+  QGridLayout *layout = new QGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+
+  layout->addMultiCellWidget( new QLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
+  mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
+
+  layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
+
+  QPushButton *button = new QPushButton( i18n( "Use Item" ), this );
+  connect( button, SIGNAL( clicked() ), SLOT( useFirstChange() ) );
+  layout->addWidget( button, 2, 0 );
+
+  button = new QPushButton( i18n( "Duplicate Items" ), this );
+  connect( button, SIGNAL( clicked() ), SLOT( duplicateChange() ) );
+  layout->addWidget( button, 2, 1 );
+
+  button = new QPushButton( i18n( "Ignore Conflict" ), this );
+  connect( button, SIGNAL( clicked() ), SLOT( ignoreChange() ) );
+  layout->addWidget( button, 2, 2 );
+
+  button = new QPushButton( i18n( "Use Item" ), this );
+  connect( button, SIGNAL( clicked() ), SLOT( useSecondChange() ) );
+  layout->addWidget( button, 2, 3 );
+}
+
+#include "singleconflictdialog.moc"