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/overviewpage.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'wizards/overviewpage.cpp') diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 657a8a0da..2ee90096b 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; -- cgit v1.2.1