summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-05-17 18:17:11 (UTC)
committer cniehaus <cniehaus>2003-05-17 18:17:11 (UTC)
commit982d7a64a7526379fc0f3b0ae64fdcce430775ff (patch) (side-by-side diff)
treefedd5d50bb4cdfd923a9deb09e8cd6c19f8b2e31
parent325096fb28d129429b17a781c4c1e8d6ca9aa585 (diff)
downloadopie-982d7a64a7526379fc0f3b0ae64fdcce430775ff.zip
opie-982d7a64a7526379fc0f3b0ae64fdcce430775ff.tar.gz
opie-982d7a64a7526379fc0f3b0ae64fdcce430775ff.tar.bz2
ported to HEAD
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp19
1 files changed, 14 insertions, 5 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 2201960..9f21245 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -202,15 +202,19 @@ void AdvancedFm::doDelete()
QString f = CurrentDir()->canonicalPath();
if(f.right(1).find("/",0,TRUE) == -1)
f += "/";
f += myFile;
if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory
{
- switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f +
- "\nand all it's contents ?"
- ,tr("Yes"),tr("No"),0,0,1) )
+ switch ( QMessageBox::warning( this, tr("Delete Directory?"),
+ tr("Really delete %1\nand all it's contents ?" ).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() );
@@ -221,14 +225,19 @@ void AdvancedFm::doDelete()
// exit
break;
};
} else {
if(doMsg) {
- switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f
- +" ?",tr("Yes"),tr("No"),0,0,1) ) {
+ switch ( QMessageBox::warning(this,tr("Delete"),
+ tr("Really delete\n%1?").arg( f ),
+ tr("Yes"),
+ tr("No"),
+ 0,
+ 0,
+ 1) ) {
case 1:
return;
break;
};
}
QString cmd="rm "+f;