summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp10
-rw-r--r--libkdepim/libkdepim.pro2
-rw-r--r--microkde/kdecore/kstandarddirs.cpp27
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
@@ -860,31 +860,31 @@ void MainWindow::initActions()
QWhatsThis::whatsThisButton ( iconToolBar );
connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) );
configureAgenda( p->mHourSize );
connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) );
}
void MainWindow::fillSyncMenu()
{
if ( syncMenu->count() )
syncMenu->clear();
syncMenu->insertItem( i18n("Configure..."), 0 );
syncMenu->insertSeparator();
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();
syncMenu->insertItem( i18n("Multiple sync"), 1 );
syncMenu->insertSeparator();
KConfig config ( locateLocal( "config","ksyncprofilesrc" ) );
config.setGroup("General");
QStringList prof = config.readListEntry("SyncProfileNames");
KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
if ( prof.count() < 3 ) {
prof.clear();
prof << i18n("Sharp_DTM");
prof << i18n("Local_file");
prof << i18n("Last_file");
@@ -1998,25 +1998,27 @@ void MainWindow::getFile(QSocket* socket)
while ( socket->canReadLine () ) {
qDebug("avail %d ", socket->bytesAvailable () );
ts << socket->readLine ();
}
QTime ti;
ti.start();
while ( ti.elapsed () < 5000 && !socket->canReadLine () ) {
qDebug("waiting1a %d %d ",ti.elapsed (), socket->bytesAvailable () );
//qApp->processEvents();
qDebug("waiting1b %d ",ti.elapsed () );
if ( !socket->canReadLine () ) {
qDebug("waiting1c %d ",ti.elapsed () );
+#ifndef _WIN32_
usleep( 100000);
+#endif
}
//socket->waitForMore ( 100 );
}
ts << socket->readLine ();
#if 0
#ifdef DESKTOP_VERSION
socket->waitForMore ( 5000 );
#else
// socket->waitForMore ( 5000 );
// seems to be broken in qt2
bool stop = false;
QTime ti;
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 7231842..eac19ea 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -22,36 +22,38 @@ HEADERS = \
categoryeditdialog.h \
categoryeditdialog_base.h \
categoryselectdialog.h \
categoryselectdialog_base.h \
externalapphandler.h \
kdateedit.h \
kdatepicker.h \
kinputdialog.h \
kpimprefs.h \
kpimglobalprefs.h \
kprefsdialog.h \
kprefswidget.h \
+ ksyncmanager.h \
ksyncprofile.h \
ksyncprefsdialog.h \
kcmconfigs/kcmkdepimconfig.h \
kcmconfigs/kdepimconfigwidget.h
SOURCES = \
categoryeditdialog.cpp \
categoryeditdialog_base.cpp \
categoryselectdialog.cpp \
categoryselectdialog_base.cpp \
externalapphandler.cpp \
kdateedit.cpp \
kdatepicker.cpp \
kinputdialog.cpp \
kpimprefs.cpp \
kpimglobalprefs.cpp \
kprefsdialog.cpp \
kprefswidget.cpp \
+ ksyncmanager.cpp \
ksyncprofile.cpp \
ksyncprefsdialog.cpp \
kcmconfigs/kcmkdepimconfig.cpp \
kcmconfigs/kdepimconfigwidget.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
@@ -33,24 +33,25 @@
//US #include <sys/stat.h>
//US #endif
//US#include <sys/types.h>
//US#include <dirent.h>
//US#include <pwd.h>
#include <qregexp.h>
#include <qasciidict.h>
#include <qdict.h>
#include <qdir.h>
#include <qfileinfo.h>
#include <qstring.h>
+#include <qmessagebox.h>
#include <qapplication.h>
#include <qstringlist.h>
#include "kstandarddirs.h"
#include "kconfig.h"
#include "kdebug.h"
//US #include "kinstance.h"
#include "kshell.h"
//US#include <sys/param.h>
//US#include <unistd.h>
@@ -1195,36 +1196,40 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
return false;
}
}
i = pos + 1;
}
return true;
}
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
+
}
void KStandardDirs::addKDEDefaults()
{
+
//qDebug("ERROR: KStandardDirs::addKDEDefaults() called ");
//return;
QStringList kdedirList;
// begin KDEDIRS
QString kdedirs = readEnvPath("MICROKDEDIRS");
if (!kdedirs.isEmpty())
{
tokenize(kdedirList, kdedirs, ":");
}
else
{
@@ -1258,26 +1263,32 @@ void KStandardDirs::addKDEDefaults()
if (execPrefix!="NONE")
kdedirList.append(execPrefix);
#endif
QString localKdeDir;
//US if (getuid())
if (true)
{
localKdeDir = readEnvPath("MICROKDEHOME");
if (!localKdeDir.isEmpty())
{
+#ifdef _WIN32_
+ if (localKdeDir.at(localKdeDir.length()-1) != '\\')
+ localKdeDir += '\\';
+#else
if (localKdeDir.at(localKdeDir.length()-1) != '/')
localKdeDir += '/';
+#endif
+ //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 );
}
else
{
localKdeDir = QDir::homeDirPath() + "/kdepim/";
}
}
else
{
// We treat root different to prevent root messing up the
// file permissions in the users home directory.
localKdeDir = readEnvPath("MICROKDEROOTHOME");
if (!localKdeDir.isEmpty())