summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt9
-rw-r--r--korganizer/mainwindow.cpp18
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--libkdepim/ksyncmanager.cpp13
-rw-r--r--libkdepim/ksyncmanager.h2
5 files changed, 34 insertions, 9 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 65bb075..6ccf763 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,4 +1,13 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.6 ************
4
5Two bugfixes in the pi-sync mode.
6KO/Pi:
7Made the todolist using alternate background.
8
9Other minor fixes in KO/Pi.
10
11
3********** VERSION 2.0.5 ************ 12********** VERSION 2.0.5 ************
4 13
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 468fd5b..18a4b12 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -266,5 +266,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
266 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); 266 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
267 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); 267 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
268 mSyncManager->setDefaultFileName( defaultFileName()); 268 mSyncManager->setDefaultFileName( sentSyncFile());
269 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); 269 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
270 mSyncManager->fillSyncMenu(); 270 mSyncManager->fillSyncMenu();
@@ -1993,4 +1993,12 @@ void MainWindow::exportVCalendar()
1993 1993
1994} 1994}
1995QString MainWindow::sentSyncFile()
1996{
1997#ifdef DESKTOP_VERSION
1998 return locateLocal( "tmp", "copysynccal.ics" );
1999#else
2000 return QString( "/tmp/copysynccal.ics" );
2001#endif
2002}
1995 2003
1996void MainWindow::syncFileRequest() 2004void MainWindow::syncFileRequest()
@@ -1999,5 +2007,9 @@ void MainWindow::syncFileRequest()
1999 mSyncManager->slotSyncMenu( 999 ); 2007 mSyncManager->slotSyncMenu( 999 );
2000 } 2008 }
2001 save(); 2009
2010 setCaption(i18n("Saving Data to temp file ..." ));
2011 mView->saveCalendar( sentSyncFile() );
2012 setCaption(i18n("Data saved to temp file!" ));
2013
2002} 2014}
2003void MainWindow::getFile( bool success ) 2015void MainWindow::getFile( bool success )
@@ -2007,5 +2019,5 @@ void MainWindow::getFile( bool success )
2007 return; 2019 return;
2008 } 2020 }
2009 mView->openCalendar( defaultFileName() ); 2021 mView->openCalendar( sentSyncFile() );
2010 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2022 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2011 mSyncManager->slotSyncMenu( 999 ); 2023 mSyncManager->slotSyncMenu( 999 );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 5b9f903..5808700 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -104,4 +104,5 @@ class MainWindow : public QMainWindow
104 104
105 protected: 105 protected:
106 QString sentSyncFile();
106 void displayText( QString, QString); 107 void displayText( QString, QString);
107 void enableIncidenceActions( bool ); 108 void enableIncidenceActions( bool );
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 9177f63..c8d0e0d 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -73,6 +73,4 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
73 int dh = QApplication::desktop()->height(); 73 int dh = QApplication::desktop()->height();
74 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 74 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
75 if ( mPrefs->mPassiveSyncAutoStart )
76 enableQuick( false );
77 75
78} 76}
@@ -82,5 +80,11 @@ KSyncManager::~KSyncManager()
82 delete bar; 80 delete bar;
83} 81}
84 82
83void KSyncManager::setDefaultFileName( QString s)
84{
85 mDefFileName = s ;
86 if ( mPrefs->mPassiveSyncAutoStart )
87 enableQuick( false );
88}
85 89
86void KSyncManager::fillSyncMenu() 90void KSyncManager::fillSyncMenu()
@@ -413,5 +417,4 @@ void KSyncManager::enableQuick( bool ask )
413 mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); 417 mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
414 mServerSocket->setFileName( defaultFileName() );//bbb 418 mServerSocket->setFileName( defaultFileName() );//bbb
415 //qDebug("connected ");
416 if ( !mServerSocket->ok() ) { 419 if ( !mServerSocket->ok() ) {
417 KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); 420 KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!"));
@@ -1118,5 +1121,5 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject
1118 mSyncActionDialog = 0; 1121 mSyncActionDialog = 0;
1119 blockRC = false; 1122 blockRC = false;
1120}; 1123}
1121 1124
1122void KServerSocket::newConnection ( int socket ) 1125void KServerSocket::newConnection ( int socket )
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9a3066e..09bd1c1 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -122,5 +122,5 @@ class KSyncManager : public QObject
122 bool blockSave() { return mBlockSaveFlag; } 122 bool blockSave() { return mBlockSaveFlag; }
123 void setBlockSave(bool sa) { mBlockSaveFlag = sa; } 123 void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
124 void setDefaultFileName( QString s) { mDefFileName = s ;} 124 void setDefaultFileName( QString s) ;
125 QString defaultFileName() { return mDefFileName ;} 125 QString defaultFileName() { return mDefFileName ;}
126 QString syncFileName(); 126 QString syncFileName();