| author | zautrix <zautrix> | 2005-03-02 15:12:43 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-03-02 15:12:43 (UTC) |
| commit | 9e0ceaa58a686fb64f8133ffa9e73866e985a464 (patch) (side-by-side diff) | |
| tree | 794d5af071dba939d4ff6b27544274c36b5ecec5 /korganizer/mainwindow.cpp | |
| parent | 6733b0548df446fade0a58d409d5f80314e5ed4b (diff) | |
| download | kdepimpi-9e0ceaa58a686fb64f8133ffa9e73866e985a464.zip kdepimpi-9e0ceaa58a686fb64f8133ffa9e73866e985a464.tar.gz kdepimpi-9e0ceaa58a686fb64f8133ffa9e73866e985a464.tar.bz2 | |
print fix. added desktop Qtopia import
| -rw-r--r-- | korganizer/mainwindow.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 2de7f28..006a8dd 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -835,3 +835,3 @@ void MainWindow::initActions() connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); -#ifndef DESKTOP_VERSION + //#ifndef DESKTOP_VERSION importMenu->insertSeparator(); @@ -841,3 +841,3 @@ void MainWindow::initActions() connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); -#else + //#else #ifdef _OL_IMPORT_ @@ -849,3 +849,3 @@ void MainWindow::initActions() #endif -#endif + //#endif @@ -1511,5 +1511,8 @@ void MainWindow::importQtopia() { -#ifndef DESKTOP_VERSION - int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), - i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"), + //#ifndef DESKTOP_VERSION + QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); +#ifdef DESKTOP_VERSION + mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); +#endif + int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, i18n("Import!"), i18n("Cancel"), 0, @@ -1517,2 +1520,3 @@ void MainWindow::importQtopia() if ( result == 0 ) { +#ifndef DESKTOP_VERSION QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); @@ -1520,5 +1524,10 @@ void MainWindow::importQtopia() QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; +#else + QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; + QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; + QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; +#endif mView->importQtopia( categories, datebook, todolist ); } -#else +#if 0 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |