author | zautrix <zautrix> | 2004-10-03 18:03:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-03 18:03:18 (UTC) |
commit | dd8f6efd23350b101065ddb64f35920f24010185 (patch) (unidiff) | |
tree | 76475452c6c8854178a84e5fff863a21a8e117d3 /korganizer | |
parent | 2a7b61c2b45a0a0344ae65633b2578b4cde1753f (diff) | |
download | kdepimpi-dd8f6efd23350b101065ddb64f35920f24010185.zip kdepimpi-dd8f6efd23350b101065ddb64f35920f24010185.tar.gz kdepimpi-dd8f6efd23350b101065ddb64f35920f24010185.tar.bz2 |
Fixes for desktop. Fixed kdehomedir on wintendo
-rw-r--r-- | korganizer/mainwindow.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f4ac0d6..7bf33d3 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -866,19 +866,19 @@ void MainWindow::fillSyncMenu() | |||
866 | { | 866 | { |
867 | if ( syncMenu->count() ) | 867 | if ( syncMenu->count() ) |
868 | syncMenu->clear(); | 868 | syncMenu->clear(); |
869 | syncMenu->insertItem( i18n("Configure..."), 0 ); | 869 | syncMenu->insertItem( i18n("Configure..."), 0 ); |
870 | syncMenu->insertSeparator(); | 870 | syncMenu->insertSeparator(); |
871 | if ( mServerSocket == 0 ) { | 871 | if ( mServerSocket == 0 ) { |
872 | syncMenu->insertItem( i18n("Enable Easy-Pi-Sync"), 2 ); | 872 | syncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); |
873 | } else { | 873 | } else { |
874 | syncMenu->insertItem( i18n("Disable Easy-Pi-Sync"), 3 ); | 874 | syncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); |
875 | } | 875 | } |
876 | syncMenu->insertSeparator(); | 876 | syncMenu->insertSeparator(); |
877 | syncMenu->insertItem( i18n("New Easy-Pi-Sync!"), 4 ); | 877 | syncMenu->insertItem( i18n("New Pi-Sync!"), 4 ); |
878 | syncMenu->insertItem( i18n("Quick Easy-Pi-Sync!"), 5 ); | 878 | syncMenu->insertItem( i18n("Quick Pi-Sync!"), 5 ); |
879 | syncMenu->insertSeparator(); | 879 | syncMenu->insertSeparator(); |
880 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); | 880 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); |
881 | syncMenu->insertSeparator(); | 881 | syncMenu->insertSeparator(); |
882 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 882 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
883 | config.setGroup("General"); | 883 | config.setGroup("General"); |
884 | QStringList prof = config.readListEntry("SyncProfileNames"); | 884 | QStringList prof = config.readListEntry("SyncProfileNames"); |
@@ -2004,13 +2004,15 @@ void MainWindow::getFile(QSocket* socket) | |||
2004 | while ( ti.elapsed () < 5000 && !socket->canReadLine () ) { | 2004 | while ( ti.elapsed () < 5000 && !socket->canReadLine () ) { |
2005 | qDebug("waiting1a %d %d ",ti.elapsed (), socket->bytesAvailable () ); | 2005 | qDebug("waiting1a %d %d ",ti.elapsed (), socket->bytesAvailable () ); |
2006 | //qApp->processEvents(); | 2006 | //qApp->processEvents(); |
2007 | qDebug("waiting1b %d ",ti.elapsed () ); | 2007 | qDebug("waiting1b %d ",ti.elapsed () ); |
2008 | if ( !socket->canReadLine () ) { | 2008 | if ( !socket->canReadLine () ) { |
2009 | qDebug("waiting1c %d ",ti.elapsed () ); | 2009 | qDebug("waiting1c %d ",ti.elapsed () ); |
2010 | #ifndef _WIN32_ | ||
2010 | usleep( 100000); | 2011 | usleep( 100000); |
2012 | #endif | ||
2011 | } | 2013 | } |
2012 | //socket->waitForMore ( 100 ); | 2014 | //socket->waitForMore ( 100 ); |
2013 | } | 2015 | } |
2014 | ts << socket->readLine (); | 2016 | ts << socket->readLine (); |
2015 | #if 0 | 2017 | #if 0 |
2016 | #ifdef DESKTOP_VERSION | 2018 | #ifdef DESKTOP_VERSION |