fixxx

1 files changed, 5 insertions, 3 deletions

diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 7aa6076..2af436c 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -1,92 +1,93 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
+#include <qprogressdialog.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kinputdialog.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <kabc/stdaddressbook.h>
 
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "koimportoldialog.h"
 
 #include "../outport/msoutl9.h"
 #include <ole2.h>
 #include <comutil.h>
 _Application gOlApp;
 
 QDateTime mDdate2Qdtr( DATE dt)
 {
     COleDateTime odt;
     SYSTEMTIME st;
     odt = dt;
     odt.GetAsSystemTime(st);
     QDateTime qdt (QDate(st.wYear, st.wMonth,st.wDay ),QTime( st.wHour, st.wMinute,st.wSecond ) );
     return qdt;
 }
 
 class OLEListViewItem : public QCheckListItem
 {
   public:
     OLEListViewItem( QListView *parent, QString text ) :
       QCheckListItem( parent, text, QCheckListItem::CheckBox ) { mData = 0; };
     OLEListViewItem(  QListViewItem *after, QString text ) :
       QCheckListItem( after, text, QCheckListItem::CheckBox ) { mData = 0; };
     ~OLEListViewItem() {};
   void setData( DWORD data ) {mData= data; };
   DWORD data() { return mData ;};
   private:
      DWORD  mData;
 }; 
 
 KOImportOLdialog::KOImportOLdialog( const QString &caption, 
                                       Calendar *calendar, QWidget *parent ) :
     KDialogBase( Plain, caption, User1 | Close, Ok,
                parent, caption, true, false, i18n("Import!") )
 {
   QHBox * mw = new  QHBox( this );
   setMainWidget( mw );
@@ -150,142 +151,143 @@ void KOImportOLdialog::addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent
     for(int i=1; i <= folders.GetCount(); ++i)
     {
       fndx = (long)i;
       mfChild = folders.Item(fndx.Detach());
       mfChild.m_lpDispatch->AddRef();
       szName = mfChild.GetName();
       iType = mfChild.GetDefaultItemType();
       hChild = new OLEListViewItem( iParent , QString::fromUcs2( szName.GetBuffer() ) );
       if ( iType != 1)
 	hChild->setEnabled( false );
       QString ts; 
       switch( iType ) {
       case 0:
 	ts = i18n("Mail");
 	break;
       case 1:
 	ts = i18n("Calendar");
 	break;
       case 2:
 	ts = i18n("Contacts");
 	break;
       case 3:
 	ts = i18n("Todos");
 	break;
       case 4:
 	ts = i18n("Journals");
 	break;
       case 5:
 	ts = i18n("Notes");
 	break;
       default:
 	ts = i18n("Unknown");
       }
       hChild->setText( 1,ts);
       hChild->setData( (DWORD) mfChild.m_lpDispatch );
       mfChild.m_lpDispatch->AddRef();
       addFolder(hChild, mfChild.m_lpDispatch);
     }
 }
 
 void KOImportOLdialog::slotApply()
 {
   importedItems = 0;
   OLEListViewItem* child = (OLEListViewItem*) mListView->firstChild();
   while ( child ) {
     if ( child->isOn()&& child->data() )
       readCalendarData( child->data() );
     child = (OLEListViewItem*) child->itemBelow();
   }
   QString mes = i18n("Importing complete.\n\n%1 items imported.").arg( importedItems);
   KMessageBox::information(this,mes);
 }
 void KOImportOLdialog::readCalendarData( DWORD folder )
 {
 
   LPDISPATCH dispItem = (LPDISPATCH)folder;
   dispItem->AddRef();
   MAPIFolder mf(dispItem);
   mf.m_lpDispatch->AddRef();
   _Items folderItems;
   _variant_t indx((long)0);
   LPDISPATCH itm;
   int i;
   folderItems = mf.GetItems(); 
-  QProgressBar bar( folderItems.GetCount(),0 );
-  bar.setCaption (i18n("Importing - close to abort!") );
+  QProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
+  bar.setCaption (i18n("Importing!") );
   int h = bar.sizeHint().height() ;
   int w = 300;
   int dw = QApplication::desktop()->width();
   int dh = QApplication::desktop()->height();
-  bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+  //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
   bar.show();
   for(i=1; i <= folderItems.GetCount(); ++i)
     {
       qApp->processEvents();
       if ( ! bar.isVisible() )
             return ;
       bar.setProgress( i );
+      bar.raise();
       indx = (long)i;
       itm = folderItems.Item(indx.Detach());
       _AppointmentItem * pItem = (_AppointmentItem *)&itm;
       ol2kopiCalendar( pItem );
       itm->Release();
     }
 }
 void KOImportOLdialog::slotOk()
 {
    QDialog::accept();
 }
 
 void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRecurrence )
 {
   KCal::Event* event = new KCal::Event();
   if ( aItem->GetAllDayEvent() ){
     event->setDtStart( QDateTime( mDdate2Qdtr( aItem->GetStart()).date(),QTime(0,0,0 ) ));
     event->setDtEnd( QDateTime( mDdate2Qdtr( aItem->GetEnd()) .date(),QTime(0,0,0 )).addDays(-1));
     event->setFloats( true );
   } else {
     event->setDtStart( mDdate2Qdtr( aItem->GetStart()) );
     event->setDtEnd( mDdate2Qdtr( aItem->GetEnd()) );
     event->setFloats( false );
   }
   event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()) );
   event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()) );
   event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "")  );
   QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("; "), ";");
   event->setCategories( QStringList::split( ";", cat ) );
   if ( aItem->GetReminderSet() ) {
     event->clearAlarms();
     Alarm* alarm = event->newAlarm();
     alarm->setStartOffset( -aItem->GetReminderMinutesBeforeStart()*60 );
     alarm->setEnabled( true );
     if ( aItem->GetReminderPlaySound() ) {
       alarm->setType( Alarm::Audio );
       alarm->setAudioFile( QString::fromUcs2( aItem->GetReminderSoundFile().GetBuffer()));
       }
     else
       alarm->setType( Alarm::Display );
     alarm->setRepeatCount( aItem->GetReplyTime() );
   }
   // OL :pub 0 - pers 1  -  priv 2 -  conf 3
   // KO : pub 0  -  priv 1 -  conf 2
   int sec =   aItem->GetSensitivity() ;
   if ( sec > 1 )// mapping pers -> private
     --sec;
   event->setSecrecy( sec );
   if ( aItem->GetBusyStatus() == 0 )
     event->setTransparency( Event::Transparent);// OL free
   else
     event->setTransparency( Event::Opaque);//OL all other	
 
   if ( aItem->GetIsRecurring() && computeRecurrence ) { //recur
 
     RecurrencePattern recpat = aItem->GetRecurrencePattern();
  
     QDate startDate = mDdate2Qdtr(recpat.GetPatternStartDate()).date();
     int freq = recpat.GetInterval();
     
     bool hasEndDate = !recpat.GetNoEndDate();
     QDate endDate = mDdate2Qdtr(recpat.GetPatternEndDate()).date();
     QBitArray weekDays( 7 );
     weekDays.fill(false );