summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp29
1 files changed, 16 insertions, 13 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 8b98898..e770304 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -71,491 +71,494 @@ void AdvancedFm::showHidden() {
71 CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); 71 CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
72 OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); 72 OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
73 } 73 }
74 populateView(); 74 populateView();
75} 75}
76 76
77QString AdvancedFm::dealWithSymName(const QString &fileName) { 77QString AdvancedFm::dealWithSymName(const QString &fileName) {
78 QString strItem = fileName; 78 QString strItem = fileName;
79 return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); 79 return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
80} 80}
81 81
82void AdvancedFm::runThis() { 82void AdvancedFm::runThis() {
83 if( !CurrentView()->currentItem()) return; 83 if( !CurrentView()->currentItem()) return;
84 QString fs; 84 QString fs;
85 QDir *thisDir = CurrentDir(); 85 QDir *thisDir = CurrentDir();
86 86
87 QString curFile = CurrentView()->currentItem()->text(0); 87 QString curFile = CurrentView()->currentItem()->text(0);
88 QString path = thisDir->canonicalPath(); 88 QString path = thisDir->canonicalPath();
89 89
90 if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink 90 if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink
91 91
92 curFile = dealWithSymName((const QString&)curFile); 92 curFile = dealWithSymName((const QString&)curFile);
93 93
94 if(curFile != "../") { 94 if(curFile != "../") {
95 95
96 fs = getFileSystemType((const QString &) path); 96 fs = getFileSystemType((const QString &) path);
97 QFileInfo fileInfo( path + "/" + curFile); 97 QFileInfo fileInfo( path + "/" + curFile);
98// odebug << fileInfo.owner() << oendl; 98// odebug << fileInfo.owner() << oendl;
99 99
100 if( (fileInfo.permission( QFileInfo::ExeUser) 100 if( (fileInfo.permission( QFileInfo::ExeUser)
101 | fileInfo.permission( QFileInfo::ExeGroup) 101 | fileInfo.permission( QFileInfo::ExeGroup)
102 | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { 102 | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
103 | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { 103 | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
104 QCopEnvelope e("QPE/System", "execute(QString)" ); 104 QCopEnvelope e("QPE/System", "execute(QString)" );
105 e << curFile; 105 e << curFile;
106 } else { 106 } else {
107 curFile = path + "/" + curFile; 107 curFile = path + "/" + curFile;
108 DocLnk nf(curFile); 108 DocLnk nf(curFile);
109 QString execStr = nf.exec(); 109 QString execStr = nf.exec();
110// odebug << execStr << oendl; 110// odebug << execStr << oendl;
111 if( execStr.isEmpty() ) { 111 if( execStr.isEmpty() ) {
112 } else { 112 } else {
113 nf.execute(); 113 nf.execute();
114 } 114 }
115 } 115 }
116 } 116 }
117} 117}
118 118
119void AdvancedFm::runText() { 119void AdvancedFm::runText() {
120 if( !CurrentView()->currentItem()) return; 120 if( !CurrentView()->currentItem()) return;
121 QString curFile = CurrentView()->currentItem()->text(0); 121 QString curFile = CurrentView()->currentItem()->text(0);
122 if(curFile != "../") { 122 if(curFile != "../") {
123 if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink 123 if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink
124 curFile = dealWithSymName((const QString&)curFile); 124 curFile = dealWithSymName((const QString&)curFile);
125 curFile = CurrentDir()->canonicalPath()+"/"+curFile; 125 curFile = CurrentDir()->canonicalPath()+"/"+curFile;
126 QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); 126 QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
127 e << curFile; 127 e << curFile;
128 } 128 }
129} 129}
130 130
131void AdvancedFm::makeDir() { 131void AdvancedFm::makeDir() {
132 InputDialog *fileDlg; 132 InputDialog *fileDlg;
133 fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0); 133 fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
134 fileDlg->exec(); 134 fileDlg->exec();
135 if( fileDlg->result() == 1 ) { 135 if( fileDlg->result() == 1 ) {
136 QDir *thisDir = CurrentDir(); 136 QDir *thisDir = CurrentDir();
137 QString filename = fileDlg->LineEdit1->text(); 137 QString filename = fileDlg->LineEdit1->text();
138 thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); 138 thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
139 } 139 }
140 populateView(); 140 populateView();
141} 141}
142 142
143void AdvancedFm::doDelete() { 143void AdvancedFm::doDelete() {
144 QStringList curFileList = getPath(); 144 QStringList curFileList = getPath();
145 bool doMsg=true; 145 bool doMsg=true;
146 int count = curFileList.count(); 146 int count = curFileList.count();
147 if( count > 0) { 147 if( count > 0) {
148 if(count > 1 ) { 148 if(count > 1 ) {
149 QString msg; 149 QString msg;
150 msg=tr("<p>Really delete %1 files?</p>").arg(count); 150 msg=tr("<p>Really delete %1 files?</p>").arg(count);
151 switch ( QMessageBox::warning(this,tr("Delete"),msg 151 switch ( QMessageBox::warning(this,tr("Delete"),msg
152 ,tr("Yes"),tr("No"),0,0,1) ) 152 ,tr("Yes"),tr("No"),0,0,1) )
153 { 153 {
154 case 0: 154 case 0:
155 doMsg=false; 155 doMsg=false;
156 break; 156 break;
157 case 1: 157 case 1:
158 return; 158 return;
159 break; 159 break;
160 default: 160 default:
161 return; 161 return;
162 break; 162 break;
163 }; 163 };
164 } 164 }
165 165
166 QString myFile; 166 QString myFile;
167 167
168 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 168 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
169 myFile = (*it); 169 myFile = (*it);
170 if( myFile.find(" -> ",0,TRUE) != -1) 170 if( myFile.find(" -> ",0,TRUE) != -1)
171 myFile = myFile.left( myFile.find(" -> ",0,TRUE)); 171 myFile = myFile.left( myFile.find(" -> ",0,TRUE));
172 172
173 QString f = CurrentDir()->canonicalPath(); 173 QString f = CurrentDir()->canonicalPath();
174 if(f.right(1).find("/",0,TRUE) == -1) 174 if(f.right(1).find("/",0,TRUE) == -1)
175 f += "/"; 175 f += "/";
176 f += myFile; 176 f += myFile;
177 if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { 177 if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
178 //if file is a directory 178 //if file is a directory
179 179
180 switch ( QMessageBox::warning( this, tr("Delete Directory?"), 180 switch ( QMessageBox::warning( this, tr("Delete Directory?"),
181 tr("<p>Really delete %1 and all it's contents?</p>" ).arg( f ) , 181 tr("<p>Really delete %1 and all it's contents?</p>" ).arg( f ) ,
182 tr("Yes"), tr("No"), 0, 0, 1) ) { 182 tr("Yes"), tr("No"), 0, 0, 1) ) {
183 case 0: 183 case 0:
184 { 184 {
185 f=f.left(f.length()-1); 185 f=f.left(f.length()-1);
186 QString cmd="rm -rf "+f; 186 QString cmd="rm -rf "+f;
187 startProcess( (const QString)cmd.latin1() ); 187 startProcess( (const QString)cmd.latin1() );
188 populateView(); 188 populateView();
189 } 189 }
190 break; 190 break;
191 case 1: 191 case 1:
192 // exit 192 // exit
193 break; 193 break;
194 default: 194 default:
195 break; 195 break;
196 }; 196 };
197 197
198 } else { 198 } else {
199 if(doMsg) { 199 if(doMsg) {
200 switch ( QMessageBox::warning(this,tr("Delete"), 200 switch ( QMessageBox::warning(this,tr("Delete"),
201 tr("<p>Really delete %1?</p>").arg( myFile ), 201 tr("<p>Really delete %1?</p>").arg( myFile ),
202 tr("Yes"), tr("No"), 0, 0, 1) ) { 202 tr("Yes"), tr("No"), 0, 0, 1) ) {
203 case 1: 203 case 0;
204 return; 204 break;
205 break; 205 case 1:
206 default: 206 return;
207 return; 207 break;
208 break; 208 default:
209 }; 209 return;
210 } 210 break;
211 };
212 }
211 213
212 QString cmd="rm "+f; 214 QString cmd="rm "+f;
213 QFile file(f); 215 QFile file(f);
214 QFileInfo fi(myFile); 216 QFileInfo fi(myFile);
215 if( fi.fileName().find("../",0,TRUE)==-1) { 217 if( fi.fileName().find("../",0,TRUE)==-1) {
216// odebug << "remove link files "+myFile << oendl; 218// odebug << "remove link files "+myFile << oendl;
217 219
218// DocLnk lnk(f); 220// DocLnk lnk(f);
219 DocLnk *lnk; 221 DocLnk *lnk;
220 lnk = new DocLnk(f); 222 lnk = new DocLnk(f);
221// odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 223// odebug << "Deleting doclnk " + lnk->linkFile() << oendl;
222 if(lnk->isValid()) 224 if(lnk->isValid())
223 lnk->removeLinkFile(); 225 lnk->removeLinkFile();
224 // delete lnk; 226 // delete lnk;
225 file.remove(); 227 file.remove();
226 } 228 }
227 } 229 }
228 } 230 }
229 } 231 }
230 populateView(); 232 populateView();
231} 233}
232 234
233void AdvancedFm::filePerms() { 235void AdvancedFm::filePerms() {
234 QStringList curFileList = getPath(); 236 QStringList curFileList = getPath();
235 QString filePath; 237 QString filePath;
236 238
237 filePath = CurrentDir()->canonicalPath()+"/"; 239 filePath = CurrentDir()->canonicalPath()+"/";
238 240
239 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 241 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
240 filePermissions *filePerm; 242 filePermissions *filePerm;
241 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); 243 filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
242 QPEApplication::execDialog( filePerm ); 244 QPEApplication::execDialog( filePerm );
243 if( filePerm ) 245 if( filePerm )
244 delete filePerm; 246 delete filePerm;
245 } 247 }
246 populateView(); 248 populateView();
247} 249}
248 250
249void AdvancedFm::doProperties() { 251void AdvancedFm::doProperties() {
250#if defined(QT_QWS_OPIE) 252#if defined(QT_QWS_OPIE)
251 253
252 QStringList curFileList = getPath(); 254 QStringList curFileList = getPath();
253 255
254 QString filePath; 256 QString filePath;
255 filePath = CurrentDir()->canonicalPath()+"/"; 257 filePath = CurrentDir()->canonicalPath()+"/";
256 258
257// odebug << "" << curFileList.count() << "" << oendl; 259// odebug << "" << curFileList.count() << "" << oendl;
258 260
259 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 261 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
260// odebug << (filePath+*it) << oendl; 262// odebug << (filePath+*it) << oendl;
261 DocLnk lnk( (filePath+*it)); 263 DocLnk lnk( (filePath+*it));
262 LnkProperties prop( &lnk ); 264 LnkProperties prop( &lnk );
263 QPEApplication::execDialog( &prop ); 265 QPEApplication::execDialog( &prop );
264 } 266 }
265#endif 267#endif
266 268
267} 269}
268 270
269void AdvancedFm::upDir() { 271void AdvancedFm::upDir() {
270 272
271 QDir dir( CurrentDir()->canonicalPath()); 273 QDir dir( CurrentDir()->canonicalPath());
272 dir.cdUp(); 274 dir.cdUp();
273 changeTo(dir.canonicalPath()); 275 changeTo(dir.canonicalPath());
274} 276}
275 277
276void AdvancedFm::copyTimer() { 278void AdvancedFm::copyTimer() {
277 QTimer::singleShot(125,this,SLOT(copy())); 279 QTimer::singleShot(125,this,SLOT(copy()));
278} 280}
279 281
280void AdvancedFm::copy() { 282void AdvancedFm::copy() {
281 QStringList curFileList = getPath(); 283 QStringList curFileList = getPath();
282 284
283 QDir *thisDir = CurrentDir(); 285 QDir *thisDir = CurrentDir();
284 QDir *thatDir = OtherDir(); 286 QDir *thatDir = OtherDir();
285 287
286 bool doMsg = true; 288 bool doMsg = true;
287 int count = curFileList.count(); 289 int count = curFileList.count();
288 if( count > 0) { 290 if( count > 0) {
289 if(count > 1 ){ 291 if(count > 1 ){
290 QString msg; 292 QString msg;
291 msg=tr("<p>Really copy %1 files?</p>").arg(count); 293 msg=tr("<p>Really copy %1 files?</p>").arg(count);
292 switch ( QMessageBox::warning(this,tr("Copy"),msg 294 switch ( QMessageBox::warning(this,tr("Copy"),msg
293 ,tr("Yes"),tr("No"),0,0,1) ) 295 ,tr("Yes"),tr("No"),0,0,1) )
294 { 296 {
295 case 0: 297 case 0:
296 doMsg=false; 298 doMsg=false;
297 break; 299 break;
298 case 1: 300 case 1:
299 return; 301 return;
300 break; 302 break;
301 default: 303 default:
302 return; 304 return;
303 break; 305 break;
304 }; 306 };
305 } 307 }
306 308
307 QString curFile, item, destFile; 309 QString curFile, item, destFile;
308 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 310 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
309 item=(*it); 311 item=(*it);
310 if(item.find("->",0,TRUE)) //symlink 312 if(item.find("->",0,TRUE)) //symlink
311 item = item.left(item.find("->",0,TRUE)); 313 item = item.left(item.find("->",0,TRUE));
312 314
313 curFile = thisDir->canonicalPath()+"/"+ item; 315 curFile = thisDir->canonicalPath()+"/"+ item;
314 destFile = thatDir->canonicalPath()+"/"+ item; 316 destFile = thatDir->canonicalPath()+"/"+ item;
315 317
316// odebug << "Destination file is "+destFile << oendl; 318// odebug << "Destination file is "+destFile << oendl;
317// odebug << "CurrentFile file is " + curFile << oendl; 319// odebug << "CurrentFile file is " + curFile << oendl;
318 320
319 QFile f(destFile); 321 QFile f(destFile);
320 if( f.exists()) { 322 if( f.exists()) {
321 if(doMsg) { 323 if(doMsg) {
322 switch ( QMessageBox::warning(this,tr("File Exists!"), 324 switch ( QMessageBox::warning(this,tr("File Exists!"),
323 tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item), 325 tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item),
324 tr("Yes"),tr("No"),0,0,1)) { 326 tr("Yes"),tr("No"),0,0,1)) {
327 case 0;
328 break;
325 case 1: 329 case 1:
326 return; 330 return;
327 break; 331 break;
328 default: 332 default:
329 return; 333 return;
330 break; 334 break;
331 }; 335 };
332 } 336 }
333 f.remove(); 337 f.remove();
334 } 338 }
335 339
336 if( !copyFile( curFile, destFile) ) { 340 if( !copyFile( curFile, destFile) ) {
337 QMessageBox::message("AdvancedFm", 341 QMessageBox::message("AdvancedFm",
338 tr( "<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); 342 tr( "<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
339 return; 343 return;
340 } 344 }
341 } 345 }
342 rePopulate(); 346 rePopulate();
343 } 347 }
344} 348}
345 349
346void AdvancedFm::copyAsTimer() { 350void AdvancedFm::copyAsTimer() {
347 QTimer::singleShot(125,this,SLOT(copyAs())); 351 QTimer::singleShot(125,this,SLOT(copyAs()));
348} 352}
349 353
350void AdvancedFm::copyAs() { 354void AdvancedFm::copyAs() {
351 355
352 QStringList curFileList = getPath(); 356 QStringList curFileList = getPath();
353 QString curFile, item; 357 QString curFile, item;
354 InputDialog *fileDlg; 358 InputDialog *fileDlg;
355 359
356 QDir *thisDir = CurrentDir(); 360 QDir *thisDir = CurrentDir();
357 QDir *thatDir = OtherDir(); 361 QDir *thatDir = OtherDir();
358 362
359 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 363 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
360 QString destFile; 364 QString destFile;
361 item=(*it); 365 item=(*it);
362 curFile = thisDir->canonicalPath()+"/"+(*it); 366 curFile = thisDir->canonicalPath()+"/"+(*it);
363 fileDlg = new InputDialog( this, tr("Copy %1 As").arg(curFile), TRUE, 0); 367 fileDlg = new InputDialog( this, tr("Copy %1 As").arg(curFile), TRUE, 0);
364 368
365 fileDlg->setInputText((const QString &) destFile ); 369 fileDlg->setInputText((const QString &) destFile );
366 fileDlg->exec(); 370 fileDlg->exec();
367 371
368 if( fileDlg->result() == 1 ) { 372 if( fileDlg->result() == 1 ) {
369 QString filename = fileDlg->LineEdit1->text(); 373 QString filename = fileDlg->LineEdit1->text();
370 destFile = thatDir->canonicalPath()+"/"+filename; 374 destFile = thatDir->canonicalPath()+"/"+filename;
371 375
372 QFile f( destFile); 376 QFile f( destFile);
373 if( f.exists()) { 377 if( f.exists()) {
374 switch (QMessageBox::warning(this,tr("File Exists!"), 378 switch (QMessageBox::warning(this,tr("File Exists!"),
375 tr("<P> %1 already exists. Ok to overwrite?</p>").arg(item), 379 tr("<P> %1 already exists. Ok to overwrite?</p>").arg(item),
376 tr("Yes"),tr("No"),0,0,1) ) { 380 tr("Yes"),tr("No"),0,0,1) ) {
377 case 0: 381 case 0:
378 f.remove(); 382 f.remove();
379 break; 383 break;
380 case 1: 384 case 1:
381 return; 385 return;
382 break; 386 break;
383 default: 387 default:
384 return; 388 return;
385 break; 389 break;
386 }; 390 };
387 } 391 }
388 if( !copyFile( curFile, destFile) ) { 392 if( !copyFile( curFile, destFile) ) {
389 QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); 393 QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
390 return; 394 return;
391 } 395 }
392 } 396 }
393 delete fileDlg; 397 delete fileDlg;
394 398
395 } 399 }
396 rePopulate(); 400 rePopulate();
397 // setOtherTabCurrent(); 401 // setOtherTabCurrent();
398 qApp->processEvents(); 402 qApp->processEvents();
399 403
400} 404}
401 405
402void AdvancedFm::copySameDirTimer() { 406void AdvancedFm::copySameDirTimer() {
403 QTimer::singleShot(125,this,SLOT(copySameDir())); 407 QTimer::singleShot(125,this,SLOT(copySameDir()));
404} 408}
405 409
406void AdvancedFm::copySameDir() { 410void AdvancedFm::copySameDir() {
407 qApp->processEvents(); 411 qApp->processEvents();
408 QStringList curFileList = getPath(); 412 QStringList curFileList = getPath();
409 QString curFile, item, destFile; 413 QString curFile, item, destFile;
410 InputDialog *fileDlg; 414 InputDialog *fileDlg;
411 415
412 QDir *thisDir = CurrentDir(); 416 QDir *thisDir = CurrentDir();
413 417
414 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 418 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
415 item=(*it); 419 item=(*it);
416 curFile = thisDir->canonicalPath()+"/"+ item; 420 curFile = thisDir->canonicalPath()+"/"+ item;
417 421
418 fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0); 422 fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
419 fileDlg->setInputText((const QString &) destFile ); 423 fileDlg->setInputText((const QString &) destFile );
420 fileDlg->exec(); 424 fileDlg->exec();
421 425
422 if( fileDlg->result() == 1 ) { 426 if( fileDlg->result() == 1 ) {
423 427
424 QString filename = fileDlg->LineEdit1->text(); 428 QString filename = fileDlg->LineEdit1->text();
425 destFile = thisDir->canonicalPath()+"/"+filename; 429 destFile = thisDir->canonicalPath()+"/"+filename;
426 430
427 QFile f(destFile); 431 QFile f(destFile);
428 if( f.exists()) { 432 if( f.exists()) {
429 switch (QMessageBox::warning(this,tr("Delete"), 433 switch (QMessageBox::warning(this,tr("Delete"),
430 tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile), 434 tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile),
431 tr("Yes"),tr("No"),0,0,1) ) { 435 tr("Yes"),tr("No"),0,0,1) ) {
432 case 0: 436 case 0:
433
434 f.remove(); 437 f.remove();
435 break; 438 break;
436 case 1: 439 case 1:
437 return; 440 return;
438 break; 441 break;
439 default: 442 default:
440 return; 443 return;
441 break; 444 break;
442 }; 445 };
443 } 446 }
444 if(!copyFile( curFile,destFile) ) { 447 if(!copyFile( curFile,destFile) ) {
445 QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile)); 448 QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
446 return; 449 return;
447 } 450 }
448 451
449// odebug << "copy "+curFile+" as "+destFile << oendl; 452// odebug << "copy "+curFile+" as "+destFile << oendl;
450 } 453 }
451 delete fileDlg; 454 delete fileDlg;
452 } 455 }
453 rePopulate(); 456 rePopulate();
454} 457}
455 458
456void AdvancedFm::moveTimer() { 459void AdvancedFm::moveTimer() {
457 QTimer::singleShot(125,this,SLOT(move())); 460 QTimer::singleShot(125,this,SLOT(move()));
458} 461}
459 462
460void AdvancedFm::move() { 463void AdvancedFm::move() {
461 464
462 QStringList curFileList = getPath(); 465 QStringList curFileList = getPath();
463 if( curFileList.count() > 0) { 466 if( curFileList.count() > 0) {
464 QString curFile, destFile, item; 467 QString curFile, destFile, item;
465 468
466 QDir *thisDir = CurrentDir(); 469 QDir *thisDir = CurrentDir();
467 QDir *thatDir = OtherDir(); 470 QDir *thatDir = OtherDir();
468 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 471 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
469 item=(*it); 472 item=(*it);
470 QString destFile = thatDir->canonicalPath(); 473 QString destFile = thatDir->canonicalPath();
471 474
472 if(destFile.right(1).find("/",0,TRUE) == -1) 475 if(destFile.right(1).find("/",0,TRUE) == -1)
473 destFile+="/"; 476 destFile+="/";
474 destFile += item; 477 destFile += item;
475// odebug << "Destination file is "+destFile << oendl; 478// odebug << "Destination file is "+destFile << oendl;
476 479
477 curFile = thisDir->canonicalPath(); 480 curFile = thisDir->canonicalPath();
478 if(curFile.right(1).find("/",0,TRUE) == -1) 481 if(curFile.right(1).find("/",0,TRUE) == -1)
479 curFile +="/"; 482 curFile +="/";
480 curFile+= item; 483 curFile+= item;
481// odebug << "CurrentFile file is " + curFile << oendl; 484// odebug << "CurrentFile file is " + curFile << oendl;
482 485
483 if(QFileInfo(curFile).isDir()) { 486 if(QFileInfo(curFile).isDir()) {
484 moveDirectory( curFile, destFile ); 487 moveDirectory( curFile, destFile );
485 rePopulate(); 488 rePopulate();
486 return; 489 return;
487 } 490 }
488 QFile f( destFile); 491 QFile f( destFile);
489 if( f.exists()) { 492 if( f.exists()) {
490 switch ( QMessageBox::warning(this,tr("File Exists!"), 493 switch ( QMessageBox::warning(this,tr("File Exists!"),
491 tr("<p>%1 already exists. Ok to overwrite?</P>").arg(destFile), 494 tr("<p>%1 already exists. Ok to overwrite?</P>").arg(destFile),
492 tr("Yes"),tr("No"),0,0,1)) { 495 tr("Yes"),tr("No"),0,0,1)) {
493 case 0: 496 case 0:
494 break; 497 break;
495 case 1: 498 case 1:
496 return; 499 return;
497 break; 500 break;
498 default: 501 default:
499 return; 502 return;
500 break; 503 break;
501 }; 504 };
502 } 505 }
503 if( !copyFile( curFile, destFile) ) { 506 if( !copyFile( curFile, destFile) ) {
504 QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg(curFile)); 507 QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg(curFile));
505 return; 508 return;
506 } else 509 } else
507 QFile::remove(curFile); 510 QFile::remove(curFile);
508 } 511 }
509 } 512 }
510 rePopulate(); 513 rePopulate();
511 //setOtherTabCurrent(); 514 //setOtherTabCurrent();
512} 515}
513 516
514bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) { 517bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
515 int err = 0; 518 int err = 0;
516 if( copyDirectory( src, dest ) ) { 519 if( copyDirectory( src, dest ) ) {
517 QString cmd = "rm -rf " + src; 520 QString cmd = "rm -rf " + src;
518 err = system((const char*)cmd); 521 err = system((const char*)cmd);
519 } else 522 } else
520 err = -1; 523 err = -1;
521 524
522 if(err!=0) { 525 if(err!=0) {
523 QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg( src)); 526 QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg( src));
524 return false; 527 return false;
525 } 528 }
526 return true; 529 return true;
527} 530}
528 531
529bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) { 532bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
530 533
531 QString cmd = "/bin/cp -fpR " + src + " " + dest; 534 QString cmd = "/bin/cp -fpR " + src + " " + dest;
532 owarn << cmd << oendl; 535 owarn << cmd << oendl;
533 int err = system( (const char *) cmd ); 536 int err = system( (const char *) cmd );
534 if ( err != 0 ) { 537 if ( err != 0 ) {
535 QMessageBox::message("AdvancedFm", tr( "<p>Could not copy %1 to %2</p>").arg( src ).arg( dest ) ); 538 QMessageBox::message("AdvancedFm", tr( "<p>Could not copy %1 to %2</p>").arg( src ).arg( dest ) );
536 return false; 539 return false;
537 } 540 }
538 541
539 return true; 542 return true;
540} 543}
541 544
542 545
543bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { 546bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
544 if(QFileInfo(src).isDir()) { 547 if(QFileInfo(src).isDir()) {
545 if( copyDirectory( src, dest )) { 548 if( copyDirectory( src, dest )) {
546 // setOtherTabCurrent(); 549 // setOtherTabCurrent();
547 rePopulate(); 550 rePopulate();
548 return true; 551 return true;
549 } 552 }
550 else 553 else
551 return false; 554 return false;
552 } 555 }
553 556
554 557
555 bool success = true; 558 bool success = true;
556 struct stat status; 559 struct stat status;
557 QFile srcFile(src); 560 QFile srcFile(src);
558 QFile destFile(dest); 561 QFile destFile(dest);
559 int err=0; 562 int err=0;
560 int read_fd=0; 563 int read_fd=0;
561 int write_fd=0; 564 int write_fd=0;