summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 40f2cf4..be69be7 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -49,10 +49,11 @@
#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"
@@ -584,6 +585,14 @@ void MainWindow::initActions()
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();
@@ -930,7 +939,9 @@ void MainWindow::slotSyncMenu( int action )
{
//qDebug("syncaction %d ", action);
if ( action == 0 ) {
+
confSync();
+
return;
}
if ( action == 1 ) {
@@ -1219,6 +1230,15 @@ void MainWindow::enableIncidenceActions( bool 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!"),