| -rw-r--r-- | korganizer/mainwindow.cpp | 10 | ||||
| -rw-r--r-- | libkdepim/libkdepim.pro | 2 | ||||
| -rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 27 |
3 files changed, 27 insertions, 12 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f4ac0d6..7bf33d3 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -871,9 +871,9 @@ void MainWindow::fillSyncMenu() if ( mServerSocket == 0 ) { - syncMenu->insertItem( i18n("Enable Easy-Pi-Sync"), 2 ); + syncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); } else { - syncMenu->insertItem( i18n("Disable Easy-Pi-Sync"), 3 ); + syncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); } syncMenu->insertSeparator(); - syncMenu->insertItem( i18n("New Easy-Pi-Sync!"), 4 ); - syncMenu->insertItem( i18n("Quick Easy-Pi-Sync!"), 5 ); + syncMenu->insertItem( i18n("New Pi-Sync!"), 4 ); + syncMenu->insertItem( i18n("Quick Pi-Sync!"), 5 ); syncMenu->insertSeparator(); @@ -2009,3 +2009,5 @@ void MainWindow::getFile(QSocket* socket) qDebug("waiting1c %d ",ti.elapsed () ); +#ifndef _WIN32_ usleep( 100000); +#endif } diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index 7231842..eac19ea 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro @@ -33,2 +33,3 @@ HEADERS = \ kprefswidget.h \ + ksyncmanager.h \ ksyncprofile.h \ @@ -51,2 +52,3 @@ SOURCES = \ kprefswidget.cpp \ + ksyncmanager.cpp \ ksyncprofile.cpp \ diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index 7f2a326..1c3e0ae 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp @@ -44,2 +44,3 @@ #include <qstring.h> +#include <qmessagebox.h> #include <qapplication.h> @@ -1206,10 +1207,13 @@ static QString readEnvPath(const char *env) { -#ifdef _WIN32_ - return ""; -#else - QCString c_path = getenv(env); - if (c_path.isEmpty()) - return QString::null; - return QFile::decodeName(c_path); -#endif + //#ifdef _WIN32_ + // return ""; + //#else + QCString c_path; + if ( getenv(env) != NULL ) + c_path = QString ( getenv(env) ); + if (c_path.isEmpty()) + return QString::null; + return QFile::decodeName(c_path); + //#endif + } @@ -1218,2 +1222,3 @@ void KStandardDirs::addKDEDefaults() { + //qDebug("ERROR: KStandardDirs::addKDEDefaults() called "); @@ -1269,4 +1274,10 @@ void KStandardDirs::addKDEDefaults() { +#ifdef _WIN32_ + if (localKdeDir.at(localKdeDir.length()-1) != '\\') + localKdeDir += '\\'; +#else if (localKdeDir.at(localKdeDir.length()-1) != '/') localKdeDir += '/'; +#endif + //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); } |