author | zautrix <zautrix> | 2004-10-05 08:07:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-05 08:07:41 (UTC) |
commit | ad859d26b813101adab963f50e694961702561d9 (patch) (unidiff) | |
tree | 36eb7f12ee6ee80f50cdd13bbfaba74e9a1b37d1 /korganizer/mainwindow.cpp | |
parent | fc2c103f45a6d4e4105259436266538c645f2c87 (diff) | |
download | kdepimpi-ad859d26b813101adab963f50e694961702561d9.zip kdepimpi-ad859d26b813101adab963f50e694961702561d9.tar.gz kdepimpi-ad859d26b813101adab963f50e694961702561d9.tar.bz2 |
cleanup
-rw-r--r-- | korganizer/mainwindow.cpp | 115 |
1 files changed, 2 insertions, 113 deletions
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 ) | |||
1954 | } | 1954 | } |
1955 | // pending adjust time for watchSavedFile() | 1955 | mView->watchSavedFile(); |
1956 | //mView->watchSavedFile(); | ||
1957 | mView->openCalendar( defaultFileName() ); | 1956 | mView->openCalendar( defaultFileName() ); |
@@ -1965,7 +1964,2 @@ void MainWindow::syncPi() | |||
1965 | qApp->processEvents(); | 1964 | qApp->processEvents(); |
1966 | performQuickQuick(); | ||
1967 | } | ||
1968 | |||
1969 | void MainWindow::performQuickQuick() | ||
1970 | { | ||
1971 | bool ok; | 1965 | bool ok; |
@@ -1981,2 +1975,3 @@ void MainWindow::performQuickQuick() | |||
1981 | } | 1975 | } |
1976 | |||
1982 | void MainWindow::deleteCommandSocket(KCommandSocket*s, int state) | 1977 | void MainWindow::deleteCommandSocket(KCommandSocket*s, int state) |
@@ -2168,108 +2163,2 @@ void MainWindow::syncRemote( KSyncProfile* prof, bool ask) | |||
2168 | } | 2163 | } |
2169 | void MainWindow::syncSSH() | ||
2170 | { | ||
2171 | // not used anymore | ||
2172 | QTime timer; | ||
2173 | timer.start(); | ||
2174 | //qDebug("MainWindow::syncssh() "); | ||
2175 | KOPrefs *p = KOPrefs::instance(); | ||
2176 | QString localFile = p->mLocalTempFile; | ||
2177 | QString remoteIP = p->mRemoteIP; | ||
2178 | QString remoteUser = p->mRemoteUser; | ||
2179 | QString remoteFile = p->mRemoteFile; | ||
2180 | if ( p->mUsePassWd && p->mRemotePassWd.length() > 0 ) | ||
2181 | remoteUser += ":" + p->mRemotePassWd; | ||
2182 | |||
2183 | QString question = i18n("Do you really want\nto remote sync?\n \n") + | ||
2184 | i18n("IP: " ) +remoteIP +"\n" + | ||
2185 | i18n("User: " ) + remoteUser +"\n" ; | ||
2186 | int maxlen = 30; | ||
2187 | if ( QApplication::desktop()->width() > 320 ) | ||
2188 | maxlen += 25; | ||
2189 | if ( remoteFile.length() > maxlen ) | ||
2190 | question += i18n("Remote file:\n..." ) + remoteFile.right(maxlen) +"\n"; | ||
2191 | else | ||
2192 | question += i18n("Remote file:\n " ) + remoteFile +"\n"; | ||
2193 | if ( localFile.length() > maxlen ) | ||
2194 | question += i18n("Local temp file:\n..." ) + localFile.right(maxlen) +"\n"; | ||
2195 | else | ||
2196 | question += i18n("Local temp file:\n " ) + localFile +"\n"; | ||
2197 | |||
2198 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), | ||
2199 | question, | ||
2200 | i18n("Yes"), i18n("No"), | ||
2201 | 0, 0 ) != 0 ) | ||
2202 | return; | ||
2203 | // if ( !p->mUsePassWd ) { | ||
2204 | // QString pass = getPassword(); | ||
2205 | // if ( pass.length() > 0 ) | ||
2206 | // remoteUser += ":" + pass; | ||
2207 | // } | ||
2208 | QString command = "scp " + remoteUser + "@" + remoteIP +":" + remoteFile +" " +localFile; | ||
2209 | setCaption ( i18n( "Copy remote file to local machine..." ) ); | ||
2210 | int fileSize = 0; | ||
2211 | int result = system ( command ); | ||
2212 | // 0 : okay | ||
2213 | // 256: no such file or dir | ||
2214 | // | ||
2215 | qDebug("KO: Remote copy result(0 = okay): %d ",result ); | ||
2216 | if ( result != 0 ) { | ||
2217 | int len = maxlen; | ||
2218 | while ( len < command.length() ) { | ||
2219 | command.insert( len , "\n" ); | ||
2220 | len += maxlen +2; | ||
2221 | } | ||
2222 | 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) ; | ||
2223 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), | ||
2224 | question, | ||
2225 | i18n("Okay!")) ; | ||
2226 | setCaption ("KO/Pi"); | ||
2227 | return; | ||
2228 | } | ||
2229 | |||
2230 | |||
2231 | setCaption ( i18n( "Copying succeed." ) ); | ||
2232 | //mView->setSyncDevice("ssh-scp" ); | ||
2233 | if ( syncWithFile(localFile , true ) ) { | ||
2234 | // Event* e = mView->getLastSyncEvent(); | ||
2235 | // e->setReadOnly( false ); | ||
2236 | // e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | ||
2237 | // e->setReadOnly( true ); | ||
2238 | if ( KOPrefs::instance()->mWriteBackFile ) { | ||
2239 | command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ; | ||
2240 | setCaption ( i18n( "Writing back file ..." ) ); | ||
2241 | result = system ( command ); | ||
2242 | if ( result != 0 ) { | ||
2243 | int len = maxlen; | ||
2244 | while ( len < command.length() ) { | ||
2245 | command.insert( len , "\n" ); | ||
2246 | len += maxlen +2; | ||
2247 | } | ||
2248 | 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) ; | ||
2249 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), | ||
2250 | question, | ||
2251 | i18n("Okay!")) ; | ||
2252 | setCaption ("KO/Pi"); | ||
2253 | return; | ||
2254 | } else { | ||
2255 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); | ||
2256 | } | ||
2257 | } | ||
2258 | } | ||
2259 | return; | ||
2260 | #if 0 | ||
2261 | system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics"); | ||
2262 | while ( timer.elapsed() < 5000 ) | ||
2263 | qApp->processEvents(); | ||
2264 | |||
2265 | qDebug("MainWindow::merging) "); | ||
2266 | mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 ); | ||
2267 | while ( mBlockSaveFlag ) | ||
2268 | qApp->processEvents(); | ||
2269 | save(); | ||
2270 | system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics"); | ||
2271 | #endif | ||
2272 | |||
2273 | } | ||
2274 | |||
2275 | 2164 | ||