summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp114
1 files changed, 59 insertions, 55 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index f97ae99..d0ccc3f 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1224,9 +1224,9 @@ void AdvancedFm::copy()
break;
};
}
if(!copyFile(destFile, curFile) ) {
- QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+ QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
qWarning("nothin doing");
}
}
@@ -1269,9 +1269,9 @@ void AdvancedFm::copyAs()
break;
};
}
if(!copyFile(destFile, curFile) ) {
- QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+ QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
qWarning("nothin doing");
}
}
}
@@ -1302,9 +1302,9 @@ void AdvancedFm::copyAs()
break;
};
}
if(!copyFile(destFile, curFile) ) {
- QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+ QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
qWarning("nothin doing");
}
}
@@ -1350,9 +1350,9 @@ void AdvancedFm::copySameDir() {
break;
};
}
if(!copyFile(destFile, curFile) ) {
- QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+ QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
qWarning("nothin doing");
}
qDebug("copy "+curFile+" as "+destFile);
@@ -1387,9 +1387,9 @@ void AdvancedFm::copySameDir() {
break;
};
}
if(!copyFile(destFile, curFile) ) {
- QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+ QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
qWarning("nothin doing");
}
qDebug("copy "+curFile+" as "+destFile);
}
@@ -1435,9 +1435,9 @@ void AdvancedFm::move() {
return;
break;
};
if(!copyFile( destFile, curFile) ) {
- QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
+ QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
return;
}
QFile::remove(curFile);
}
@@ -1467,9 +1467,9 @@ void AdvancedFm::move() {
return;
break;
};
if(!copyFile(destFile, curFile) ) {
- QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
+ QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
return;
}
}
QFile::remove(curFile);
@@ -1544,9 +1544,9 @@ void AdvancedFm::runCommand() {
command +=" 2>&1";
fp = popen( (const char *) command, "r");
if ( !fp ) {
qDebug("Could not execute '" + command + "'! err=%d", fp);
- QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
+ QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
pclose(fp);
return;
} else {
while ( fgets( line, sizeof line, fp)) {
@@ -1600,9 +1600,9 @@ void AdvancedFm::fileStatus() {
sleep(1);
fp = popen( (const char *) command, "r");
if ( !fp ) {
qDebug("Could not execute '" + command + "'! err=%d", fp);
- QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
+ QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
pclose(fp);
return;
} else {
while ( fgets( line, sizeof line, fp)) {
@@ -1637,12 +1637,12 @@ void AdvancedFm::del() {
remoteDelete();
}
void AdvancedFm::doAbout() {
- QMessageBox::message("AdvancedFm","Advanced FileManager\n"
+ QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
"is copyright 2002 by\n"
"L.J.Potter<llornkcor@handhelds.org>\n"
- "and is licensed by the GPL");
+ "and is licensed by the GPL"));
}
void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
{
@@ -1801,8 +1801,11 @@ QString AdvancedFm::getFileSystemType(const QString &currentText) {
}
return baseFs;
}
+QString AdvancedFm::getDiskSpace( const QString &) {
+
+}
void AdvancedFm::doBeam() {
Ir ir;
if(!ir.supported()){
@@ -1867,9 +1870,9 @@ void AdvancedFm::showFileMenu() {
MimeType mt( curApp );
const AppLnk* app = mt.application();
QFile fi(curApp);
-// QPopupMenu m;
+ // QPopupMenu m;
QPopupMenu *m = new QPopupMenu(0);
m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
m->insertSeparator();
@@ -1883,59 +1886,60 @@ void AdvancedFm::showFileMenu() {
m->insertItem( tr( "Execute" ), this, SLOT( runThis() ) );
m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
}
- m->insertSeparator();
+ m->insertSeparator();
- if(isLocalView)
- m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
- else
- m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+ if(isLocalView)
+ m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
+ else
+ m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
- m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
- m->insertSeparator();
+ m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
+ m->insertSeparator();
- if(isLocalView)
- m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
- else
- m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+ if(isLocalView)
+ m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+ else
+ m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+
+ m->insertItem( tr( "Copy" ), this, SLOT( copy() ));
+ m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
+ m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
+ m->insertItem( tr( "Move" ), this, SLOT( move() ));
+ m->insertSeparator();
- m->insertItem( tr( "Copy" ), this, SLOT( copy() ));
- m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
- m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
- m->insertItem( tr( "Move" ), this, SLOT( move() ));
- m->insertSeparator();
+ if(isLocalView)
+ m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
+ else
+ m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
- if(isLocalView)
- m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
- else
- m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+ m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
+ m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
+ m->insertSeparator();
- m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
- m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
- m->insertSeparator();
+ if(isLocalView)
+ m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
+ else
+ m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
- if(isLocalView)
- m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
- else
- m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
-
- m->insertSeparator();
- m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
- if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) //bad hack for Sharp zaurus failings
- m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
- m->setCheckable(TRUE);
- if (!b)
- m->setItemChecked(m->idAt(0),TRUE);
- else
- m->setItemChecked(m->idAt(0),FALSE);
- if(Ir::supported())
- m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
- m->setFocus();
- m->exec( QCursor::pos() );
- sleep(1);
- if(m) delete m;
+ m->insertSeparator();
+ m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
+
+ if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) //bad hack for Sharp zaurus failings
+ m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
+ m->setCheckable(TRUE);
+ if (!b)
+ m->setItemChecked(m->idAt(0),TRUE);
+ else
+ m->setItemChecked(m->idAt(0),FALSE);
+ if(Ir::supported())
+ m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
+ m->setFocus();
+ m->exec( QCursor::pos() );
+ sleep(1);
+ if(m) delete m;
}
void AdvancedFm::cancelMenuTimer()