summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp20
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/mainwindow.cpp115
-rw-r--r--korganizer/mainwindow.h2
-rw-r--r--libkcal/calstorage.h2
-rw-r--r--libkcal/filestorage.cpp4
-rw-r--r--libkcal/filestorage.h2
-rw-r--r--libkcal/icalformat.cpp24
-rw-r--r--libkcal/icalformat.h3
10 files changed, 20 insertions, 154 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eaea040..fecc7e2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1223,3 +1223,3 @@ bool CalendarView::syncCalendar(QString filename, int mode)
// qDebug("loading ... ");
- if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
+ if ( storage->load() ) {
getEventViewerDialog()->setSyncMode( true );
@@ -1230,3 +1230,3 @@ bool CalendarView::syncCalendar(QString filename, int mode)
{
- storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+ storage->setSaveFormat( new ICalFormat() );
storage->save();
@@ -1501,3 +1501,3 @@ bool CalendarView::openCalendar(QString filename, bool merge)
- if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) {
+ if ( mStorage->load() ) {
if ( merge ) ;//setModified( true );
@@ -1516,5 +1516,7 @@ bool CalendarView::openCalendar(QString filename, bool merge)
updateView();
- if ( filename != MainWindow::defaultFileName() )
- saveCalendar( MainWindow::defaultFileName() );
loadedFileVersion = QDateTime::currentDateTime();
+ if ( filename != MainWindow::defaultFileName() ) {
+ saveCalendar( MainWindow::defaultFileName() );
+ watchSavedFile();
+ }
return true;
@@ -1602,3 +1604,3 @@ bool CalendarView::saveCalendar( QString filename )
- mStorage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+ mStorage->setSaveFormat( new ICalFormat() );
mStorage->setFileName( filename );
@@ -2303,3 +2305,3 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
fn += ".ics";
- FileStorage storage( cal, fn, new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+ FileStorage storage( cal, fn, new ICalFormat( ) );
storage.save();
@@ -2858,3 +2860,3 @@ void CalendarView::action_mail()
}
- ICalFormat mForm( KOPrefs::instance()->mUseQuicksave);
+ ICalFormat mForm();
QString attachment = mForm.toString( &cal_tmp );
@@ -3143,3 +3145,3 @@ void CalendarView::exportICalendar()
- FileStorage storage( mCalendar, filename, new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
+ FileStorage storage( mCalendar, filename, new ICalFormat() );
storage.save();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 0034715..e0623d5 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -226,3 +226,2 @@ KOPrefs::KOPrefs() :
addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false);
- addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false);
addItemBool("ShortDateInViewer",&mShortDateInViewer,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 696433e..7abd741 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -268,3 +268,2 @@ class KOPrefs : public KPimPrefs
bool mHightlightDateTimeEdit;
- bool mUseQuicksave;
bool mShortDateInViewer;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5aa75f5..43ee2d7 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1954,4 +1954,3 @@ void MainWindow::getFile( bool success )
}
- // pending adjust time for watchSavedFile()
- //mView->watchSavedFile();
+ mView->watchSavedFile();
mView->openCalendar( defaultFileName() );
@@ -1965,7 +1964,2 @@ void MainWindow::syncPi()
qApp->processEvents();
- performQuickQuick();
-}
-
-void MainWindow::performQuickQuick()
-{
bool ok;
@@ -1981,2 +1975,3 @@ void MainWindow::performQuickQuick()
}
+
void MainWindow::deleteCommandSocket(KCommandSocket*s, int state)
@@ -2168,108 +2163,2 @@ void MainWindow::syncRemote( KSyncProfile* prof, bool ask)
}
-void MainWindow::syncSSH()
-{
- // not used anymore
- QTime timer;
- timer.start();
- //qDebug("MainWindow::syncssh() ");
- KOPrefs *p = KOPrefs::instance();
- QString localFile = p->mLocalTempFile;
- QString remoteIP = p->mRemoteIP;
- QString remoteUser = p->mRemoteUser;
- QString remoteFile = p->mRemoteFile;
- if ( p->mUsePassWd && p->mRemotePassWd.length() > 0 )
- remoteUser += ":" + p->mRemotePassWd;
-
- QString question = i18n("Do you really want\nto remote sync?\n \n") +
- i18n("IP: " ) +remoteIP +"\n" +
- i18n("User: " ) + remoteUser +"\n" ;
- int maxlen = 30;
- if ( QApplication::desktop()->width() > 320 )
- maxlen += 25;
- if ( remoteFile.length() > maxlen )
- question += i18n("Remote file:\n..." ) + remoteFile.right(maxlen) +"\n";
- else
- question += i18n("Remote file:\n " ) + remoteFile +"\n";
- if ( localFile.length() > maxlen )
- question += i18n("Local temp file:\n..." ) + localFile.right(maxlen) +"\n";
- else
- question += i18n("Local temp file:\n " ) + localFile +"\n";
-
- if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
- question,
- i18n("Yes"), i18n("No"),
- 0, 0 ) != 0 )
- return;
- // if ( !p->mUsePassWd ) {
- // QString pass = getPassword();
- // if ( pass.length() > 0 )
- // remoteUser += ":" + pass;
- // }
- QString command = "scp " + remoteUser + "@" + remoteIP +":" + remoteFile +" " +localFile;
- setCaption ( i18n( "Copy remote file to local machine..." ) );
- int fileSize = 0;
- int result = system ( command );
- // 0 : okay
- // 256: no such file or dir
- //
- qDebug("KO: Remote copy result(0 = okay): %d ",result );
- if ( result != 0 ) {
- int len = maxlen;
- while ( len < command.length() ) {
- command.insert( len , "\n" );
- len += maxlen +2;
- }
- question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
- QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
- question,
- i18n("Okay!")) ;
- setCaption ("KO/Pi");
- return;
- }
-
-
- setCaption ( i18n( "Copying succeed." ) );
- //mView->setSyncDevice("ssh-scp" );
- if ( syncWithFile(localFile , true ) ) {
-// Event* e = mView->getLastSyncEvent();
-// e->setReadOnly( false );
-// e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
-// e->setReadOnly( true );
- if ( KOPrefs::instance()->mWriteBackFile ) {
- command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ;
- setCaption ( i18n( "Writing back file ..." ) );
- result = system ( command );
- if ( result != 0 ) {
- int len = maxlen;
- while ( len < command.length() ) {
- command.insert( len , "\n" );
- len += maxlen +2;
- }
- question = i18n("Sorry, the copy back command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
- QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
- question,
- i18n("Okay!")) ;
- setCaption ("KO/Pi");
- return;
- } else {
- setCaption ( i18n( "Syncronization sucessfully completed" ) );
- }
- }
- }
- return;
-#if 0
- system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics");
- while ( timer.elapsed() < 5000 )
- qApp->processEvents();
-
- qDebug("MainWindow::merging) ");
- mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 );
- while ( mBlockSaveFlag )
- qApp->processEvents();
- save();
- system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics");
-#endif
-
-}
-
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 4da371e..ba627b9 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -147,3 +147,2 @@ class MainWindow : public QMainWindow
void slotSyncMenu( int );
- void syncSSH();
void confSync();
@@ -179,3 +178,2 @@ class MainWindow : public QMainWindow
void enableQuick();
- void performQuickQuick();
void syncRemote( KSyncProfile* , bool ask = true);
diff --git a/libkcal/calstorage.h b/libkcal/calstorage.h
index 72972ea..82c8682 100644
--- a/libkcal/calstorage.h
+++ b/libkcal/calstorage.h
@@ -41,3 +41,3 @@ class CalStorage
virtual bool open() = 0;
- virtual bool load(bool = false ) = 0;
+ virtual bool load( ) = 0;
virtual bool save() = 0;
diff --git a/libkcal/filestorage.cpp b/libkcal/filestorage.cpp
index 00c15d9..a139124 100644
--- a/libkcal/filestorage.cpp
+++ b/libkcal/filestorage.cpp
@@ -78,3 +78,3 @@ bool FileStorage::open()
-bool FileStorage::load( bool quick )
+bool FileStorage::load( )
{
@@ -88,3 +88,3 @@ bool FileStorage::load( bool quick )
// vCalendar file.
- ICalFormat iCal (quick );
+ ICalFormat iCal;
diff --git a/libkcal/filestorage.h b/libkcal/filestorage.h
index e9dc15e..17010ac 100644
--- a/libkcal/filestorage.h
+++ b/libkcal/filestorage.h
@@ -46,3 +46,3 @@ class FileStorage : public CalStorage
bool open();
- bool load(bool quick = false );
+ bool load( );
bool save();
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index f2e7dfc..3a2aac6 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -52,5 +52,4 @@ using namespace KCal;
-ICalFormat::ICalFormat(bool quick )
+ICalFormat::ICalFormat( )
{
- mQuicksave = false; //quick;
mImpl = new ICalFormatImpl( this );
@@ -78,12 +77,3 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName)
QString text;
-#if 0
- if ( !mQuicksave ) {
- qDebug("KO: No quickload!");
- ts.setEncoding( QTextStream::Latin1 );
- text = ts.read();
- } else {
- ts.setCodec( QTextCodec::codecForName("utf8") );
- text = ts.read();
- }
-#endif
+
ts.setEncoding( QTextStream::Latin1 );
@@ -116,12 +106,2 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
-// #ifdef DESKTOP_VERSION
-// mQuicksave = false;
-// #endif
-// if ( mQuicksave ) {
-// ts << text.utf8();
-// } else {
-// ts.setEncoding( QTextStream::Latin1 );
-// ts << text;
-// //ts << text.latin1();
-// }
ts.setEncoding( QTextStream::Latin1 );
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index 236efbf..485ab6e 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -42,3 +42,3 @@ class ICalFormat : public CalFormat {
/** Create new iCalendar format. */
- ICalFormat( bool quick = false );
+ ICalFormat( );
virtual ~ICalFormat();
@@ -106,3 +106,2 @@ class ICalFormat : public CalFormat {
ICalFormatImpl *mImpl;
- bool mQuicksave;
QString mTimeZoneId;