summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Unidiff
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
@@ -48,12 +48,13 @@
48#include "kglobal.h" 48#include "kglobal.h"
49#include "klocale.h" 49#include "klocale.h"
50#include "kconfig.h" 50#include "kconfig.h"
51#include "simplealarmclient.h" 51#include "simplealarmclient.h"
52
53using namespace KCal; 52using namespace KCal;
54#ifndef _WIN32_ 53#ifndef _WIN32_
55#include <unistd.h> 54#include <unistd.h>
55#else
56#include "koimportoldialog.h"
56#endif 57#endif
57#include "mainwindow.h" 58#include "mainwindow.h"
58 59
59int globalFlagBlockStartup; 60int globalFlagBlockStartup;
@@ -583,8 +584,16 @@ void MainWindow::initActions()
583 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 584 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
584 this ); 585 this );
585 action->addTo( importMenu ); 586 action->addTo( importMenu );
586 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 587 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
588#else
589#ifdef _WIN32_
590 importMenu->insertSeparator();
591 action = new QAction( "import_ol", i18n("Import from OL"), 0,
592 this );
593 action->addTo( importMenu );
594 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
595#endif
587#endif 596#endif
588 597
589 importMenu->insertSeparator(); 598 importMenu->insertSeparator();
590 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 599 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
@@ -929,9 +938,11 @@ void MainWindow::multiSync( bool askforPrefs )
929void MainWindow::slotSyncMenu( int action ) 938void MainWindow::slotSyncMenu( int action )
930{ 939{
931 //qDebug("syncaction %d ", action); 940 //qDebug("syncaction %d ", action);
932 if ( action == 0 ) { 941 if ( action == 0 ) {
942
933 confSync(); 943 confSync();
944
934 return; 945 return;
935 } 946 }
936 if ( action == 1 ) { 947 if ( action == 1 ) {
937 multiSync( true ); 948 multiSync( true );
@@ -1218,8 +1229,17 @@ void MainWindow::enableIncidenceActions( bool enabled )
1218 mEditAction->setEnabled( enabled ); 1229 mEditAction->setEnabled( enabled );
1219 mDeleteAction->setEnabled( enabled ); 1230 mDeleteAction->setEnabled( enabled );
1220} 1231}
1221 1232
1233void MainWindow::importOL()
1234{
1235#ifdef _WIN32_
1236 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1237 id->exec();
1238 delete id;
1239 mView->updateView();
1240#endif
1241}
1222void MainWindow::importBday() 1242void MainWindow::importBday()
1223{ 1243{
1224 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 1244 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
1225 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), 1245 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),