From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- wizards/Makefile.am | 44 ++++++----------------------------------- wizards/egroupwaremain.cpp | 4 ++-- wizards/exchangemain.cpp | 4 ++-- wizards/groupwarewizard.desktop | 1 - wizards/kmailchanges.cpp | 16 ++++++++++----- wizards/kolabmain.cpp | 4 ++-- wizards/overviewpage.cpp | 19 ++++-------------- wizards/overviewpage.h | 1 - 8 files changed, 27 insertions(+), 66 deletions(-) (limited to 'wizards') diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 0a211294..61332233 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -4,22 +4,21 @@ INCLUDES = -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \ -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \ -I$(top_srcdir)/knotes \ -I$(top_srcdir)/certmanager/lib \ - -I$(top_builddir)/kresources/groupwise \ -I$(top_builddir)/kresources/lib \ -I$(top_srcdir)/kresources/lib \ $(all_includes) bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \ - groupwisewizard exchangewizard scalixwizard + exchangewizard kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \ - libkolabwizard.la libgroupwisewizard.la \ - libexchangewizard.la libscalixwizard.la + libkolabwizard.la \ + libexchangewizard.la groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \ - libkolabwizard.la libgroupwisewizard.la \ + libkolabwizard.la \ libexchangewizard.la groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp @@ -64,22 +63,6 @@ sloxwizard_LDADD = libsloxwizard.la sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) sloxwizard_SOURCES = sloxmain.cpp -# GroupWise -libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ - kmailchanges.cpp -libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \ - $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \ - $(top_builddir)/libkdepim/libkdepim.la \ - $(top_builddir)/libkpimidentities/libkpimidentities.la -libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \ - $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h - - -groupwisewizard_LDADD = libgroupwisewizard.la -groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) -groupwisewizard_SOURCES = groupwisemain.cpp - # Exchange libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libexchangewizard_la_SOURCES = exchangewizard.cpp @@ -91,25 +74,10 @@ exchangewizard_LDADD = libexchangewizard.la exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) exchangewizard_SOURCES = exchangemain.cpp -# Scalix -libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \ - $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \ - $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la \ - $(top_builddir)/libkpimidentities/libkpimidentities.la - -libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc \ - scalixkmailchanges.cpp - -scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI) -scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) -scalixwizard_SOURCES = scalixmain.cpp - noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ - groupwisewizard.h exchangewizard.h + exchangewizard.h -kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg +kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kdepimwizards.pot diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index 86777c61..153c2f83 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -50,8 +50,8 @@ int main(int argc,char **argv) bool verbose = false; if ( args->isSet( "verbose" ) ) verbose = true; - + args->clear(); EGroupwareWizard wizard; - wizard.exec(); + return wizard.exec(); } diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index 3b68951e..60d58490 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -50,8 +50,8 @@ int main(int argc,char **argv) bool verbose = false; if ( args->isSet( "verbose" ) ) verbose = true; - + args->clear(); ExchangeWizard wizard; - wizard.exec(); + return wizard.exec(); } diff --git a/wizards/groupwarewizard.desktop b/wizards/groupwarewizard.desktop index ae84eb98..45fd1956 100644 --- a/wizards/groupwarewizard.desktop +++ b/wizards/groupwarewizard.desktop @@ -22,7 +22,6 @@ Name[hu]=KDE csoportmunka-varázsló Name[is]=KDE hópvinnukerfisálfur Name[it]=Assistente configurazione di KDE Groupware Name[ja]=KDE グループウェアウィザード -Name[ka]=სერვერი Groupware Name[kk]=KDE бірікен жұмыс шебері Name[km]=អ្នក​ជំនួយការ​កម្មវិធី​ពហុ​អ្នក​ប្រើ​របស់ KDE Name[ko]=KDE 그룹웨어 마법사 diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index ca2969a5..79e06f58 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -243,10 +243,11 @@ void CreateDisconnectedImapAccount::apply() c.setGroup( TQString("Folder-%1").arg( uid ) ); c.writeEntry( "isOpen", true ); - if ( mEnableSavePassword ) { - c.writeEntry( "pass", KStringHandler::obscure( mPassword ) ); - c.writeEntry( "store-passwd", true ); - } + c.setGroup( "AccountWizard" ); + c.writeEntry( "ShowOnStartup" , false ); + + c.setGroup( "Composer" ); + c.writeEntry( "default-transport", mAccountName ); c.setGroup( TQString("Transport %1").arg( transportId ) ); c.writeEntry( "name", mAccountName ); @@ -295,7 +296,7 @@ void CreateDisconnectedImapAccount::apply() KPIM::Identity& identity = identityManager.newFromScratch( accountName ); identity.setFullName( mRealName ); - identity.setEmailAddr( mEmail ); + identity.setPrimaryEmailAddress( mEmail ); identityManager.commit(); } @@ -360,6 +361,11 @@ void CreateOnlineImapAccount::apply() c.setGroup( TQString("Folder-%1").arg( uid ) ); c.writeEntry( "isOpen", true ); + + + c.setGroup( "AccountWizard" ); + c.writeEntry( "ShowOnStartup" , false ); + } bool CreateImapAccount::writeToWallet(const TQString & type, int id) diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 865dd9bd..1aa817ad 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -50,8 +50,8 @@ int main(int argc,char **argv) bool verbose = false; if ( args->isSet( "verbose" ) ) verbose = true; - + args->clear(); KolabWizard wizard; - wizard.exec(); + return wizard.exec(); } diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 657a8a0d..2ee90096 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -35,7 +35,6 @@ #include "egroupwarewizard.h" #include "kolabwizard.h" #include "sloxwizard.h" -#include "groupwisewizard.h" #include "exchangewizard.h" #include "overviewpage.h" @@ -75,26 +74,22 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) layout->addMultiCellWidget( button, 5, 5, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) ); - button = new TQPushButton( i18n("Novell GroupWise"), this ); - layout->addMultiCellWidget( button, 6, 6, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardGroupwise() ) ); - button = new TQPushButton( i18n("Microsoft Exchange"), this ); button->hide(); // not quite ready yet - layout->addMultiCellWidget( button, 7, 7, 0, 3 ); + layout->addMultiCellWidget( button, 6, 6, 0, 3 ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) ); TQFrame *frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - layout->addMultiCellWidget( frame, 8, 8, 0, 3 ); + layout->addMultiCellWidget( frame, 7, 7, 0, 3 ); TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this ); - layout->addWidget( cancelButton, 9, 3 ); + layout->addWidget( cancelButton, 8, 3 ); connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) ); - layout->setRowStretch( 8, 1 ); + layout->setRowStretch( 7, 1 ); KAcceleratorManager::manage( this ); } @@ -121,12 +116,6 @@ void OverViewPage::showWizardSlox() wizard.exec(); } -void OverViewPage::showWizardGroupwise() -{ - GroupwiseWizard wizard; - wizard.exec(); -} - void OverViewPage::showWizardExchange() { ExchangeWizard wizard; diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h index 1d93e42d..487b14ce 100644 --- a/wizards/overviewpage.h +++ b/wizards/overviewpage.h @@ -36,7 +36,6 @@ class OverViewPage : public QWidget void showWizardEGroupware(); void showWizardKolab(); void showWizardSlox(); - void showWizardGroupwise(); void showWizardExchange(); signals: -- cgit v1.2.3