summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-04 22:45:22 (UTC)
committer ulf69 <ulf69>2004-08-04 22:45:22 (UTC)
commitc3a704f5acda9cf9fee66e5c0b1b864f3b7dd852 (patch) (side-by-side diff)
treedc59744a6d59ba241e793ce051da485d0bf16d06
parentb83866e08ddcc5cb2734801977927f48b53a2e1c (diff)
downloadkdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.zip
kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.tar.gz
kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.tar.bz2
final changes for addressbook sync config dialog
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp2
-rw-r--r--kabc/plugins/dir/resourcedir.cpp2
-rw-r--r--kabc/plugins/file/resourcefile.cpp28
-rw-r--r--kabc/plugins/ldap/resourceldap.cpp2
-rw-r--r--kabc/plugins/opie/resourceopie.cpp2
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp2
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp2
-rw-r--r--kabc/resource.cpp5
-rw-r--r--kabc/resource.h2
-rw-r--r--kabc/stdaddressbook.cpp36
-rw-r--r--kabc/syncprefwidget.cpp681
-rw-r--r--kabc/syncprefwidget.h138
-rw-r--r--microkde/kresources/configdialog.cpp78
-rw-r--r--microkde/kresources/configdialog.h4
-rw-r--r--microkde/kresources/configpage.cpp15
-rw-r--r--microkde/kresources/factory.cpp4
-rw-r--r--microkde/kresources/factory.h5
-rw-r--r--microkde/kresources/resource.h8
-rw-r--r--microkde/kresources/syncwidget.h10
19 files changed, 512 insertions, 514 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 20310a0..c61b387 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -236,5 +236,5 @@ void AddressBook::init(const QString &config, const QString &family )
d = new AddressBookData;
if (config != 0) {
- d->mConfig = new KConfig( config );
+ d->mConfig = new KConfig( locateLocal("config", config) );
// qDebug("AddressBook::init 1 config=%s",config.latin1() );
}
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 29f1e3a..eccd482 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -72,5 +72,5 @@ __declspec(dllexport)
void *init_microkabc_dir()
{
- return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidget>();
+ return new KRES::PluginFactory<ResourceDir,ResourceDirConfig, SyncPrefWidgetContainer>();
}
#ifndef _WIN32_
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index d98efc8..da2e4d7 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -67,5 +67,5 @@ __declspec(dllexport)
void *init_microkabc_file()
{
- return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidget>();
+ return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidgetContainer>();
}
#ifndef _WIN32_
@@ -76,15 +76,18 @@ ResourceFile::ResourceFile( const KConfig *config, bool syncable )
: Resource( config, syncable ) , mFormat( 0 )
{
- QString fileName, formatName;
+ QString fileName, formatName, default_fileName;
+
+ if (syncable == true)
+ default_fileName = "/home/polo/kdepim/apps/kabc/localfile.vcf";
+ else
+ default_fileName = StdAddressBook::fileName();
KConfig *cfg = (KConfig *)config;
if ( cfg ) {
- fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() );
+ fileName = cfg->readEntry( "FileName", default_fileName );
formatName = cfg->readEntry( "FileFormat", "vcard" );
-// qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() );
} else {
- fileName = StdAddressBook::fileName();
+ fileName = default_fileName;
formatName = "vcard";
-// qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() );
}
@@ -112,17 +115,4 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
}
-/*US
-//US qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
- if (mFormatName == "vcard") {
- mFormat = new VCardFormatPlugin2();
-// qDebug("ResourceFile::init format VCardFormatPlugin2");
- }
- else if (mFormatName == "binary") {
- mFormat = new BinaryFormat();
-// qDebug("ResourceFile::init format BinaryFormat");
- }
- else
- qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
-*/
connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 198e80a..17f115d 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -46,5 +46,5 @@ extern "C"
void *init_microkabc_ldap()
{
- return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidget>();
+ return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, SyncPrefWidgetContainer>();
}
}
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 9dfd473..4b811e9 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -62,5 +62,5 @@ extern "C"
void *init_microkabc_opie()
{
- return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>();
+ return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidgetContainer>();
}
}
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 5565580..93a4d33 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -59,5 +59,5 @@ extern "C"
void *init_microkabc_qtopia()
{
- return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidget>();
+ return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig, SyncPrefWidgetContainer>();
}
}
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 70c3718..b63df0c 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -61,5 +61,5 @@ extern "C"
void *init_microkabc_sharpdtm()
{
- return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidget>();
+ return new KRES::PluginFactory<ResourceSharpDTM,ResourceSharpDTMConfig,SyncPrefWidgetContainer>();
}
}
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index 2f03927..d39fd6a 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -114,4 +114,9 @@ bool Resource::isSyncable() const
}
+KSyncProfile* Resource::getSyncProfile()
+{
+ return mSyncProfile;
+}
+
QString Resource::fileName() const
diff --git a/kabc/resource.h b/kabc/resource.h
index 7d42f81..2024d2d 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -143,4 +143,6 @@ public:
virtual bool isSyncable() const;
+ virtual KSyncProfile* getSyncProfile();
+
/**
* Set the name of resource.You can override this method,
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 1e00cc6..760820e 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -60,7 +60,7 @@ void StdAddressBook::handleCrash()
StdAddressBook *StdAddressBook::self()
{
-
+
if ( !mSelf )
- {
+ {
QString appdir = StdAddressBook::setTempAppDir();
@@ -71,6 +71,6 @@ StdAddressBook *StdAddressBook::self()
#else //KAB_EMBEDDED
addressBookDeleter.setObject( mSelf, new StdAddressBook );
-#endif //KAB_EMBEDDED
- KStandardDirs::setAppDir( appdir );
+#endif //KAB_EMBEDDED
+ KStandardDirs::setAppDir( appdir );
}
@@ -90,6 +90,6 @@ QString StdAddressBook::setTempAppDir()
#else
QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook";
-
- KStandardDirs::setAppDir( appdir );
+
+ KStandardDirs::setAppDir( appdir );
#endif
@@ -98,7 +98,7 @@ QString StdAddressBook::setTempAppDir()
StdAddressBook *StdAddressBook::self( bool onlyFastResources )
{
-
+
if ( !mSelf )
- {
+ {
QString appdir =StdAddressBook::setTempAppDir();
#ifdef KAB_EMBEDDED
@@ -106,6 +106,6 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources )
#else //KAB_EMBEDDED
addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) );
-#endif //KAB_EMBEDDED
- KStandardDirs::setAppDir( appdir );
+#endif //KAB_EMBEDDED
+ KStandardDirs::setAppDir( appdir );
}
return mSelf;
@@ -113,16 +113,14 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources )
StdAddressBook::StdAddressBook()
-//US : AddressBook( "kabcrc" )
- : AddressBook( locateLocal( "config", "kabcrc") )
+ : AddressBook( "kabcrc" )
{
-
+
init( false );
}
StdAddressBook::StdAddressBook( bool onlyFastResources )
-//US : AddressBook( "kabcrc" )
- : AddressBook( locateLocal( "config", "kabcrc") )
+ : AddressBook( "kabcrc" )
{
-
+
init( onlyFastResources );
}
@@ -144,5 +142,5 @@ void StdAddressBook::init( bool )
error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
}
-
+
Resource *res = standardResource();
if ( !res ) {
@@ -187,5 +185,5 @@ bool StdAddressBook::save()
}
}
-
+
return ok;
}
@@ -196,5 +194,5 @@ void StdAddressBook::close()
//US addressBookDeleter.destructObject();
addressBookDeleter.setObject(0);
-
+
}
diff --git a/kabc/syncprefwidget.cpp b/kabc/syncprefwidget.cpp
index 51a8040..a2bde72 100644
--- a/kabc/syncprefwidget.cpp
+++ b/kabc/syncprefwidget.cpp
@@ -26,48 +26,4 @@ $Id$
*/
-/*US
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qlineedit.h>
-#include <qfont.h>
-#include <qslider.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qcombobox.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qspinbox.h>
-#include <qdatetime.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qpushbutton.h>
-#include <qstrlist.h>
-#include <qapplication.h>
-
-#include <kcolorbutton.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kfontdialog.h>
-#include <kmessagebox.h>
-#include <kcolordialog.h>
-#include <kiconloader.h>
-#include <kemailsettings.h>
-#include <kstandarddirs.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
-
-#include <kurlrequester.h>
-#include <klineedit.h>
-#include <libkdepim/ksyncprofile.h>
-
-
-#include "koprefs.h"
-
-#include "kosyncprefsdialog.h"
-#include "koglobals.h"
-*/
#include <qlayout.h>
@@ -80,4 +36,6 @@ $Id$
#include <qlineedit.h>
#include <qpushbutton.h>
+#include <qscrollview.h>
+#include <qcombobox.h>
@@ -85,411 +43,368 @@ $Id$
#include <kdialog.h>
-
+#include "ksyncprofile.h"
+#include "resource.h"
#include "syncprefwidget.h"
-SyncPrefWidget::SyncPrefWidget(QWidget *parent) :
- KRES::SyncWidget(parent)
+SyncPrefWidget_Settings::SyncPrefWidget_Settings(QWidget *parent, const char *name) :
+ KRES::SyncWidget(parent, name)
{
-
-//US setCaption( i18n("Synchronization Preferences"));
-
-//US mSyncProfiles.setAutoDelete( true );
- init();
+ init();
}
-SyncPrefWidget::~SyncPrefWidget()
+SyncPrefWidget_Settings::~SyncPrefWidget_Settings()
{
}
-//US #include <qlayout.h>
-//US #include <qscrollview.h>
-void SyncPrefWidget::init()
+void SyncPrefWidget_Settings::init()
{
- QLabel * lab;
- QPushButton* button;
-
-/*US
- //QFrame *page = addPage(i18n("Sync Prefs"),0,0);
- QVBox * mainbox = new QVBox( this );
- QScrollView* sv = new QScrollView( mainbox );
- QHBoxLayout * lay = new QHBoxLayout( this );
- lay->addWidget( mainbox );
- QHBox * b_box = new QHBox( mainbox );
-*/
-/*US
- QPushButton* button = new QPushButton( i18n("Ok"), b_box );
- connect ( button, SIGNAL( clicked()), this, SLOT (slotOK() ) );
- button = new QPushButton( i18n("Cancel"), b_box );
- connect ( button, SIGNAL( clicked()), this, SLOT (reject() ) );
-*/
- //QBoxLayout * sl = new QVBoxLayout(this );
- //sl->addWidget ( sv );
-/*US
- sv->setResizePolicy ( QScrollView::AutoOneFit );
- QFrame *topFrame = new QFrame ( sv );
- sv->addChild( topFrame );
- mSetupSyncAlgTab = topFrame;
- QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
-*/
-//US new code for the layout
QGridLayout *topLayout = new QGridLayout( this, 6,2 );
topLayout->setMargin( KDialog::marginHint() );
topLayout->setSpacing( KDialog::spacingHint() );
- //lab = new QLabel(i18n("Sync settings not yet implemented. DO NOT USE!"), topFrame);
- int iii = 0;
- //topLayout->addMultiCellWidget(lab , iii,iii,0,1);
- //++iii;
-
-/*US
- mMyMachineName = new QLineEdit(topFrame);
- lab = new QLabel(mMyMachineName, i18n("Local device name:"), topFrame);
- topLayout->addWidget(lab ,iii,0);
- topLayout->addWidget(mMyMachineName,iii,1);
- ++iii;
-
- QHBox* buttonbox = new QHBox( topFrame);
- topLayout->addMultiCellWidget(buttonbox, iii,iii,0,1);
- ++iii;
- button = new QPushButton( i18n("New profile"), buttonbox );
- connect ( button, SIGNAL( clicked()), this, SLOT (newProfile() ) );
-
- button = new QPushButton( i18n("Clone profile"), buttonbox );
- connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) );
-
- button = new QPushButton( i18n("Delete profile"), buttonbox );
- connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) );
-
- mProfileBox = new QComboBox(topFrame);
- mProfileBox->setEditable ( true );
- connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) );
- connect ( mProfileBox, SIGNAL( textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) );
-
- lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame);
- topLayout->addWidget(lab ,iii,0);
- topLayout->addWidget(mProfileBox, iii,1);
- ++iii;
-*/
- mIncludeInRing = new QCheckBox( i18n("Include in multiple sync"), this );
- topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1);
- ++iii;
-
- mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), this );
- topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
- ++iii;
- QButtonGroup* gr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Sync preferences"), this);
- topLayout->addMultiCellWidget(gr, iii,iii,0,1);
- ++iii;
- loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
- rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
- newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
- ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
- f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr );
- f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr );
- // both = new QRadioButton ( i18n("Take both on conflict"), gr );
+ int iii = 0;
+ mIncludeInRing = new QCheckBox( i18n("Include in multiple sync"), this );
+ topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1);
+ ++iii;
- mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), this );
- topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
- ++iii;
-
- mWriteBackExisting= new QCheckBox( i18n("Write back existing entries only"), this );
- topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
- ++iii;
-
- mWriteBackFile = new QCheckBox( i18n("Write back file"), this );
- topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
- ++iii;
-
- mIsNotLocal = new QCheckBox( i18n("Remote file (w down/upload command)"), this );
- topLayout->addMultiCellWidget(mIsNotLocal, iii,iii,0,1);
- connect (mIsNotLocal, SIGNAL( checked(bool)), this, SLOT (kindChanged(bool) ) );
-/*US
- proGr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Profile kind"), this);
- gr = proGr;
- topLayout->addMultiCellWidget(gr, iii,iii,0,1);
- ++iii;
- mIsLocal = new QRadioButton ( i18n("Local file"), gr );
- mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
- connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
-*/
+ mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), this );
+ topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
+ ++iii;
-/*US
- localFileWidget = new QVBox( topFrame);
- topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
- ++iii;
- QHBox* temphb = new QHBox( localFileWidget );
- lab = new QLabel( i18n("Local file:"), temphb);
- mRemoteFile = new QLineEdit(localFileWidget);
+ mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), this );
+ topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
+ ++iii;
- button = new QPushButton( i18n("Choose..."), temphb );
- connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
-*/
- QHBox* temphb;
+ mWriteBackExisting= new QCheckBox( i18n("Write back existing entries only"), this );
+ topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
+ ++iii;
- remoteFileWidget = new QVBox( this);
- topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
- ++iii;
- lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
- mRemotePrecommand = new QLineEdit(remoteFileWidget);
+ mWriteBackFile = new QCheckBox( i18n("Write back synced data"), this );
+ topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
+ ++iii;
- lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
- mLocalTempFile = new QLineEdit(remoteFileWidget);
+}
+void SyncPrefWidget_Settings::loadSettings( KRES::Resource *res )
+{
+ KABC::Resource* resource = (KABC::Resource*)( res );
+ KSyncProfile* prof = resource->getSyncProfile();
+
+ if (prof == 0)
+ {
+ qDebug("SyncPrefWidget_Settings::loadSettings: something is wrong, because resource does have no syncprofile" );
+ return;
+ }
+
+ mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
+ mAskForPreferences->setChecked( prof->getAskForPreferences());
+ mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
+ mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
+ mWriteBackFile->setChecked( prof->getWriteBackFile());
+}
- lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
- mRemotePostcommand = new QLineEdit(remoteFileWidget);
+void SyncPrefWidget_Settings::saveSettings( KRES::Resource *res )
+{
+ KABC::Resource* resource = (KABC::Resource*)( res );
+ KSyncProfile* prof = resource->getSyncProfile();
+
+ if (prof == 0)
+ {
+ qDebug("SyncPrefWidget_Settings::saveSettings: something is wrong, because resource does have no syncprofile" );
+ return;
+ }
+
+ prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
+ prof->setAskForPreferences( mAskForPreferences->isChecked());
+ prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
+ prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
+ prof->setWriteBackFile( mWriteBackFile->isChecked());
+}
- lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
- temphb = new QHBox( remoteFileWidget );
- button = new QPushButton( i18n("ssh/scp"), temphb );
- connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
- button = new QPushButton( i18n("ftp"), temphb );
- connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
- lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
+/***********************************************************************
+ *
+ *
+ **********************************************************************/
-}
-/*US
-void SyncPrefWidget::slotOK()
+SyncPrefWidget_Conflict::SyncPrefWidget_Conflict(QWidget *parent, const char *name) :
+ KRES::SyncWidget(parent, name)
{
- if ( mMyMachineName->text() == "undefined" ) {
- KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
- return;
- }
- int i;
- for (i = 0; i < mSyncProfileNames.count(); ++ i) {
- if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1 ) {
- KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
- return;
- }
- }
- usrWriteConfig();
- QDialog::accept();
+ init();
}
-void SyncPrefWidget::accept()
+
+
+SyncPrefWidget_Conflict::~SyncPrefWidget_Conflict()
{
- slotOK();
}
-void KOSyncPrefsDialog::chooseFile()
+
+void SyncPrefWidget_Conflict::init()
{
- QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
+ QGridLayout *topLayout = new QGridLayout( this, 6,2 );
+ topLayout->setMargin( KDialog::marginHint() );
+ topLayout->setSpacing( KDialog::spacingHint() );
- fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
- if ( fn == "" )
- return;
- mRemoteFile->setText( fn );
+ int iii = 0;
+
+ QButtonGroup* gr = new QButtonGroup ( 1, Qt::Horizontal, i18n("In case of conflicts"), this);
+ topLayout->addMultiCellWidget(gr, iii,iii,0,1);
+ ++iii;
+ loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
+ rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
+ newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
+ ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
+ f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr );
+ f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr );
+ // both = new QRadioButton ( i18n("Take both on conflict"), gr );
}
-void KOSyncPrefsDialog::textChanged( const QString & s )
+void SyncPrefWidget_Conflict::loadSettings( KRES::Resource *res )
{
- if ( mProfileBox->count() == 0 )
- return;
- if ( currentSelection < 3 ) {
- //KMessageBox::error(this,i18n("This profil name\ncannot be edited!\n"),i18n("KO/Pi config error"));
- mProfileBox->blockSignals( true );
- mProfileBox->setCurrentItem(mProfileBox-> currentItem ());
- mProfileBox->blockSignals( false );
- return;
- }
- //qDebug("cur i %d ",mProfileBox-> currentItem () );
- mProfileBox->changeItem ( s, mProfileBox-> currentItem () ) ;
- KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
- prof->setName( s );
- mSyncProfileNames[mProfileBox-> currentItem ()] = s;
+ KABC::Resource* resource = (KABC::Resource*)( res );
+ KSyncProfile* prof = resource->getSyncProfile();
+
+ if (prof == 0)
+ {
+ qDebug("SyncPrefWidget_Conflict::loadSettings: something is wrong, because resource does have no syncprofile" );
+ return;
+ }
+
+ switch ( prof->getSyncPrefs() ) {
+ case 0:
+ loc->setChecked( true);
+ break;
+ case 1:
+ rem->setChecked( true );
+ break;
+ case 2:
+ newest->setChecked( true);
+ break;
+ case 3:
+ ask->setChecked( true);
+ break;
+ case 4:
+ f_loc->setChecked( true);
+ break;
+ case 5:
+ f_rem->setChecked( true);
+ break;
+ case 6:
+ //both->setChecked( true);
+ break;
+ default:
+ break;
+ }
}
-void KOSyncPrefsDialog::profileChanged( int item )
+
+void SyncPrefWidget_Conflict::saveSettings( KRES::Resource *res )
{
- //qDebug("KOSyncPrefsDialog::profileChanged %d ", item );
- KSyncProfile* prof;
- saveProfile();
- currentSelection = item;
- prof = mSyncProfiles.at(item) ;
- mRemotePrecommand->setText(prof->getPreSyncCommand());
- mRemotePostcommand->setText(prof->getPostSyncCommand());
- mLocalTempFile->setText(prof->getLocalTempFile());
- mRemoteFile->setText(prof->getRemoteFileName()) ;
- mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
- mAskForPreferences->setChecked( prof->getAskForPreferences());
- mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
- mWriteBackFile->setChecked( prof->getWriteBackFile());
- mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
-
- switch ( prof->getSyncPrefs() ) {
- case 0:
- loc->setChecked( true);
- break;
- case 1:
- rem->setChecked( true );
- break;
- case 2:
- newest->setChecked( true);
- break;
- case 3:
- ask->setChecked( true);
- break;
- case 4:
- f_loc->setChecked( true);
- break;
- case 5:
- f_rem->setChecked( true);
- break;
- case 6:
- //both->setChecked( true);
- break;
- default:
- break;
- }
- mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
- mIsNotLocal->setChecked(!prof->getIsLocalFileSync());
- proGr->setEnabled( item > 2 );
- if ( item < 3 ) {
- localFileWidget->setEnabled(false);
- remoteFileWidget->setEnabled(false);
-
- } else
- kindChanged( prof->getIsLocalFileSync() );
+ KABC::Resource* resource = (KABC::Resource*)( res );
+ KSyncProfile* prof = resource->getSyncProfile();
+
+ if (prof == 0)
+ {
+ qDebug("SyncPrefWidget_Conftlict::saveSettings: something is wrong, because resource does have no syncprofile" );
+ return;
+ }
+
+ int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ;
+ prof->setSyncPrefs( syncprefs );
+
+}
+
+
+/***********************************************************************
+ *
+ *
+ **********************************************************************/
+
+SyncPrefWidget_Remote::SyncPrefWidget_Remote(QWidget *parent, const char *name) :
+ KRES::SyncWidget(parent, name)
+{
+ init();
}
-void KOSyncPrefsDialog::fillSSH()
+
+SyncPrefWidget_Remote::~SyncPrefWidget_Remote()
{
- mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
- mLocalTempFile->setText("/tmp/mycalendar.ics" );
- mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
}
-void KOSyncPrefsDialog::fillFTP()
+
+void SyncPrefWidget_Remote::init()
{
- mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" );
- mLocalTempFile->setText("/tmp/mycalendar.ics" );
- mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
+ QLabel * lab;
+ QPushButton* button;
+
+
+ QGridLayout *topLayout = new QGridLayout( this, 6,2 );
+ topLayout->setMargin( KDialog::marginHint() );
+ topLayout->setSpacing( KDialog::spacingHint() );
+
+ int iii = 0;
+
+ QButtonGroup* gr;
+
+ QButtonGroup *proGr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Profile kind"), this);
+ gr = proGr;
+ topLayout->addMultiCellWidget(gr, iii,iii,0,1);
+ ++iii;
+ mProfileKind = new QComboBox( gr );
+
+ mProfileKind->insertItem( i18n("Local file"), Local );
+ mProfileKind->insertItem( i18n("Remote file (w down/upload cmd)"),Remote );
+ mProfileKind->insertItem( i18n("Mobile device (cell phone)"), Mobile );
+
+ connect( mProfileKind, SIGNAL( activated( int ) ),
+ this, SLOT (kindChanged( int ) ) );
+
+
+ QHBox* temphb;
+
+ remoteFileWidget = new QVBox( this);
+ topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
+ ++iii;
+ lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
+ mRemotePrecommand = new QLineEdit(remoteFileWidget);
+
+ lab = new QLabel( i18n("Local temp file (=Location):"), remoteFileWidget);
+ mLocalTempFile = new QLineEdit(remoteFileWidget);
+ mLocalTempFile->setEnabled(false);
+
+
+ lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
+ mRemotePostcommand = new QLineEdit(remoteFileWidget);
+
+ lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
+ temphb = new QHBox( remoteFileWidget );
+ button = new QPushButton( i18n("ssh/scp"), temphb );
+ connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
+ button = new QPushButton( i18n("ftp"), temphb );
+ connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
+ lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
}
-void KOSyncPrefsDialog::kindChanged( bool b )
+
+void SyncPrefWidget_Remote::loadSettings( KRES::Resource *res )
{
+ KABC::Resource* resource = (KABC::Resource*)( res );
+ KSyncProfile* prof = resource->getSyncProfile();
+
+ if (prof == 0)
+ {
+ qDebug("SyncPrefWidget_Remote::loadSettings: something is wrong, because resource does have no syncprofile" );
+ return;
+ }
- localFileWidget->setEnabled(b);
- remoteFileWidget->setEnabled(!b);
+ int val;
+ if (prof->getIsPhoneSync())
+ val = Mobile;
+ else if (!prof->getIsLocalFileSync())
+ val = Remote;
+ else // default value
+ val = Local;
+
+ mProfileKind->setCurrentItem( val );
+ kindChanged( val );
+
+
+ mRemotePrecommand->setText(prof->getPreSyncCommand());
+ mLocalTempFile->setText(resource->fileName());
+ mRemotePostcommand->setText(prof->getPostSyncCommand());
}
-void KOSyncPrefsDialog::deleteProfile()
+
+void SyncPrefWidget_Remote::saveSettings( KRES::Resource *res )
{
- //qDebug("KOSyncPrefsDialog::deleteProfile() ");
- if ( currentSelection >= 0 ) {
- if ( currentSelection < 3 ) {
- KMessageBox::error(this,i18n("This profil cannot be deleted!\n"),i18n("KO/Pi config error"));
- return;
- }
- KSyncProfile* temp = mSyncProfiles.at(currentSelection);
- mSyncProfiles.remove( temp );
- mSyncProfileNames.remove( mSyncProfileNames.at( currentSelection ));
- insertProfiles();
- }
+ KABC::Resource* resource = (KABC::Resource*)( res );
+ KSyncProfile* prof = resource->getSyncProfile();
+
+ if (prof == 0)
+ {
+ qDebug("SyncPrefWidget_Remote::saveSettings: something is wrong, because resource does have no syncprofile" );
+ return;
+ }
+
+ int val = mProfileKind->currentItem();
+
+ if (val == Mobile)
+ {
+ prof->setIsLocalFileSync(true);
+ prof->setIsPhoneSync(true);
+ }
+ else if (val == Remote)
+ {
+ prof->setIsLocalFileSync(false);
+ prof->setIsPhoneSync(false);
+ }
+ else // default value is Local
+ {
+ prof->setIsLocalFileSync(true);
+ prof->setIsPhoneSync(false);
+ }
+
+
+ prof->setPreSyncCommand( mRemotePrecommand->text());
+//US prof->setLocalTempFile( mLocalTempFile->text());
+ prof->setPostSyncCommand( mRemotePostcommand->text() );
}
-void KOSyncPrefsDialog::saveProfile()
+
+void SyncPrefWidget_Remote::fillSSH()
{
- KSyncProfile* prof;
- if ( currentSelection >= 0 ) {
- prof = mSyncProfiles.at(currentSelection) ;
- prof->setPreSyncCommand( mRemotePrecommand->text());
- prof->setPostSyncCommand( mRemotePostcommand->text() );
- prof->setLocalTempFile( mLocalTempFile->text());
- prof->setRemoteFileName( mRemoteFile->text() );
- prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
- prof->setAskForPreferences( mAskForPreferences->isChecked());
- prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
- prof->setWriteBackFile( mWriteBackFile->isChecked());
- prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
- int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ;
- prof->setSyncPrefs( syncprefs);
- prof->setIsLocalFileSync( mIsLocal->isChecked() );
- }
+ QString location = mLocalTempFile->text();
+ mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/"+location + " " + location );
+//US mLocalTempFile->setText("/tmp/mycalendar.ics" );
+ mRemotePostcommand->setText("scp " + location + " zaurus@192.168.0.65:/home/zaurus/kdepim/"+location );
}
-void KOSyncPrefsDialog::insertProfiles()
+void SyncPrefWidget_Remote::fillFTP()
{
- int curItem = mProfileBox->currentItem();
- mProfileBox->blockSignals( true );
- mProfileBox->clear();
- mProfileBox->insertStringList (mSyncProfileNames );
- int item = mSyncProfileNames.count() -1;
- if ( curItem >= 0 && mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
- mProfileBox->setCurrentItem( curItem );
- else if ( item >= 0 ) {
- mProfileBox->setCurrentItem( item );
- }
- currentSelection = -1;
- if ( mSyncProfileNames.count() > 0 ) {
- //qDebug(" profileChanged( mProfileBox->currentItem() ");
- profileChanged( mProfileBox->currentItem() );
- currentSelection = mProfileBox->currentItem();
- }
- mProfileBox->blockSignals( false );
+ QString location = mLocalTempFile->text();
+
+ mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/" + location );
+//US mLocalTempFile->setText("/tmp/mycalendar.ics" );
+ mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/"+location+ " " + location);
+
}
-void KOSyncPrefsDialog::addProfile ( KSyncProfile* temp )
+
+void SyncPrefWidget_Remote::kindChanged( int newKind )
{
- saveProfile();
- mSyncProfiles.append( temp );
- mSyncProfileNames << temp->getName();
- insertProfiles();
- int last = mProfileBox->count() -1;
- mProfileBox->blockSignals( true );
- mProfileBox->setCurrentItem( last );
- mProfileBox->blockSignals( false );
- profileChanged(last);
+
+ if (newKind == Mobile)
+ remoteFileWidget->setEnabled(false);
+ else if (newKind == Remote)
+ remoteFileWidget->setEnabled(true);
+ else // default value is local
+ remoteFileWidget->setEnabled(false);
+
}
-void KOSyncPrefsDialog::newProfile()
+
+/***********************************************************************
+ *
+ *
+ **********************************************************************/
+
+
+SyncPrefWidgetContainer::SyncPrefWidgetContainer()
+ : SyncWidgetContainer()
{
- addProfile ( new KSyncProfile () );
}
-void KOSyncPrefsDialog::cloneProfile()
+KRES::SyncWidget* SyncPrefWidgetContainer::generateSettingsTab(QWidget *parent = 0, const char *name = 0)
{
- if ( currentSelection >= 0 )
- addProfile (mSyncProfiles.at(currentSelection)->clone()) ;
- else
- newProfile();
+ return new SyncPrefWidget_Settings(parent, name);
}
-
-void KOSyncPrefsDialog::usrReadConfig()
+KRES::SyncWidget* SyncPrefWidgetContainer::generateConflictsTab(QWidget *parent = 0, const char *name = 0)
{
- KConfig *config = KOGlobals::config();
- config->setGroup("SyncProfiles");
- mSyncProfileNames = KOPrefs::instance()->mSyncProfileNames;
- int i;
- KSyncProfile* temp ;
- mSyncProfiles.clear();
- for ( i = 0; i < mSyncProfileNames.count();++i ) {
- temp = new KSyncProfile ();
- temp->setName( mSyncProfileNames[i] );
- temp->readConfig( config );
- mSyncProfiles.append( temp );
- }
- insertProfiles();
- mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
+ return new SyncPrefWidget_Conflict(parent, name);
}
-
-void KOSyncPrefsDialog::usrWriteConfig()
+KRES::SyncWidget* SyncPrefWidgetContainer::generateRemoteTab(QWidget *parent = 0, const char *name = 0)
{
- saveProfile();
- if ( currentSelection >= 0 )
- profileChanged(currentSelection);
- KConfig *config = KOGlobals::config();
- config->setGroup("SyncProfiles");
- KSyncProfile* prof = mSyncProfiles.first();
- while ( prof ) {
- prof->writeConfig(config);
- prof = mSyncProfiles.next();
- }
- KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
- KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
- config->writeEntry("SyncProfileNames",&mSyncProfileNames);
+ return new SyncPrefWidget_Remote(parent, name);
}
-*/
+
diff --git a/kabc/syncprefwidget.h b/kabc/syncprefwidget.h
index 3709d78..b20a68e 100644
--- a/kabc/syncprefwidget.h
+++ b/kabc/syncprefwidget.h
@@ -31,91 +31,109 @@ $Id$
#include <kresources/syncwidget.h>
-/*US
-//#include <qframe.h>
-//#include <qdict.h>
-#include <qvbox.h>
-#include <qhbox.h>
-//#include <qcolor.h>
-//#include <qlistview.h>
-
-#include <kdialogbase.h>
-
-#include <libkdepim/kprefsdialog.h>
-*/
-
-//US class KColorButton;
-//US class QSpinBox;;
class QRadioButton;
class QCheckBox;
class QVBox;
-//US class QSlider;
-//US class KURLRequester;
-//US class QComboBox;
+class QComboBox;
class QLineEdit;
-//US class QStringList;
-//US class KSyncProfile;
+class KRES::Resource;
-
-/** Dialog to change the korganizer configuration.
- */
-class SyncPrefWidget : public KRES::SyncWidget
+class SyncPrefWidget_Settings : public KRES::SyncWidget
{
Q_OBJECT
public:
- SyncPrefWidget(QWidget *parent=0);
- ~SyncPrefWidget();
-//US void usrReadConfig();
+ SyncPrefWidget_Settings(QWidget *parent=0, const char *name = 0 );
+ ~SyncPrefWidget_Settings();
public slots:
- protected slots:
-//US void accept();
-//US void deleteProfile();
-//US void newProfile();
-//US void cloneProfile();
-//US void kindChanged(bool);
-//US void fillSSH();
-//US void fillFTP();
-//US void textChanged( const QString & );
-//US void profileChanged( int );
-//US void chooseFile();
-//US void slotOK();
+ virtual void loadSettings( KRES::Resource *resource );
+ virtual void saveSettings( KRES::Resource *resource );
- protected:
-//US void usrWriteConfig();
+ protected:
void init();
private:
+ QCheckBox* mIncludeInRing;
+ QCheckBox* mWriteBackFile;
+ QCheckBox* mWriteBackExisting;
+ QCheckBox* mAskForPreferences;
+ QCheckBox* mShowSummaryAfterSync;
+};
-//US int currentSelection;
-//US QPtrList<KSyncProfile> mSyncProfiles;
-//US QStringList mSyncProfileNames;
-//US QLineEdit * mMyMachineName;
-//US QComboBox * mProfileBox;
-//US QRadioButton* mIsLocal;
- QCheckBox* mIsNotLocal;
- QCheckBox* mIncludeInRing;
-//US void addProfile ( KSyncProfile* );
-//US void insertProfiles();
-//US void saveProfile();
-//US QButtonGroup* proGr;
+class SyncPrefWidget_Conflict : public KRES::SyncWidget
+{
+ Q_OBJECT
+ public:
+ SyncPrefWidget_Conflict(QWidget *parent=0, const char *name = 0 );
+ ~SyncPrefWidget_Conflict();
+
+ public slots:
+ virtual void loadSettings( KRES::Resource *resource );
+ virtual void saveSettings( KRES::Resource *resource );
+
+ protected:
+ void init();
+
+ private:
QRadioButton* loc, *rem, *newest, *ask, *f_loc,* f_rem, *both;
+};
+
+
+
+class SyncPrefWidget_Remote : public KRES::SyncWidget
+{
+ Q_OBJECT
+ public:
+ SyncPrefWidget_Remote(QWidget *parent=0, const char *name = 0 );
+ ~SyncPrefWidget_Remote();
+
+ enum Types {
+ Local = 0,
+ Remote = 1,
+ Mobile =2
+ };
+
+ public slots:
+ virtual void loadSettings( KRES::Resource *resource );
+ virtual void saveSettings( KRES::Resource *resource );
+
+ protected slots:
+ void fillSSH();
+ void fillFTP();
+ void kindChanged( int newKind );
+
+ protected:
+ void init();
+
+ private:
+ QComboBox* mProfileKind;
QLineEdit * mRemotePostcommand;
QLineEdit * mRemotePrecommand;
QLineEdit * mRemoteFile;
QLineEdit * mLocalTempFile;
-//US QWidget* mSetupSyncAlgTab;
-
-//US QVBox* localFileWidget;
QVBox* remoteFileWidget;
- QCheckBox* mWriteBackFile;
- QCheckBox* mWriteBackExisting;
- QCheckBox* mAskForPreferences;
- QCheckBox* mShowSummaryAfterSync;
};
+
+
+
+
+class SyncPrefWidgetContainer : public KRES::SyncWidgetContainer
+{
+ Q_OBJECT
+
+public:
+ SyncPrefWidgetContainer();
+
+ virtual KRES::SyncWidget* generateSettingsTab(QWidget *parent, const char *name);
+ virtual KRES::SyncWidget* generateConflictsTab(QWidget *parent, const char *name);
+ virtual KRES::SyncWidget* generateRemoteTab(QWidget *parent, const char *name);
+};
+
+
+
#endif
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index 90febca..f8240f9 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -30,6 +30,8 @@
#include <qlayout.h>
#include <qpushbutton.h>
+#include <qvbox.h>
#include <qcheckbox.h>
+#include <qscrollview.h>
#include <kbuttonbox.h>
@@ -47,5 +49,5 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
Resource* resource, const char *name )
: KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ),
- Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget(0), mResource( resource ), mPersistentReadOnly(false)
+ Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget_Settings(0), mSyncWidget_Conflicts(0),mSyncWidget_Remote(0), mResource( resource ), mPersistentReadOnly(false)
{
@@ -55,9 +57,14 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
resize( KMIN(KGlobal::getDesktopWidth(), 250), KMIN(KGlobal::getDesktopHeight(), 240));
-//US QFrame *main = makeMainWidget();
- QFrame *main = plainPage();
+ QFrame *main;
+
+ if (!mResource->isSyncable())
+ main = plainPage();
+ else
+ main = addPage("Profile");
QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() );
+
QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main );
generalGroupBox->layout()->setSpacing( spacingHint() );
@@ -99,12 +106,45 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
if (mResource->isSyncable())
{
- QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal, main );
- syncGroupBox->layout()->setSpacing( spacingHint());
- syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) );
- mainLayout->addWidget( syncGroupBox );
+ SyncWidgetContainer* c = factory->syncWidgetContainer( resource->type() );
+
+ QFrame* syncPage = addPage("Settings");
+ QVBoxLayout *syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
+ mSyncWidget_Settings = c->generateSettingsTab(syncPage);
+ syncLayout->addWidget( mSyncWidget_Settings );
+
+ syncPage = addPage("Conflicts");
+ syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
+ mSyncWidget_Conflicts = c->generateConflictsTab(syncPage);
+ syncLayout->addWidget( mSyncWidget_Conflicts );
+
+ syncPage = addPage("Remote");
+ syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() );
+ mSyncWidget_Remote = c->generateRemoteTab(syncPage);
+ syncLayout->addWidget( mSyncWidget_Remote );
+
- mainLayout->addStretch();
+ mSyncWidget_Settings->setInEditMode( false );
+ mSyncWidget_Settings->loadSettings( mResource );
+ mSyncWidget_Settings->show();
- mSyncWidget = factory->syncWidget( resource->type(), syncGroupBox );
+ mSyncWidget_Conflicts->setInEditMode( false );
+ mSyncWidget_Conflicts->loadSettings( mResource );
+ mSyncWidget_Conflicts->show();
+
+ mSyncWidget_Remote->setInEditMode( false );
+ mSyncWidget_Remote->loadSettings( mResource );
+ mSyncWidget_Remote->show();
+
+ delete c;
+
+// QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal, syncPage );
+// syncGroupBox->layout()->setSpacing( spacingHint());
+// syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) );
+// syncLayout->addWidget( syncGroupBox );
+
+// syncLayout->addStretch();
+/*US
+ mSyncWidget = factory->syncWidget( resource->type(), syncPage );
+ syncLayout->addWidget( mSyncWidget );
if ( mSyncWidget ) {
mSyncWidget->setInEditMode( false );
@@ -112,4 +152,5 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
mSyncWidget->show();
}
+ */
}
@@ -132,6 +173,10 @@ void ConfigDialog::setInEditMode( bool value )
mConfigWidget->setInEditMode( value );
- if ( mSyncWidget )
- mSyncWidget->setInEditMode( value );
+ if ( mSyncWidget_Settings )
+ mSyncWidget_Settings->setInEditMode( value );
+ if ( mSyncWidget_Conflicts )
+ mSyncWidget_Conflicts->setInEditMode( value );
+ if ( mSyncWidget_Remote )
+ mSyncWidget_Remote->setInEditMode( value );
}
@@ -183,9 +228,10 @@ void ConfigDialog::accept()
}
- if ( mSyncWidget ) {
- // First save generic information
- // Also save setting of specific resource type
- mSyncWidget->saveSettings( mResource );
- }
+ if ( mSyncWidget_Settings )
+ mSyncWidget_Settings->saveSettings( mResource );
+ if ( mSyncWidget_Conflicts )
+ mSyncWidget_Conflicts->saveSettings( mResource );
+ if ( mSyncWidget_Remote )
+ mSyncWidget_Remote->saveSettings( mResource );
diff --git a/microkde/kresources/configdialog.h b/microkde/kresources/configdialog.h
index b629347..63cd4e9 100644
--- a/microkde/kresources/configdialog.h
+++ b/microkde/kresources/configdialog.h
@@ -52,5 +52,7 @@ class ConfigDialog : public KDialogBase
private:
ConfigWidget *mConfigWidget;
- SyncWidget *mSyncWidget;
+ SyncWidget *mSyncWidget_Settings;
+ SyncWidget *mSyncWidget_Conflicts;
+ SyncWidget *mSyncWidget_Remote;
Resource* mResource;
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index 2fe021d..1a3a22c 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -206,4 +206,6 @@ void ConfigPage::load()
} else if ( family == "calendar" && QFile::exists( configDir + "/kcalrc" ) ) {
info.mConfig = new KConfig( locateLocal( "config", "kcalrc" ) );
+ } else if ( family == syncfamily && QFile::exists( configDir + "/kabcsyncrc" ) ) {
+ info.mConfig = new KConfig( locateLocal( "config", "kabcsyncrc" ) );
} else {
QString configFile = locateLocal( "config", QString( "kresources/%1/stdrc" ).arg( family ) );
@@ -312,5 +314,5 @@ void ConfigPage::slotAdd()
{
desc = QInputDialog::getItem( i18n( "Sync Configuration" ),
- i18n( "Please select resource type for new sync profile:" ), descs, 0,
+ i18n( "Select resource type for the new sync profile:" ), descs, 0,
false, &ok, this );
}
@@ -318,5 +320,5 @@ void ConfigPage::slotAdd()
{
desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
- i18n( "Please select type of the new resource:" ), descs, 0,
+ i18n( "Select type of the new resource:" ), descs, 0,
false, &ok, this );
}
@@ -335,5 +337,12 @@ void ConfigPage::slotAdd()
}
- resource->setResourceName( type + "-resource" );
+ if (mFamily == syncfamily)
+ {
+ resource->setResourceName( type + "-syncprofile" );
+ }
+ else
+ {
+ resource->setResourceName( type + "-resource" );
+ }
ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" );
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 7a5c2f6..e44fce3 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -188,5 +188,5 @@ ConfigWidget *Factory::configWidget( const QString& type, QWidget *parent )
}
-SyncWidget *Factory::syncWidget( const QString& type, QWidget *parent )
+SyncWidgetContainer *Factory::syncWidgetContainer( const QString& type )
{
if ( type.isEmpty() || !mTypeMap.contains( type ) )
@@ -211,5 +211,5 @@ SyncWidget *Factory::syncWidget( const QString& type, QWidget *parent )
}
- SyncWidget *wdg = pluginFactory->syncWidget( parent );
+ SyncWidgetContainer *wdg = pluginFactory->syncWidgetContainer( );
if ( !wdg ) {
//US kdDebug() << "'" << ptr->library() << "' is not a " + mResourceFamily + " plugin." << endl;
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h
index a265bc8..0e4231b 100644
--- a/microkde/kresources/factory.h
+++ b/microkde/kresources/factory.h
@@ -35,4 +35,7 @@
namespace KRES {
+class SyncWidgetContainer;
+class ConfigWidget;
+
//US
struct PluginInfo
@@ -93,5 +96,5 @@ class Factory
* @param parent The parent widget
*/
- SyncWidget *syncWidget( const QString& type, QWidget *parent = 0 );
+ SyncWidgetContainer *syncWidgetContainer( const QString& type );
/**
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index c9202c9..580b5d1 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -41,5 +41,5 @@ namespace KRES {
class ConfigWidget;
-class SyncWidget;
+class SyncWidgetContainer;
/**
@@ -379,5 +379,5 @@ class PluginFactoryBase : public KLibFactory
virtual ConfigWidget *configWidget( QWidget *parent ) = 0;
- virtual SyncWidget *syncWidget( QWidget *parent ) = 0;
+ virtual SyncWidgetContainer *syncWidgetContainer() = 0;
protected:
@@ -403,7 +403,7 @@ class PluginFactory : public PluginFactoryBase
}
- virtual SyncWidget *syncWidget( QWidget *parent )
+ SyncWidgetContainer *syncWidgetContainer()
{
- return new TS( parent );
+ return new TS();
}
diff --git a/microkde/kresources/syncwidget.h b/microkde/kresources/syncwidget.h
index e94252c..6632b69 100644
--- a/microkde/kresources/syncwidget.h
+++ b/microkde/kresources/syncwidget.h
@@ -59,4 +59,14 @@ protected:
};
+class SyncWidgetContainer : public QObject
+{
+ Q_OBJECT
+
+public:
+ virtual SyncWidget* generateSettingsTab(QWidget *parent = 0, const char *name = 0) = 0;
+ virtual SyncWidget* generateConflictsTab(QWidget *parent = 0, const char *name = 0) = 0;
+ virtual SyncWidget* generateRemoteTab(QWidget *parent = 0, const char *name = 0) = 0;
+};
+
}
#endif