summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-10-06 08:10:14 (UTC)
committer llornkcor <llornkcor>2004-10-06 08:10:14 (UTC)
commit14c237a2d5c60314935d51d9beea0527e337a9d8 (patch) (side-by-side diff)
treeaaa74a61444febeec1db1760b79e5a07f47e8fd9
parent637e5e26c5d30778234c03412f1bf44ed7b38a8e (diff)
downloadopie-14c237a2d5c60314935d51d9beea0527e337a9d8.zip
opie-14c237a2d5c60314935d51d9beea0527e337a9d8.tar.gz
opie-14c237a2d5c60314935d51d9beea0527e337a9d8.tar.bz2
if user clicks dialog's X, dont go ahead and do the actions
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp137
1 files changed, 80 insertions, 57 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 4802771..f25048a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -154,12 +154,15 @@ void AdvancedFm::doDelete() {
case 0:
doMsg=false;
break;
case 1:
return;
break;
+ default:
+ return;
+ break;
};
}
QString myFile;
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -175,33 +178,38 @@ void AdvancedFm::doDelete() {
//if file is a directory
switch ( QMessageBox::warning( this, tr("Delete Directory?"),
tr("<p>Really delete %1 and all it's contents?</p>" ).arg( f ) ,
tr("Yes"), tr("No"), 0, 0, 1) ) {
case 0:
- {
- f=f.left(f.length()-1);
- QString cmd="rm -rf "+f;
- startProcess( (const QString)cmd.latin1() );
- populateView();
- }
- break;
+ {
+ f=f.left(f.length()-1);
+ QString cmd="rm -rf "+f;
+ startProcess( (const QString)cmd.latin1() );
+ populateView();
+ }
+ break;
case 1:
- // exit
- break;
+ // exit
+ break;
+ default:
+ break;
};
} else {
if(doMsg) {
- switch ( QMessageBox::warning(this,tr("Delete"),
- tr("<p>Really delete %1?</p>").arg( myFile ),
- tr("Yes"), tr("No"), 0, 0, 1) ) {
- case 1:
- return;
- break;
- };
+ switch ( QMessageBox::warning(this,tr("Delete"),
+ tr("<p>Really delete %1?</p>").arg( myFile ),
+ tr("Yes"), tr("No"), 0, 0, 1) ) {
+ case 1:
+ return;
+ break;
+ default:
+ return;
+ break;
+ };
}
QString cmd="rm "+f;
QFile file(f);
QFileInfo fi(myFile);
if( fi.fileName().find("../",0,TRUE)==-1) {
@@ -281,18 +289,21 @@ void AdvancedFm::copy() {
if(count > 1 ){
QString msg;
msg=tr("<p>Really copy %1 files?</p>").arg(count);
switch ( QMessageBox::warning(this,tr("Copy"),msg
,tr("Yes"),tr("No"),0,0,1) )
{
- case 0:
- doMsg=false;
- break;
- case 1:
- return;
- break;
+ case 0:
+ doMsg=false;
+ break;
+ case 1:
+ return;
+ break;
+ default:
+ return;
+ break;
};
}
QString curFile, item, destFile;
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
item=(*it);
@@ -305,19 +316,22 @@ void AdvancedFm::copy() {
// odebug << "Destination file is "+destFile << oendl;
// odebug << "CurrentFile file is " + curFile << oendl;
QFile f(destFile);
if( f.exists()) {
if(doMsg) {
- switch ( QMessageBox::warning(this,tr("File Exists!"),
- tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item),
- tr("Yes"),tr("No"),0,0,1)) {
- case 1:
- return;
- break;
- };
+ switch ( QMessageBox::warning(this,tr("File Exists!"),
+ tr("<p>%1 already exists. Ok to overwrite?</P>").arg(item),
+ tr("Yes"),tr("No"),0,0,1)) {
+ case 1:
+ return;
+ break;
+ default:
+ return;
+ break;
+ };
}
f.remove();
}
if( !copyFile( curFile, destFile) ) {
QMessageBox::message("AdvancedFm",
@@ -354,22 +368,25 @@ void AdvancedFm::copyAs() {
if( fileDlg->result() == 1 ) {
QString filename = fileDlg->LineEdit1->text();
destFile = thatDir->canonicalPath()+"/"+filename;
QFile f( destFile);
if( f.exists()) {
- switch (QMessageBox::warning(this,tr("File Exists!"),
- tr("<P> %1 already exists. Ok to overwrite?</p>").arg(item),
- tr("Yes"),tr("No"),0,0,1) ) {
- case 0:
- f.remove();
- break;
- case 1:
- return;
- break;
- };
+ switch (QMessageBox::warning(this,tr("File Exists!"),
+ tr("<P> %1 already exists. Ok to overwrite?</p>").arg(item),
+ tr("Yes"),tr("No"),0,0,1) ) {
+ case 0:
+ f.remove();
+ break;
+ case 1:
+ return;
+ break;
+ default:
+ return;
+ break;
+ };
}
if( !copyFile( curFile, destFile) ) {
QMessageBox::message("AdvancedFm",tr("<p>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
return;
}
}
@@ -406,23 +423,26 @@ void AdvancedFm::copySameDir() {
QString filename = fileDlg->LineEdit1->text();
destFile = thisDir->canonicalPath()+"/"+filename;
QFile f(destFile);
if( f.exists()) {
- switch (QMessageBox::warning(this,tr("Delete"),
- tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile),
- tr("Yes"),tr("No"),0,0,1) ) {
- case 0:
-
- f.remove();
- break;
- case 1:
- return;
- break;
- };
+ switch (QMessageBox::warning(this,tr("Delete"),
+ tr("<p> %1 already exists. Do you really want to delete it?</P>").arg(destFile),
+ tr("Yes"),tr("No"),0,0,1) ) {
+ case 0:
+
+ f.remove();
+ break;
+ case 1:
+ return;
+ break;
+ default:
+ return;
+ break;
+ };
}
if(!copyFile( curFile,destFile) ) {
QMessageBox::message("AdvancedFm",tr("<P>Could not copy %1 to %2</P>").arg(curFile).arg(destFile));
return;
}
@@ -464,19 +484,22 @@ void AdvancedFm::move() {
moveDirectory( curFile, destFile );
rePopulate();
return;
}
QFile f( destFile);
if( f.exists()) {
- switch ( QMessageBox::warning(this,tr("File Exists!"),
- tr("<p>%1 already exists. Ok to overwrite?</P>").arg(destFile),
- tr("Yes"),tr("No"),0,0,1)) {
- case 1:
- return;
- break;
- };
+ switch ( QMessageBox::warning(this,tr("File Exists!"),
+ tr("<p>%1 already exists. Ok to overwrite?</P>").arg(destFile),
+ tr("Yes"),tr("No"),0,0,1)) {
+ case 1:
+ return;
+ break;
+ default:
+ return;
+ break;
+ };
if( !copyFile( curFile, destFile) ) {
QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg(curFile));
return;
} else
QFile::remove(curFile);
}