author | llornkcor <llornkcor> | 2004-09-25 05:54:57 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-25 05:54:57 (UTC) |
commit | 0671201a4527973c41adad5f5681938da7f1f824 (patch) (unidiff) | |
tree | 0dab2989196bfb6e74b3c647c211e8c39587a881 /noncore/apps/advancedfm | |
parent | dba0864dd99dfc86a33bde72809634be7f0da9c4 (diff) | |
download | opie-0671201a4527973c41adad5f5681938da7f1f824.zip opie-0671201a4527973c41adad5f5681938da7f1f824.tar.gz opie-0671201a4527973c41adad5f5681938da7f1f824.tar.bz2 |
formatted strings
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 8d07f69..9721f84 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -294,13 +294,13 @@ void AdvancedFm::switchToRemoteTab() { | |||
294 | 294 | ||
295 | void AdvancedFm::currentPathComboChanged() { | 295 | void AdvancedFm::currentPathComboChanged() { |
296 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { | 296 | if(QDir( currentPathCombo->lineEdit()->text()).exists()) { |
297 | CurrentDir()->setPath( currentPathCombo->lineEdit()->text() ); | 297 | CurrentDir()->setPath( currentPathCombo->lineEdit()->text() ); |
298 | populateView(); | 298 | populateView(); |
299 | } else { | 299 | } else { |
300 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); | 300 | QMessageBox::message(tr("Note"),tr("<p>That directory does not exist</p>")); |
301 | } | 301 | } |
302 | } | 302 | } |
303 | 303 | ||
304 | void AdvancedFm::fillCombo(const QString ¤tPath) { | 304 | void AdvancedFm::fillCombo(const QString ¤tPath) { |
305 | 305 | ||
306 | if ( TabWidget->currentWidget() == tab) { | 306 | if ( TabWidget->currentWidget() == tab) { |
@@ -666,13 +666,13 @@ void AdvancedFm::removeCustomDir() { | |||
666 | dir = CurrentDir()->canonicalPath(); | 666 | dir = CurrentDir()->canonicalPath(); |
667 | int ramble=2; | 667 | int ramble=2; |
668 | // int ramble=-24; | 668 | // int ramble=-24; |
669 | //first remove list | 669 | //first remove list |
670 | if(list.grep(dir,true).isEmpty()) { | 670 | if(list.grep(dir,true).isEmpty()) { |
671 | QMessageBox::message(tr( "AdvancedFm" ), | 671 | QMessageBox::message(tr( "AdvancedFm" ), |
672 | tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!")); | 672 | tr("<p>Cannot remove current directory from bookmarks. It is not bookmarked!</p>")); |
673 | } else { | 673 | } else { |
674 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | 674 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { |
675 | if((*it) != dir) { | 675 | if((*it) != dir) { |
676 | //current item is not our current dir, so add it to temp list | 676 | //current item is not our current dir, so add it to temp list |
677 | list2 <<(*it); | 677 | list2 <<(*it); |
678 | } else { | 678 | } else { |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index f14f588..706658e 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -144,13 +144,13 @@ void 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("Really delete\n%1 files?").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; |
@@ -172,13 +172,13 @@ void AdvancedFm::doDelete() { | |||
172 | f += "/"; | 172 | f += "/"; |
173 | f += myFile; | 173 | f += myFile; |
174 | if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { | 174 | if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { |
175 | //if file is a directory | 175 | //if file is a directory |
176 | 176 | ||
177 | switch ( QMessageBox::warning( this, tr("Delete Directory?"), | 177 | switch ( QMessageBox::warning( this, tr("Delete Directory?"), |
178 | tr("Really delete %1\nand all it's contents ?" ).arg( f ) , | 178 | tr("<p>Really delete %1 and all it's contents?</p>" ).arg( f ) , |
179 | tr("Yes"), tr("No"), 0, 0, 1) ) { | 179 | tr("Yes"), tr("No"), 0, 0, 1) ) { |
180 | case 0: | 180 | case 0: |
181 | { | 181 | { |
182 | f=f.left(f.length()-1); | 182 | f=f.left(f.length()-1); |
183 | QString cmd="rm -rf "+f; | 183 | QString cmd="rm -rf "+f; |
184 | startProcess( (const QString)cmd.latin1() ); | 184 | startProcess( (const QString)cmd.latin1() ); |
@@ -190,13 +190,13 @@ void AdvancedFm::doDelete() { | |||
190 | break; | 190 | break; |
191 | }; | 191 | }; |
192 | 192 | ||
193 | } else { | 193 | } else { |
194 | if(doMsg) { | 194 | if(doMsg) { |
195 | switch ( QMessageBox::warning(this,tr("Delete"), | 195 | switch ( QMessageBox::warning(this,tr("Delete"), |
196 | tr("Really delete\n%1?").arg( myFile ), | 196 | tr("<p>Really delete %1?</p>").arg( myFile ), |
197 | tr("Yes"), tr("No"), 0, 0, 1) ) { | 197 | tr("Yes"), tr("No"), 0, 0, 1) ) { |
198 | case 1: | 198 | case 1: |
199 | return; | 199 | return; |
200 | break; | 200 | break; |
201 | }; | 201 | }; |
202 | } | 202 | } |
@@ -283,13 +283,13 @@ void AdvancedFm::copy() { | |||
283 | 283 | ||
284 | bool doMsg=true; | 284 | bool doMsg=true; |
285 | int count=curFileList.count(); | 285 | int count=curFileList.count(); |
286 | if( count > 0) { | 286 | if( count > 0) { |
287 | if(count > 1 ){ | 287 | if(count > 1 ){ |
288 | QString msg; | 288 | QString msg; |
289 | msg=tr("Really copy\n%1 files?").arg(count); | 289 | msg=tr("<p>Really copy %1 files?</p>").arg(count); |
290 | switch ( QMessageBox::warning(this,tr("Copy"),msg | 290 | switch ( QMessageBox::warning(this,tr("Copy"),msg |
291 | ,tr("Yes"),tr("No"),0,0,1) ) | 291 | ,tr("Yes"),tr("No"),0,0,1) ) |
292 | { | 292 | { |
293 | case 0: | 293 | case 0: |
294 | doMsg=false; | 294 | doMsg=false; |
295 | break; | 295 | break; |
@@ -498,25 +498,25 @@ bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) { | |||
498 | QString cmd = "rm -rf " + src; | 498 | QString cmd = "rm -rf " + src; |
499 | err = system((const char*)cmd); | 499 | err = system((const char*)cmd); |
500 | } else | 500 | } else |
501 | err = -1; | 501 | err = -1; |
502 | 502 | ||
503 | if(err!=0) { | 503 | if(err!=0) { |
504 | QMessageBox::message(tr("Note"),tr("Could not move\n") + src); | 504 | QMessageBox::message(tr("Note"),tr("<p>Could not move %1</p>").arg( src)); |
505 | return false; | 505 | return false; |
506 | } | 506 | } |
507 | return true; | 507 | return true; |
508 | } | 508 | } |
509 | 509 | ||
510 | bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) { | 510 | bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) { |
511 | 511 | ||
512 | QString cmd = "/bin/cp -fpR " + src + " " + dest; | 512 | QString cmd = "/bin/cp -fpR " + src + " " + dest; |
513 | owarn << cmd << oendl; | 513 | owarn << cmd << oendl; |
514 | int err = system( (const char *) cmd ); | 514 | int err = system( (const char *) cmd ); |
515 | if ( err != 0 ) { | 515 | if ( err != 0 ) { |
516 | QMessageBox::message("AdvancedFm", tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) ); | 516 | QMessageBox::message("AdvancedFm", tr( "<p>Could not copy %1 to %2</p>").arg( src ).arg( dest ) ); |
517 | return false; | 517 | return false; |
518 | } | 518 | } |
519 | 519 | ||
520 | return true; | 520 | return true; |
521 | } | 521 | } |
522 | 522 | ||