From ad859d26b813101adab963f50e694961702561d9 Mon Sep 17 00:00:00 2001 From: zautrix Date: Tue, 05 Oct 2004 08:07:41 +0000 Subject: cleanup --- (limited to 'korganizer') diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index eaea040..fecc7e2 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1221,14 +1221,14 @@ bool CalendarView::syncCalendar(QString filename, int mode) bool syncOK = false; storage->setFileName( filename ); // qDebug("loading ... "); - if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { + if ( storage->load() ) { getEventViewerDialog()->setSyncMode( true ); syncOK = synchronizeCalendar( mCalendar, calendar, mode ); getEventViewerDialog()->setSyncMode( false ); if ( syncOK ) { if ( KOPrefs::instance()->mWriteBackFile ) { - storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); + storage->setSaveFormat( new ICalFormat() ); storage->save(); } } @@ -1499,7 +1499,7 @@ bool CalendarView::openCalendar(QString filename, bool merge) mStorage->setFileName( filename ); - if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) { + if ( mStorage->load() ) { if ( merge ) ;//setModified( true ); else { //setModified( true ); @@ -1514,9 +1514,11 @@ bool CalendarView::openCalendar(QString filename, bool merge) setSyncEventsReadOnly(); updateUnmanagedViews(); updateView(); - if ( filename != MainWindow::defaultFileName() ) - saveCalendar( MainWindow::defaultFileName() ); loadedFileVersion = QDateTime::currentDateTime(); + if ( filename != MainWindow::defaultFileName() ) { + saveCalendar( MainWindow::defaultFileName() ); + watchSavedFile(); + } return true; } else { // while failing to load, the calendar object could @@ -1600,7 +1602,7 @@ bool CalendarView::saveCalendar( QString filename ) //mStorage->setFileName( filename ); - mStorage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); + mStorage->setSaveFormat( new ICalFormat() ); mStorage->setFileName( filename ); bool success; success = mStorage->save(); @@ -2301,7 +2303,7 @@ void CalendarView::beamIncidenceList(QPtrList delSel ) storage.save(); } else { fn += ".ics"; - FileStorage storage( cal, fn, new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); + FileStorage storage( cal, fn, new ICalFormat( ) ); storage.save(); } delete cal; @@ -2856,7 +2858,7 @@ void CalendarView::action_mail() ev = new Event(*event); cal_tmp.addEvent(ev); } - ICalFormat mForm( KOPrefs::instance()->mUseQuicksave); + ICalFormat mForm(); QString attachment = mForm.toString( &cal_tmp ); if (ev) delete(ev); @@ -3141,7 +3143,7 @@ void CalendarView::exportICalendar() // Force correct extension if (filename.right(4) != ".ics") filename += ".ics"; - 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 @@ -224,7 +224,6 @@ KOPrefs::KOPrefs() : addItemInt("PreferredTime",&mPreferredTime,0); addItemInt("PreferredDate",&mPreferredDate,0); addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); - addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); addItemBool("ShortDateInViewer",&mShortDateInViewer,false); addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 696433e..7abd741 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -266,7 +266,6 @@ class KOPrefs : public KPimPrefs bool mMonthViewUsesForegroundColor; bool mHightlightDateTimeEdit; - bool mUseQuicksave; bool mShortDateInViewer; QStringList mLocationDefaults; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5aa75f5..43ee2d7 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1952,8 +1952,7 @@ void MainWindow::getFile( bool success ) setCaption( i18n("Error receiving file. Nothing changed!") ); return; } - // pending adjust time for watchSavedFile() - //mView->watchSavedFile(); + mView->watchSavedFile(); mView->openCalendar( defaultFileName() ); setCaption( i18n("Pi-Sync successful!") ); @@ -1963,11 +1962,6 @@ void MainWindow::getFile( bool success ) void MainWindow::syncPi() { qApp->processEvents(); - performQuickQuick(); -} - -void MainWindow::performQuickQuick() -{ bool ok; Q_UINT16 port = KOPrefs::instance()->mActiveSyncPort.toUInt(&ok); if ( ! ok ) { @@ -1979,6 +1973,7 @@ void MainWindow::performQuickQuick() setCaption( i18n("Sending request for remote file ...") ); commandSocket->readFile( syncFileName() ); } + void MainWindow::deleteCommandSocket(KCommandSocket*s, int state) { qDebug("MainWindow::deleteCommandSocket %d", state); @@ -2166,112 +2161,6 @@ void MainWindow::syncRemote( KSyncProfile* prof, bool ask) } return; } -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 - -} - void MainWindow::syncSharp() { diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 4da371e..ba627b9 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -145,7 +145,6 @@ class MainWindow : public QMainWindow void selectFilter( int ); void slotSyncMenu( int ); - void syncSSH(); void confSync(); void syncSharp(); void syncPhone(); @@ -177,7 +176,6 @@ class MainWindow : public QMainWindow void saveOnClose(); int mCurrentSyncProfile; void enableQuick(); - void performQuickQuick(); void syncRemote( KSyncProfile* , bool ask = true); bool mFlagKeyPressed; bool mBlockAtStartup; -- cgit v0.9.0.2