summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (show 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
@@ -51,3 +51,2 @@
#include "simplealarmclient.h"
-
using namespace KCal;
@@ -55,2 +54,4 @@ using namespace KCal;
#include <unistd.h>
+#else
+#include "koimportoldialog.h"
#endif
@@ -586,2 +587,10 @@ void MainWindow::initActions()
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
@@ -932,3 +941,5 @@ void MainWindow::slotSyncMenu( int action )
if ( action == 0 ) {
+
confSync();
+
return;
@@ -1221,2 +1232,11 @@ void MainWindow::enableIncidenceActions( bool 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()