1 files changed, 34 insertions, 9 deletions

diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index 8782ffd..912c62e 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -18,12 +18,19 @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
 #include <qgroupbox.h>
 #include <qinputdialog.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include <kapplication.h>
@@ -47,12 +54,15 @@
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <kglobal.h>
 
 using namespace KRES;
 
+const QString ConfigPage::syncfamily = "syncprofiles";
+
+
 class ConfigViewItem : public QCheckListItem
 {
   public:
     ConfigViewItem( QListView *parent, Resource* resource ) :
       QCheckListItem( parent, resource->resourceName(), CheckBox ),
       mResource( resource ),
@@ -161,19 +171,21 @@ void ConfigPage::load()
 //US  KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin" );
 //US  KTrader::OfferList::ConstIterator it;
 //US  for ( it = plugins.begin(); it != plugins.end(); ++it ) {
 //US    QVariant tmp = (*it)->property( "X-KDE-ResourceFamily" );
 //US    QString family = tmp.toString();
   QStringList families;
-  families << "contact" << "sync-contacts"; 
+  families << "contact" << syncfamily;
+
+
   for ( QStringList::Iterator it = families.begin(); it != families.end(); ++it )
   {   
     QString family = (*it);
     if ( !family.isEmpty() ) {
       if ( !mFamilyMap.contains( family ) ) {
-        mCurrentManager = new Manager<Resource>( family );
+        mCurrentManager = new Manager<Resource>( family, (family == syncfamily) );
         if ( mCurrentManager ) {
           mFamilyMap.append( family );
           mCurrentManager->addListener( this );
 
           ResourcePageInfo info;
           info.mManager = mCurrentManager;
@@ -262,13 +274,13 @@ void ConfigPage::slotFamilyChanged( int pos )
     emit changed( true );
     mCurrentManager->writeConfig( mCurrentConfig );
   } else {
 //US    qDebug("ConfigPage::slotFamilyChanged 4.6 ");
     
     if ( !standardResource ) {
-      KMessageBox::sorry( this, i18n( "There is no standard resource! Please select one." ) );
+      KMessageBox::sorry( this, i18n( "There is no standard resource!<br> Please select one." ) );
     
 //US    qDebug("ConfigPage::slotFamilyChanged 4.7" );
     
     }
 
     emit changed( false );
@@ -280,15 +292,28 @@ void ConfigPage::slotAdd()
   if ( !mCurrentManager )
     return;
 
   QStringList types = mCurrentManager->resourceTypeNames();
   QStringList descs = mCurrentManager->resourceTypeDescriptions();
   bool ok = false;
-  QString desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
+
+  QString desc;
+
+  if (mFamily == syncfamily)
+  {
+          desc = QInputDialog::getItem( i18n( "Sync Configuration" ),
+                    i18n( "Please select resource type for new sync profile:" ), descs, 0,
+                    false, &ok, this );
+  }
+  else
+  {
+    desc = QInputDialog::getItem( i18n( "Resource Configuration" ),
                     i18n( "Please select type of the new resource:" ), descs, 0, 
                     false, &ok, this );
+  }
+
   if ( !ok )
     return;
 
   QString type = types[ descs.findIndex( desc ) ];
 
   // Create new resource
@@ -377,13 +402,13 @@ void ConfigPage::slotEdit()
 
   if ( dlg.exec() ) {
     configItem->setText( 0, resource->resourceName() );
     configItem->setText( 1, resource->type() );
 
     if ( configItem->standard() && configItem->readOnly() ) {
-      KMessageBox::sorry( this, i18n( "You cannot use a read-only resource as standard!" ) );
+      KMessageBox::sorry( this, i18n( "You cannot use a read-only<br> resource as standard!" ) );
       configItem->setStandard( false );
     }
 
     mCurrentManager->resourceChanged( resource );
     emit changed( true );
   }
@@ -396,18 +421,18 @@ void ConfigPage::slotStandard()
 
   ConfigViewItem *item = static_cast<ConfigViewItem*>( mListView->currentItem() );
   if ( !item )
     return;
 
   if ( item->readOnly() ) {
-    KMessageBox::sorry( this, i18n( "You cannot use a read-only resource as standard!" ) );
+    KMessageBox::sorry( this, i18n( "You cannot use a read-only<br>resource as standard!" ) );
     return;
   }
 
   if ( !item->isOn() ) {
-    KMessageBox::sorry( this, i18n( "You cannot use an inactive resource as standard!" ) );
+    KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) );
     return;
   }
 
   QListViewItem *it = mListView->firstChild();
   while ( it != 0 ) {
     ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it );
@@ -461,13 +486,13 @@ void ConfigPage::resourceDeleted( Resource* resource )
 void ConfigPage::slotItemClicked( QListViewItem *item )
 {
   ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item );
   if ( !configItem ) return;
 
   if ( configItem->standard() && !configItem->isOn() ) {
-    KMessageBox::sorry( this, i18n( "You cannot deactivate the standard resource. Choose another standard resource first." ) );
+    KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) );
     configItem->setOn( true );
     return;
   }
 
   if ( configItem->isOn() != configItem->resource()->isActive() ) {
     emit changed( true );
@@ -496,13 +521,13 @@ void ConfigPage::saveResourceSettings()
 
       item = item->nextSibling();
     }
     mCurrentManager->writeConfig( mCurrentConfig );
 
     if ( !mCurrentManager->standardResource() )
-      KMessageBox::sorry( this, i18n( "There is no valid standard resource! Please select one which is neither read-only nor inactive." ) );
+      KMessageBox::sorry( this, i18n( "There is no valid standard resource!<br>Please select one which is neither read-only nor inactive." ) );
   }
   
     qDebug("ConfigPage::saveResourceSettings() end");
   
 }