summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koimportoldialog.cpp466
-rw-r--r--korganizer/koimportoldialog.h83
-rw-r--r--korganizer/korganizer.pro23
-rw-r--r--korganizer/mainwindow.cpp22
-rw-r--r--korganizer/mainwindow.h1
5 files changed, 592 insertions, 3 deletions
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
new file mode 100644
index 0000000..36363e5
--- a/dev/null
+++ b/korganizer/koimportoldialog.cpp
@@ -0,0 +1,466 @@
+/*
+ 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 <qwidgetstack.h>
+#include <qdatetime.h>
+#include <qdir.h>
+#include <qapplication.h>
+#include <qhbox.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 "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 ) { ; };
+ OLEListViewItem( QListViewItem *after, QString text ) :
+ QCheckListItem( after, text, QCheckListItem::CheckBox ) { ; };
+ ~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 );
+ mListView = new QListView( mw );
+ mListView->addColumn(i18n("Select Folder to import"));
+ mListView->addColumn(i18n("Content Type"));
+ mCalendar = calendar;
+ connect( this, SIGNAL( user1Clicked() ),SLOT ( slotApply()));
+ setupFolderView();
+ resize( sizeHint().width()+50, sizeHint().height()+50 );
+}
+
+KOImportOLdialog::~KOImportOLdialog()
+{
+
+}
+
+
+void KOImportOLdialog::setupFolderView()
+{
+ SCODE sc = ::OleInitialize(NULL);
+ if ( FAILED ( sc ) ) {
+ KMessageBox::information(this,"OLE initialisation failed");
+ return;
+ }
+
+ if(!gOlApp.CreateDispatch(_T("Outlook.Application"),NULL)){
+ KMessageBox::information(this,"Sorry, cannot access Outlook");
+ return ;
+ }
+ MAPIFolder mfInbox;
+ MAPIFolder mfRoot;
+ CString szName;
+ _NameSpace olNS;
+ olNS = gOlApp.GetNamespace(_T("MAPI"));
+ mfInbox = olNS.GetDefaultFolder(6);
+ mfRoot = mfInbox.GetParent();
+ szName = mfRoot.GetName();
+ long iType = mfRoot.GetDefaultItemType();
+ QString mes;
+ mes = QString::fromUcs2( szName.GetBuffer() );
+ OLEListViewItem * root = new OLEListViewItem( mListView, mes );
+ mfRoot.m_lpDispatch->AddRef();
+ addFolder( root, mfRoot.m_lpDispatch );
+ root->setOpen( true );
+ mListView->setSortColumn( 0 );
+ mListView->sort( );
+}
+
+
+void KOImportOLdialog::addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent)
+{
+ MAPIFolder mfParent(dispParent), mfChild;
+ _Folders folders;
+ _variant_t fndx((long)0);
+ CString szName;
+ long iType;
+ OLEListViewItem* hChild;
+
+ folders = mfParent.GetFolders();
+ 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() )
+ 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!") );
+ 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.show();
+ for(i=1; i <= folderItems.GetCount(); ++i)
+ {
+ qApp->processEvents();
+ if ( ! bar.isVisible() )
+ return ;
+ bar.setProgress( i );
+ 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()) );
+ QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer());
+ 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 );
+ uint weekDaysNum = recpat.GetDayOfWeekMask();
+ int i;
+ int bb = 2;
+ for( i = 1; i <= 6; ++i ) {
+ weekDays.setBit( i - 1, ( bb & weekDaysNum ));
+ bb = 4 << (i-1);
+ //qDebug(" %d bit %d ",i-1,weekDays.at(i-1) );
+ }
+ if ( 1 & weekDaysNum)
+ weekDays.setBit( 6 );
+ // int pos = 1;// pending
+
+ Recurrence *r = event->recurrence();
+ int rtype = recpat.GetRecurrenceType();
+ //recurrence types are:
+ /*
+ olRecursDaily(0)
+ olRecursWeekly(1)
+ olRecursMonthly(2)
+ olRecursMonthNth(3)
+ olRecursYearly(5)
+ olRecursYearNth(6)
+ */
+
+ int duration = recpat.GetOccurrences();
+ if ( !hasEndDate )
+ duration = -1;
+
+ //LPDISPATCH RecurrencePattern::GetExceptions()
+ //long RecurrencePattern::GetMonthOfYear()
+ if ( rtype == 0 ) {
+ if ( hasEndDate ) r->setDaily( freq, endDate );
+ else r->setDaily( freq, duration );
+ } else if ( rtype == 1 ) {
+ if ( hasEndDate ) r->setWeekly( freq, weekDays, endDate );
+ else r->setWeekly( freq, weekDays, duration );
+ } else if ( rtype == 2 ) {
+ if ( hasEndDate )
+ r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
+ else
+ r->setMonthly( Recurrence::rMonthlyDay, freq, duration );
+ //r->addMonthlyDay( startDate.day() );
+ r->addMonthlyDay( recpat.GetDayOfMonth() );
+ } else if ( rtype == 3 ) {
+ if ( hasEndDate )
+ r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
+ else
+ r->setMonthly( Recurrence::rMonthlyPos, freq, duration );
+ QBitArray days( 7 );
+ days.fill( false );
+ days.setBit( startDate.dayOfWeek() - 1 );
+ int pos = (startDate.day()/7)+1;
+ r->addMonthlyPos( pos, days );
+ //QString mes = i18n("Importing monthlypos.\n\npos: %1 , day: %2").arg( pos).arg( startDate.dayOfWeek() - 1);
+ //KMessageBox::information(this,mes);
+ } else if ( rtype == 5 ) {
+ freq = 1;
+ if ( hasEndDate )
+ r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
+ else
+ r->setYearly( Recurrence::rYearlyMonth, freq, duration );
+ r->addYearlyNum( startDate.month() );
+ } else if ( true /*rtype == 6*/ ) {
+ // KOganizer cannot handle this in the GUI
+ // we are mapping this to monthly - every 12. month
+ freq = 12;
+ if ( hasEndDate )
+ r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
+ else
+ r->setMonthly( Recurrence::rMonthlyPos, freq, duration );
+ QBitArray days( 7 );
+ days.fill( false );
+ days.setBit( startDate.dayOfWeek() - 1 );
+ int pos = (startDate.day()/7)+1;
+ r->addMonthlyPos( pos, days );
+ }
+ // recurrence exceptions
+ LPDISPATCH dispItem = recpat.GetExceptions();
+ dispItem->AddRef();
+ Exceptions ex(dispItem);
+ _variant_t indx((long)0);
+ LPDISPATCH itm;
+ for(i=1; i <= ex.GetCount(); ++i) {
+ indx = (long)i;
+ itm = ex.Item( indx.Detach() );
+ ::Exception * pItem = (::Exception *)&itm;
+ event->addExDate( QDateTime( mDdate2Qdtr( pItem->GetOriginalDate())).date() );
+ if ( !pItem->GetDeleted() ) {
+ LPDISPATCH appIt = pItem->GetAppointmentItem();
+ _AppointmentItem * paItem = (_AppointmentItem *)&appIt;
+ ol2kopiCalendar( paItem, false );
+ }
+ itm->Release();
+ }
+ }
+ // recurrence ENTE
+ event->setOrganizer( QString::fromUcs2( aItem->GetOrganizer().GetBuffer()));
+
+ //GetOptionalAttendees()
+ //GetRequiredAttendees()
+ LPDISPATCH dispItem = aItem->GetRecipients();
+ dispItem->AddRef();
+ _Folders mf(dispItem);
+ mf.m_lpDispatch->AddRef();
+ _variant_t indx((long)0);
+ LPDISPATCH itm;
+ int i;
+ QString optAtt = QString::fromUcs2( aItem->GetOptionalAttendees().GetBuffer());
+ QString reqAtt = QString::fromUcs2( aItem->GetRequiredAttendees().GetBuffer());
+ //GetRequiredAttendees()
+ for(i=1; i <= mf.GetCount(); ++i) {
+ indx = (long)i;
+ itm = mf.Item( indx.Detach() );
+ Recipient * pItem = (Recipient *)&itm;
+
+ //a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
+ QString name = QString::fromUcs2( pItem->GetName().GetBuffer());
+ KCal::Attendee::PartStat stat;
+ bool rsvp = false;
+ switch ( pItem->GetMeetingResponseStatus() ) {
+ case 0: //not answered
+ rsvp = true;
+ case 5: //not answered
+ stat = Attendee::NeedsAction;
+ break;
+ case 1: //organizer
+ stat = Attendee::Delegated ;
+ break;
+ case 2: //tentative
+ stat = Attendee::Tentative ;
+ break;
+ case 3: //accepted
+ stat = Attendee::Accepted;
+ break;
+ case 4: //declined
+ stat =Attendee::Declined ;
+ break;
+ default:
+ stat = Attendee::NeedsAction ;
+
+ }
+ KCal::Attendee::Role role;
+ if ( event->organizer() == name )
+ role = KCal::Attendee::Chair;
+ else if ( reqAtt.find( name ) >= 0 )
+ role = KCal::Attendee::ReqParticipant;
+ else if ( optAtt.find( name ) >= 0 )
+ role = KCal::Attendee::OptParticipant;
+ else
+ role = KCal::Attendee::NonParticipant;
+ QString mail = QString::fromUcs2(pItem->GetAddress().GetBuffer());
+ if( mail.isEmpty() && name.find("@") > 0 )
+ mail = name;
+ QString uid;
+ if ( mail.isEmpty() )
+ uid = QString::fromUcs2( pItem->GetEntryID().GetBuffer());
+ else
+ uid = mail;
+ mail = mail.stripWhiteSpace();
+ KCal::Attendee * a = new KCal::Attendee( name, mail,rsvp,stat,role,uid) ;
+ event->addAttendee( a , false );
+ itm->Release();
+ }
+
+
+ if ( !mCalendar->addEventNoDup( event ))
+ delete event;
+ else {
+ // QString mes = i18n("Importing %1.\n date: %2 date: %3").arg( event->summary()).arg( event->dtStart().toString()).arg( event->dtEnd().toString());
+ //KMessageBox::information(this,mes);
+ ++importedItems;
+ }
+}
+void KOImportOLdialog::slotCancel()
+{
+ reject();
+}
diff --git a/korganizer/koimportoldialog.h b/korganizer/koimportoldialog.h
new file mode 100644
index 0000000..f6a753d
--- a/dev/null
+++ b/korganizer/koimportoldialog.h
@@ -0,0 +1,83 @@
+/*
+ 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.
+*/
+#ifndef KOINCIDENCEEDITOR_H
+#define KOINCIDENCEEDITOR_H
+
+#include <kdialogbase.h>
+
+#include <afxdisp.h>
+#include <libkcal/calendar.h>
+#include <libkcal/event.h>
+
+
+class QDateTime;
+class QListView;
+class OLEListViewItem;
+class _AppointmentItem;
+namespace KPIM { class CategorySelectDialog; }
+
+using namespace KCal;
+
+/**
+ This is the base class for the calendar component editors.
+*/
+class KOImportOLdialog : public KDialogBase
+{
+ Q_OBJECT
+ public:
+ /**
+ Construct new IncidenceEditor.
+ */
+ KOImportOLdialog( const QString &caption, Calendar *calendar,
+ QWidget *parent );
+ virtual ~KOImportOLdialog();
+
+ /** Initialize editor. This function creates the tab widgets. */
+ void init();
+
+ public slots:
+
+
+ signals:
+
+ protected slots:
+ void slotApply();
+ void slotOk();
+ void slotCancel();
+
+ protected:
+ void setupFolderView();
+ void addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent);
+ void readCalendarData( DWORD folder );
+ void ol2kopiCalendar( _AppointmentItem * , bool computeRecurrence = true );
+
+ Calendar *mCalendar;
+ QListView * mListView;
+
+ private:
+ int importedItems;
+};
+
+#endif
+
+
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index fe2250e..4e8ce11 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -21,20 +21,24 @@ LIBS += ../bin/libmicrokde.so
LIBS += ../bin/libmicrokabc.so
LIBS += -lldap
OBJECTS_DIR = obj/unix
MOC_DIR = moc/unix
}
win32: {
-DEFINES += _WIN32_
+DEFINES += _WIN32_
LIBS += ../bin/microkdepim.lib
LIBS += ../bin/microkcal.lib
LIBS += ../bin/microkde.lib
LIBS += ../bin/microkabc.lib
LIBS += ../libical/lib/ical.lib
LIBS += ../libical/lib/icalss.lib
+#LIBS += atls.lib
+LIBS += mfc71u.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
+#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
+#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
}
INTERFACES = kofilterview_base.ui
@@ -100,13 +104,14 @@ HEADERS = \
searchdialog.h \
simplealarmclient.h \
statusdialog.h \
timeline.h \
timespanview.h \
version.h \
- ../kalarmd/alarmdialog.h
+ ../kalarmd/alarmdialog.h \
+
SOURCES = \
filteredit_base.cpp \
calendarview.cpp \
datenavigator.cpp \
docprefs.cpp \
@@ -167,6 +172,20 @@ filteredit_base.cpp \
HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
INTERFACES += calprintdayconfig_base.ui \
calprintmonthconfig_base.ui \
calprinttodoconfig_base.ui \
calprintweekconfig_base.ui
SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
+
+
+
+win32: {
+HEADERS += ../outport/msoutl9.h \
+ koimportoldialog.h
+
+
+SOURCES += ../outport/msoutl9.cpp \
+ koimportoldialog.cpp
+
+
+}
+
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 40f2cf4..be69be7 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -46,16 +46,17 @@
#include "kfiledialog.h"
#include "koglobals.h"
#include "kglobal.h"
#include "klocale.h"
#include "kconfig.h"
#include "simplealarmclient.h"
-
using namespace KCal;
#ifndef _WIN32_
#include <unistd.h>
+#else
+#include "koimportoldialog.h"
#endif
#include "mainwindow.h"
int globalFlagBlockStartup;
MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
QMainWindow( parent, name )
@@ -581,12 +582,20 @@ void MainWindow::initActions()
#ifndef DESKTOP_VERSION
importMenu->insertSeparator();
action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
this );
action->addTo( importMenu );
connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
+#else
+#ifdef _WIN32_
+ importMenu->insertSeparator();
+ action = new QAction( "import_ol", i18n("Import from OL"), 0,
+ this );
+ action->addTo( importMenu );
+ connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
+#endif
#endif
importMenu->insertSeparator();
action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
this );
action->addTo( importMenu );
@@ -927,13 +936,15 @@ void MainWindow::multiSync( bool askforPrefs )
return;
}
void MainWindow::slotSyncMenu( int action )
{
//qDebug("syncaction %d ", action);
if ( action == 0 ) {
+
confSync();
+
return;
}
if ( action == 1 ) {
multiSync( true );
return;
}
@@ -1216,12 +1227,21 @@ void MainWindow::enableIncidenceActions( bool enabled )
{
mShowAction->setEnabled( enabled );
mEditAction->setEnabled( enabled );
mDeleteAction->setEnabled( enabled );
}
+void MainWindow::importOL()
+{
+#ifdef _WIN32_
+ KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
+ id->exec();
+ delete id;
+ mView->updateView();
+#endif
+}
void MainWindow::importBday()
{
int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
i18n("Import!"), i18n("Cancel"), 0,
0, 1 );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index ee4aaa6..a681f42 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -50,12 +50,13 @@ class MainWindow : public QMainWindow
void aboutKnownBugs();
void processIncidenceSelection( Incidence * );
void importQtopia();
void importBday();
+ void importOL();
void importIcal();
void importFile( QString, bool );
void quickImportIcal();
void slotModifiedChanged( bool );