-rw-r--r-- | korganizer/mainwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index d959a7a..53b65b2 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1665,24 +1665,25 @@ void MainWindow::enableIncidenceActions( bool enabled ) | |||
1665 | mMoveAction->setEnabled( enabled ); | 1665 | mMoveAction->setEnabled( enabled ); |
1666 | mBeamAction->setEnabled( enabled ); | 1666 | mBeamAction->setEnabled( enabled ); |
1667 | mCancelAction->setEnabled( enabled ); | 1667 | mCancelAction->setEnabled( enabled ); |
1668 | } | 1668 | } |
1669 | 1669 | ||
1670 | void MainWindow::importOL() | 1670 | void MainWindow::importOL() |
1671 | { | 1671 | { |
1672 | #ifdef _OL_IMPORT_ | 1672 | #ifdef _OL_IMPORT_ |
1673 | mView->clearAllViews(); | 1673 | mView->clearAllViews(); |
1674 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1674 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1675 | id->exec(); | 1675 | id->exec(); |
1676 | delete id; | 1676 | delete id; |
1677 | mView->calendar()->checkAlarmForIncidence( 0, true ); | ||
1677 | mView->updateView(); | 1678 | mView->updateView(); |
1678 | #endif | 1679 | #endif |
1679 | } | 1680 | } |
1680 | void MainWindow::importBday() | 1681 | void MainWindow::importBday() |
1681 | { | 1682 | { |
1682 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 1683 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
1683 | i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), | 1684 | i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), |
1684 | i18n("Import!"), i18n("Cancel"), 0, | 1685 | i18n("Import!"), i18n("Cancel"), 0, |
1685 | 0, 1 ); | 1686 | 0, 1 ); |
1686 | if ( result == 0 ) { | 1687 | if ( result == 0 ) { |
1687 | mView->importBday(); | 1688 | mView->importBday(); |
1688 | 1689 | ||
@@ -1703,24 +1704,25 @@ void MainWindow::importQtopia() | |||
1703 | if ( result == 0 ) { | 1704 | if ( result == 0 ) { |
1704 | #ifndef DESKTOP_VERSION | 1705 | #ifndef DESKTOP_VERSION |
1705 | QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); | 1706 | QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); |
1706 | QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); | 1707 | QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); |
1707 | QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; | 1708 | QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; |
1708 | #else | 1709 | #else |
1709 | QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; | 1710 | QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; |
1710 | QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; | 1711 | QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; |
1711 | QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; | 1712 | QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; |
1712 | #endif | 1713 | #endif |
1713 | mView->importQtopia( categories, datebook, todolist ); | 1714 | mView->importQtopia( categories, datebook, todolist ); |
1714 | } | 1715 | } |
1716 | mView->calendar()->reInitAlarmSettings(); | ||
1715 | #if 0 | 1717 | #if 0 |
1716 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 1718 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
1717 | i18n("Not supported \non desktop!\n"), | 1719 | i18n("Not supported \non desktop!\n"), |
1718 | i18n("Ok"), i18n("Cancel"), 0, | 1720 | i18n("Ok"), i18n("Cancel"), 0, |
1719 | 0, 1 ); | 1721 | 0, 1 ); |
1720 | 1722 | ||
1721 | #endif | 1723 | #endif |
1722 | } | 1724 | } |
1723 | 1725 | ||
1724 | void MainWindow::saveOnClose() | 1726 | void MainWindow::saveOnClose() |
1725 | { | 1727 | { |
1726 | KOPrefs *p = KOPrefs::instance(); | 1728 | KOPrefs *p = KOPrefs::instance(); |