summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-02-24 01:37:16 (UTC)
committer llornkcor <llornkcor>2003-02-24 01:37:16 (UTC)
commit56b89312a374b62ee20f6ad2b62b6426183d4d26 (patch) (side-by-side diff)
treef57607a3f7b9e267245e79ea38a43694ebdefbb3
parent041eda0d7482d60cd67731b81fd36104fcd3120f (diff)
downloadopie-56b89312a374b62ee20f6ad2b62b6426183d4d26.zip
opie-56b89312a374b62ee20f6ad2b62b6426183d4d26.tar.gz
opie-56b89312a374b62ee20f6ad2b62b6426183d4d26.tar.bz2
first part refactoring simplify
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp680
-rw-r--r--noncore/apps/advancedfm/advancedfm.h30
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp33
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp858
4 files changed, 629 insertions, 972 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d8bdff7..74654fc 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -83,5 +83,7 @@ AdvancedFm::~AdvancedFm() {
}
-void AdvancedFm::cleanUp() {
+
+void AdvancedFm::cleanUp()
+{
QString sfile=QDir::homeDirPath();
if(sfile.right(1) != "/")
@@ -94,33 +96,29 @@ void AdvancedFm::cleanUp() {
}
-void AdvancedFm::tabChanged(QWidget *w) {
-// qDebug("tab changed %d",TabWidget->getCurrentTab());
+void AdvancedFm::tabChanged(QWidget *w)
+{
+ if( w == tab)
+ whichTab = 1;
+ else
+ whichTab = 2;
+
+// qDebug("tab changed %d", whichTab );
+
+ QString path = CurrentDir()->canonicalPath();
+ currentPathCombo->lineEdit()->setText( path );
- if ( w == tab) {
-// if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
- QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
- setCaption("AdvancedFm :: "+fs+" :: "
- +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" );
- }
- if ( w == tab_2) {
-// if (TabWidget->getCurrentTab() == 1) {
+ QString fs= getFileSystemType( (const QString &) path);
-// if (TabWidget->currentPageIndex() == 1) {
- currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
- viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
- viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
- QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
setCaption("AdvancedFm :: "+fs+" :: "
- +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" );
- }
+ +checkDiskSpace( (const QString &) path )+ " kB free" );
+ chdir( path.latin1());
}
-void AdvancedFm::populateLocalView() {
+void AdvancedFm::populateLocalView()
+{
QPixmap pm;
Local_View->clear();
@@ -136,6 +134,8 @@ void AdvancedFm::populateLocalView() {
QFileInfoListIterator it(*list);
QFileInfo *fi;
- while ( (fi=it.current()) ) {
- if (fi->isSymLink() ) {
+ while ( (fi=it.current()) )
+ {
+ if (fi->isSymLink() )
+ {
QString symLink=fi->readLink();
QFileInfo sym( symLink);
@@ -143,9 +143,12 @@ void AdvancedFm::populateLocalView() {
fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() );
fileDate = sym.lastModified().toString();
- } else {
+ }
+ else
+ {
fileS.sprintf( "%10i", fi->size() );
fileL.sprintf( "%s",fi->fileName().data() );
fileDate= fi->lastModified().toString();
- if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
+ if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() )
+ {
fileL+="/";
isDir=TRUE;
@@ -153,8 +156,10 @@ void AdvancedFm::populateLocalView() {
}
QFileInfo fileInfo( currentDir.canonicalPath()+"/"+fileL);
- if(fileL !="./" && fi->exists()) {
+ if(fileL !="./" && fi->exists())
+ {
item= new QListViewItem( Local_View, fileL, fileS , fileDate);
- if(isDir || fileL.find("/",0,TRUE) != -1) {
+ if(isDir || fileL.find("/",0,TRUE) != -1)
+ {
if( !QDir( fi->filePath() ).isReadable()) //is directory
@@ -162,13 +167,20 @@ void AdvancedFm::populateLocalView() {
else
pm= Resource::loadPixmap( "folder" );
- } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+ }
+ else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") )
+ {
pm = Resource::loadPixmap( "exec");
- } else if( (fileInfo.permission( QFileInfo::ExeUser)
+ }
+ else if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
- | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+ | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" )
+ {
pm = Resource::loadPixmap( "exec");
- } else if( !fi->isReadable() ) {
+ }
+ else if( !fi->isReadable() )
+ {
pm = Resource::loadPixmap( "locked" );
- } else { //everything else goes by mimetype
+ }
+ else { //everything else goes by mimetype
MimeType mt(fi->filePath());
pm=mt.pixmap(); //sets the correct pixmap for mimetype
@@ -177,5 +189,6 @@ void AdvancedFm::populateLocalView() {
}
item->setPixmap( 0,pm);
- if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) {
+ if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1)
+ {
// overlay link image
pm= Resource::loadPixmap( "folder" );
@@ -191,11 +204,14 @@ void AdvancedFm::populateLocalView() {
}
- if(currentDir.canonicalPath().find("dev",0,TRUE) != -1) {
+ if(currentDir.canonicalPath().find("dev",0,TRUE) != -1)
+ {
struct stat buf;
dev_t devT;
DIR *dir;
struct dirent *mydirent;
+
if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
- while ((mydirent = readdir(dir)) != NULL) {
+ while ((mydirent = readdir(dir)) != NULL)
+ {
lstat( mydirent->d_name, &buf);
// qDebug(mydirent->d_name);
@@ -204,5 +220,6 @@ void AdvancedFm::populateLocalView() {
fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
fileDate.sprintf("%s", ctime( &buf.st_mtime));
- if( fileL.find(".") == -1 ){
+ if( fileL.find(".") == -1 )
+ {
item= new QListViewItem( Local_View, fileL, fileS, fileDate);
pm = Resource::loadPixmap( "UnknownDocument-14" );
@@ -219,5 +236,6 @@ void AdvancedFm::populateLocalView() {
-void AdvancedFm::populateRemoteView() {
+void AdvancedFm::populateRemoteView()
+{
QPixmap pm;
Remote_View->clear();
@@ -234,6 +252,8 @@ void AdvancedFm::populateRemoteView() {
QFileInfoListIterator it(*list);
QFileInfo *fi;
- while ( (fi=it.current()) ) {
- if (fi->isSymLink() ){
+ while ( (fi=it.current()) )
+ {
+ if (fi->isSymLink() )
+ {
QString symLink=fi->readLink();
// qDebug("Symlink detected "+symLink);
@@ -242,10 +262,14 @@ void AdvancedFm::populateRemoteView() {
fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() );
fileDate = sym.lastModified().toString();
- } else {
+ }
+ else
+ {
// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
fileS.sprintf( "%10i", fi->size() );
fileL.sprintf( "%s",fi->fileName().data() );
fileDate= fi->lastModified().toString();
- if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
+
+ if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() )
+ {
fileL+="/";
isDir=TRUE;
@@ -253,23 +277,34 @@ void AdvancedFm::populateRemoteView() {
}
}
+
QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+fileL);
- if(fileL !="./" && fi->exists()) {
+ if(fileL !="./" && fi->exists())
+ {
item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
QPixmap pm;
- if(isDir || fileL.find("/",0,TRUE) != -1) {
+ if(isDir || fileL.find("/",0,TRUE) != -1)
+ {
if( !QDir( fi->filePath() ).isReadable())
pm = Resource::loadPixmap( "lockedfolder" );
else
pm= Resource::loadPixmap( "folder" );
- } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+ }
+ else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") )
+ {
pm = Resource::loadPixmap( "exec");
- } else if( (fileInfo.permission( QFileInfo::ExeUser)
+ }
+ else if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
- | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+ | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" )
+ {
pm = Resource::loadPixmap( "exec");
- } else if( !fi->isReadable() ) {
+ }
+ else if( !fi->isReadable() )
+ {
pm = Resource::loadPixmap( "locked" );
- } else {
+ }
+ else
+ {
MimeType mt(fi->filePath());
pm=mt.pixmap(); //sets the correct pixmap for mimetype
@@ -277,5 +312,6 @@ void AdvancedFm::populateRemoteView() {
pm = Resource::loadPixmap( "UnknownDocument-14" );
}
- if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) {
+ if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1)
+ {
// overlay link image
pm= Resource::loadPixmap( "folder" );
@@ -291,10 +327,13 @@ void AdvancedFm::populateRemoteView() {
}
- if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) {
+ if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1)
+ {
struct stat buf;
DIR *dir;
struct dirent *mydirent;
if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
- while ((mydirent = readdir(dir)) != NULL) {
+
+ while ((mydirent = readdir(dir)) != NULL)
+ {
lstat( mydirent->d_name, &buf);
// qDebug(mydirent->d_name);
@@ -302,5 +341,7 @@ void AdvancedFm::populateRemoteView() {
fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
fileDate.sprintf("%s", ctime( &buf.st_mtime));
- if( fileL.find(".") == -1 ){
+
+ if( fileL.find(".") == -1 )
+ {
item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
pm = Resource::loadPixmap( "UnknownDocument-14" );
@@ -316,95 +357,39 @@ void AdvancedFm::populateRemoteView() {
}
-void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
- if(selectedItem) {
+void AdvancedFm::ListClicked(QListViewItem *selectedItem)
+{
+ if(selectedItem)
+ {
QString strItem=selectedItem->text(0);
QString strSize=selectedItem->text(1);
strSize=strSize.stripWhiteSpace();
- if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
- QString strItem2 = dealWithSymName((const QString&)strItem);
-// QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
- if(QDir(strItem2).exists() ) {
- currentDir.cd(strItem2, TRUE);
- populateLocalView();
+ bool isDirectory = false;
+ QString strItem2;
+ if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 )//if symlink
+ {
+ strItem2 = dealWithSymName((const QString&)strItem);
+ if(QDir(strItem2).exists() )
+ strItem = strItem2;
}
- } else { // not a symlink
- if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
- if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
- strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
- currentDir.cd(strItem,FALSE);
- populateLocalView();
- Local_View->ensureItemVisible(Local_View->firstChild());
- } else {
- currentDir.cdUp();
- populateLocalView();
- Local_View->ensureItemVisible(Local_View->firstChild());
- }
- if(QDir(strItem).exists()){
- currentDir.cd(strItem, TRUE);
- Local_View->ensureItemVisible(Local_View->firstChild());
- populateLocalView();
- }
- } else {
- strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
- if( QFile::exists(strItem ) ) {
- // qDebug("clicked item "+strItem);
- // DocLnk doc( strItem, FALSE );
- // doc.execute();
- // Local_View->clearSelection();
- }
- } //end not symlink
- chdir(strItem.latin1());
- }
+ if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 )
+ {
+ if(QDir(strItem).exists())
+ isDirectory = true;
}
-}
-
-void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) {
- if(selectedItem) {
- QString strItem=selectedItem->text(0);
- QString strSize=selectedItem->text(1);
- strSize=strSize.stripWhiteSpace();
- if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
- QString strItem2 = dealWithSymName((const QString&)strItem);
-// QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
- currentRemoteDir.cd(strItem2, TRUE);
- populateRemoteView();
- } else { // not a symlink
- if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
- if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
- strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
- currentRemoteDir.cd(strItem,FALSE);
- populateRemoteView();
- Remote_View->ensureItemVisible(Remote_View->firstChild());
- } else {
- currentRemoteDir.cdUp();
- populateRemoteView();
- Remote_View->ensureItemVisible(Remote_View->firstChild());
- }
- if(QDir(strItem).exists()){
- currentRemoteDir.cd(strItem, TRUE);
- populateRemoteView();
- Remote_View->ensureItemVisible(Remote_View->firstChild());
- }
- } else {
- strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
- if( QFile::exists(strItem ) ) {
- // qDebug("clicked item "+strItem);
- // DocLnk doc( strItem, FALSE );
- // doc.execute();
- // Remote_View->clearSelection();
+ if( isDirectory )
+ {
+ CurrentDir()->cd( strItem, TRUE);
+ PopulateView();
+ CurrentView()->ensureItemVisible( CurrentView()->firstChild());
}
- } //end not symlink
chdir(strItem.latin1());
}
}
-}
-
-void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
-// qDebug("list pressed");
+void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
switch (mouse) {
case 1:
@@ -412,5 +397,4 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
if(renameBox != 0 )
{
-// qDebug("cancel rename");
cancelRename();
}
@@ -420,81 +404,61 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
case 2:
menuTimer.start( 500, TRUE );
-// qDebug("Start menu timer\n");
break;
};
}
-void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int ) {
-
- switch (mouse) {
- case 1:
- {
- if(renameBox != 0 )
+void AdvancedFm::switchToLocalTab()
{
-// qDebug("cancel rename");
- cancelRename();
- }
- }
- break;
- case 2:
- menuTimer.start( 500, TRUE );
-// qDebug("Start menu timer");
- break;
- };
-}
-
-
-void AdvancedFm::switchToLocalTab() {
TabWidget->setCurrentTab(0);
Local_View->setFocus();
}
-void AdvancedFm::switchToRemoteTab() {
+void AdvancedFm::switchToRemoteTab()
+{
TabWidget->setCurrentTab(1);
Remote_View->setFocus();
}
-void AdvancedFm::readConfig() {
+void AdvancedFm::readConfig()
+{
Config cfg("AdvancedFm");
}
-void AdvancedFm::writeConfig() {
+void AdvancedFm::writeConfig()
+{
Config cfg("AdvancedFm");
}
-void AdvancedFm::currentPathComboChanged() {
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
- currentDir.setPath( currentPathCombo->lineEdit()->text() );
- populateLocalView();
- } else {
- QMessageBox::message(tr("Note"),tr("That directory does not exist"));
- }
+void AdvancedFm::currentPathComboChanged()
+{
+ if(QDir( currentPathCombo->lineEdit()->text()).exists())
+ {
+ CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
+ PopulateView();
}
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
- currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
- populateRemoteView();
- } else {
+ else
+ {
QMessageBox::message(tr("Note"),tr("That directory does not exist"));
}
}
-}
-void AdvancedFm::fillCombo(const QString &currentPath) {
+void AdvancedFm::fillCombo(const QString &currentPath)
+{
// qDebug("%d",TabWidget->getCurrentTab());
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
+ if ( whichTab == 1)
+ {
currentPathCombo->lineEdit()->setText( currentPath);
- if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
+ if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() )
+ {
currentPathCombo->clear();
localDirPathStringList.prepend( currentPath );
currentPathCombo->insertStringList( localDirPathStringList,-1);
}
- } else {
+ }
+ else
+ {
currentPathCombo->lineEdit()->setText( currentPath);
- if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
+ if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() )
+ {
currentPathCombo->clear();
remoteDirPathStringList.prepend( currentPath );
@@ -504,37 +468,22 @@ void AdvancedFm::fillCombo(const QString &currentPath) {
}
-void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- chdir( currentPath.latin1() );
- currentDir.cd( currentPath, TRUE);
- populateLocalView();
- update();
- } else {
+void AdvancedFm::currentPathComboActivated(const QString & currentPath)
+{
chdir( currentPath.latin1() );
- currentRemoteDir.cd( currentPath, TRUE);
- populateRemoteView();
+ CurrentDir()->cd( currentPath, TRUE);
+ PopulateView();
update();
}
-}
-QStringList AdvancedFm::getPath() {
+QStringList AdvancedFm::getPath()
+{
QStringList strList;
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- QList<QListViewItem> * getSelectedItems( QListView * Local_View );
- QListViewItemIterator it( Local_View );
- for ( ; it.current(); ++it ) {
- if ( it.current()->isSelected() ) {
- strList << it.current()->text(0);
-// qDebug(it.current()->text(0));
- }
- }
- return strList;
- } else {
- QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
- QListViewItemIterator it( Remote_View );
- for ( ; it.current(); ++it ) {
- if ( it.current()->isSelected() ) {
+ QListView *thisView=CurrentView();
+ QList<QListViewItem> * getSelectedItems( QListView * thisView );
+ QListViewItemIterator it( thisView );
+ for ( ; it.current(); ++it )
+ {
+ if ( it.current()->isSelected() )
+ {
strList << it.current()->text(0);
// qDebug(it.current()->text(0));
@@ -543,52 +492,35 @@ QStringList AdvancedFm::getPath() {
return strList;
}
- return "";
-}
-void AdvancedFm::homeButtonPushed() {
+void AdvancedFm::homeButtonPushed()
+{
QString current = QDir::homeDirPath();
chdir( current.latin1() );
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- currentDir.cd( current, TRUE);
- populateLocalView();
- } else {
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
- }
+ CurrentDir()->cd( current, TRUE);
+ PopulateView();
update();
}
-void AdvancedFm::docButtonPushed() {
+void AdvancedFm::docButtonPushed()
+{
QString current = QPEApplication::documentDir();
chdir( current.latin1() );
- if (TabWidget->getCurrentTab() == 0) {
-//if (TabWidget->currentPageIndex() == 0) {
- currentDir.cd( current, TRUE);
- populateLocalView();
- } else {
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
- }
+ CurrentDir()->cd( current, TRUE);
+ PopulateView();
update();
}
-void AdvancedFm::SDButtonPushed() {
+void AdvancedFm::SDButtonPushed()
+{
QString current = "/mnt/card";// this can change so fix
chdir( current.latin1() );
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- currentDir.cd( current, TRUE);
- populateLocalView();
- } else {
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
- }
+ CurrentDir()->cd( current, TRUE);
+ PopulateView();
update();
-
}
-void AdvancedFm::CFButtonPushed() {
+void AdvancedFm::CFButtonPushed()
+{
QString current;
if(zaurusDevice)
@@ -598,59 +530,62 @@ void AdvancedFm::CFButtonPushed() {
chdir( current.latin1() );
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- currentDir.cd( current, TRUE);
- populateLocalView();
- } else {
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
- }
+ CurrentDir()->cd( current, TRUE);
+ PopulateView();
update();
}
-
-void AdvancedFm::doAbout() {
+void AdvancedFm::doAbout()
+{
QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
- "is copyright 2002 by\n"
+ "is copyright 2002-2003 by\n"
"L.J.Potter<llornkcor@handhelds.org>\n"
"and is licensed by the GPL"));
}
-void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
- if( TabWidget->hasFocus())
+void AdvancedFm::keyPressEvent( QKeyEvent *e)
+{
+// e->accept();
+ if( CurrentView()->hasFocus() )
+ {
switch ( e->key() ) {
case Key_Delete:
del();
break;
- case Key_H:
- showHidden();
- break;
- case Key_E:
- runThis();
+ case Key_A:
+ copyAs();
break;
case Key_C:
copy();
break;
- case Key_A:
- copyAs();
+ case Key_E:
+ runThis();
break;
- case Key_M:
- move();
+ case Key_G:
+ {
+ currentPathCombo->lineEdit()->setFocus();
+ }
break;
- case Key_R:
- rn();
+
+ case Key_H:
+ showHidden();
break;
case Key_I:
fileStatus();
break;
- case Key_U:
- upDir();
+ case Key_M:
+ move();
+ break;
+ case Key_N:
+ mkDir();
break;
case Key_P:
filePerms();
break;
- case Key_N:
- mkDir();
+ case Key_R:
+ rn();
+ break;
+ case Key_U:
+ upDir();
break;
case Key_1:
@@ -680,23 +615,27 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
case Key_0:
break;
+ };
+ e->accept();
}
}
+void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
+{
+ if( CurrentView()->hasFocus() )
+ e->ignore();
+}
+
-void AdvancedFm::QPEButtonPushed() {
+void AdvancedFm::QPEButtonPushed()
+{
QString current = QPEApplication::qpeDir();
chdir( current.latin1() );
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- currentDir.cd( current, TRUE);
- populateLocalView();
- } else {
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
- }
+ CurrentDir()->cd( current, TRUE);
+ PopulateView();
update();
}
-void AdvancedFm::parsetab(const QString &fileName) {
+void AdvancedFm::parsetab(const QString &fileName)
+{
fileSystemTypeList.clear();
@@ -704,10 +643,13 @@ void AdvancedFm::parsetab(const QString &fileName) {
struct mntent *me;
FILE *mntfp = setmntent( fileName.latin1(), "r" );
- if ( mntfp ) {
- while ( (me = getmntent( mntfp )) != 0 ) {
+ if ( mntfp )
+ {
+ while ( (me = getmntent( mntfp )) != 0 )
+ {
QString deviceName = me->mnt_fsname;
QString filesystemType = me->mnt_type;
QString mountDir = me->mnt_dir;
- if(deviceName != "none") {
+ if(deviceName != "none")
+ {
if( fsList.contains(filesystemType) == 0
& filesystemType.find("proc",0,TRUE) == -1
@@ -722,5 +664,6 @@ void AdvancedFm::parsetab(const QString &fileName) {
}
-QString AdvancedFm::getFileSystemType(const QString &currentText) {
+QString AdvancedFm::getFileSystemType(const QString &currentText)
+{
parsetab("/etc/mtab"); //why did TT forget filesystem type?
QString current = currentText;//.right( currentText.length()-1);
@@ -738,5 +681,6 @@ QString AdvancedFm::getFileSystemType(const QString &currentText) {
}
-QString AdvancedFm::getDiskSpace( const QString &path) {
+QString AdvancedFm::getDiskSpace( const QString &path)
+{
struct statfs fss;
if ( !statfs( path.latin1(), &fss ) ) {
@@ -756,15 +700,8 @@ QString AdvancedFm::getDiskSpace( const QString &path) {
-void AdvancedFm::showFileMenu() {
-
+void AdvancedFm::showFileMenu()
+{
QString curApp;
- bool isLocalView = false;
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- isLocalView = TRUE;
- curApp = Local_View->currentItem()->text(0);
- } else {
- curApp = Remote_View->currentItem()->text(0);
- }
+ curApp = CurrentView()->currentItem()->text(0);
MimeType mt( curApp );
@@ -774,13 +711,13 @@ void AdvancedFm::showFileMenu() {
QPopupMenu *n = new QPopupMenu(0);
// QPopupMenu *o = new QPopupMenu(0);
- if (TabWidget->getCurrentTab() == 0)
m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
- else
- m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showRemoteHidden() ));
- if ( QFileInfo(fi).isDir() ) {
+ if ( QFileInfo(fi).isDir() )
+ {
m->insertSeparator();
- m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
- } else {
+ m->insertItem( tr( "Change Directory" ), this, SLOT( doDirChange() ));
+ }
+ else
+ {
if ( app )
@@ -793,18 +730,10 @@ void AdvancedFm::showFileMenu() {
m->insertItem(tr("Actions"),n);
- if(isLocalView)
- n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
- else
- n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+ n->insertItem( tr( "Make Directory" ), this, SLOT( makeDir() ));
n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
n->insertSeparator();
-
-
- if(isLocalView)
- n->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
- else
- n->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+ n->insertItem( tr( "Rename" ), this, SLOT( renameIt() ));
n->insertItem( tr( "Copy" ), this, SLOT( copy() ));
@@ -814,11 +743,5 @@ void AdvancedFm::showFileMenu() {
n->insertSeparator();
-
- if(isLocalView)
- n->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
- else
- n->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
-
-
+ n->insertItem( tr( "Delete" ), this, SLOT( doDelete() ));
m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
@@ -847,6 +770,6 @@ void AdvancedFm::showFileMenu() {
-void AdvancedFm::cancelMenuTimer() {
-
+void AdvancedFm::cancelMenuTimer()
+{
// qDebug("selectionChanged: cancel menu timer");
if( menuTimer.isActive() )
@@ -854,7 +777,9 @@ void AdvancedFm::cancelMenuTimer() {
}
-QString AdvancedFm::checkDiskSpace(const QString &path) {
+QString AdvancedFm::checkDiskSpace(const QString &path)
+{
struct statfs fss;
- if ( !statfs( path.latin1(), &fss ) ) {
+ if ( !statfs( path.latin1(), &fss ) )
+ {
int blkSize = fss.f_bsize;
// int totalBlks = fs.f_blocks;
@@ -872,24 +797,16 @@ QString AdvancedFm::checkDiskSpace(const QString &path) {
}
-void AdvancedFm::addToDocs() {
+void AdvancedFm::addToDocs()
+{
QStringList strListPaths = getPath();
- if( strListPaths.count() > 0) {
+ QDir *thisDir = CurrentDir();
+
+ if( strListPaths.count() > 0)
+ {
QString curFile;
- if (TabWidget->getCurrentTab() == 0) {
-// if (TabWidget->currentPageIndex() == 0) {
- for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
- curFile = currentDir.canonicalPath()+"/"+(*it);
-// qDebug(curFile);
- DocLnk f;
-// curFile.replace(QRegExp("\\..*"),"");
- f.setName((*it));
- f.setFile( curFile);
- f.writeLink();
- }
- } else {
- for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
- curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+ for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it )
+ {
+ curFile = thisDir->canonicalPath()+"/"+(*it);
// qDebug(curFile);
-
DocLnk f;
// curFile.replace(QRegExp("\\..*"),"");
@@ -900,5 +817,4 @@ void AdvancedFm::addToDocs() {
}
}
-}
@@ -949,12 +865,5 @@ void AdvancedFm::addCustomDir()
QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
- if (TabWidget->getCurrentTab() == 0)
- {
- dir = currentDir.canonicalPath();
- }
- else
- {
- dir = currentRemoteDir.canonicalPath();
- }
+ dir = CurrentDir()->canonicalPath();
bool addIt=true;
@@ -985,13 +894,5 @@ void AdvancedFm::removeCustomDir()
QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
QStringList list2;
-
- if (TabWidget->getCurrentTab() == 0)
- {
- dir = currentDir.canonicalPath();
- }
- else
- {
- dir = currentRemoteDir.canonicalPath();
- }
+ dir = CurrentDir()->canonicalPath();
int ramble=2;
// int ramble=-24;
@@ -1030,4 +931,5 @@ void AdvancedFm::gotoCustomDir(const QString &dir)
// qDebug("gotoCustomDir(const QString &dir) " +dir );
QString curDir = dir;
+ QDir *thisDir = CurrentDir();
// if( curDir.isEmpty()) {
// }
@@ -1044,41 +946,57 @@ void AdvancedFm::gotoCustomDir(const QString &dir)
if(QDir( curDir).exists() )
{
- if (TabWidget->getCurrentTab() == 0)
- {
- currentDir.setPath( curDir );
+ thisDir->setPath( curDir );
chdir( curDir.latin1() );
- currentDir.cd( curDir, TRUE);
- populateLocalView();
+ thisDir->cd( curDir, TRUE);
+ PopulateView();
+ }
+ }
+}
+
+QDir *AdvancedFm::CurrentDir()
+{
+ if ( whichTab == 1)
+ {
+ return &currentDir;
}
else
{
- currentRemoteDir.setPath( curDir );
- chdir( curDir.latin1() );
- currentRemoteDir.cd( curDir, TRUE);
- populateRemoteView();
+ return &currentRemoteDir;
}
}
+
+QDir *AdvancedFm::OtherDir()
+{
+ if ( whichTab == 1)
+ {
+ return &currentRemoteDir;
}
-// menuButton
-// qDebug("gotoCustomDir(const QString &dir) " +dir );
-// QString curDir = dir;
-// if(QDir( curDir).exists() )
-// {
-// if (TabWidget->getCurrentTab() == 0)
-// {
-// currentDir.setPath( curDir );
-// chdir( curDir.latin1() );
-// currentDir.cd( curDir, TRUE);
-// populateLocalView();
-// }
-// else
-// {
-// currentRemoteDir.setPath( curDir );
-// chdir( curDir.latin1() );
-// currentRemoteDir.cd( curDir, TRUE);
-// populateRemoteView();
-// }
-// }
-// menuButton->setLabel(" ");
-// menuButton
+ else
+ {
+ return &currentDir;
+ }
+}
+
+void AdvancedFm::PopulateView()
+{
+ if ( whichTab == 1)
+ populateLocalView();
+ else
+ populateRemoteView();
+}
+
+QListView * AdvancedFm::CurrentView()
+{
+ if ( whichTab == 1)
+ return Local_View;
+ else
+ return Remote_View;
+}
+
+QListView * AdvancedFm::OtherView()
+{
+ if ( whichTab == 1)
+ return Remote_View;
+ else
+ return Local_View;
}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 7478dcb..8eec6ba 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -60,7 +60,5 @@ protected slots:
void selectAll();
void addToDocs();
- void doLocalCd();
- void doRemoteCd();
-// void copy();
+ void doDirChange();
void mkDir();
void del();
@@ -70,21 +68,14 @@ protected slots:
void showHidden();
void showMenuHidden();
- void showRemoteHidden();
+// void showRemoteHidden();
void writeConfig();
void readConfig();
- void localListClicked(QListViewItem *);
- void remoteListClicked(QListViewItem *);
- void localListPressed( int, QListViewItem *, const QPoint&, int);
- void remoteListPressed( int, QListViewItem *, const QPoint&, int);
- void localMakDir();
- void localDelete();
- void remoteMakDir();
- void remoteDelete();
-/* bool remoteDirList(const QString &); */
-/* bool remoteChDir(const QString &); */
+ void ListClicked(QListViewItem *);
+ void ListPressed( int, QListViewItem *, const QPoint&, int);
+ void makeDir();
+ void doDelete();
void tabChanged(QWidget*);
void cleanUp();
- void remoteRename();
- void localRename();
+ void renameIt();
void runThis();
void runText();
@@ -101,4 +92,5 @@ protected:
OTabWidget *TabWidget;
+ int whichTab;
// QTabWidget *TabWidget;
QWidget *tab, *tab_2, *tab_3;
@@ -124,4 +116,5 @@ protected:
void initConnections();
void keyReleaseEvent( QKeyEvent *);
+ void keyPressEvent( QKeyEvent *);
QString getFileSystemType(const QString &);
QString getDiskSpace(const QString &);
@@ -129,4 +122,9 @@ protected:
QString checkDiskSpace(const QString &);
QString dealWithSymName(const QString &);
+ QDir *CurrentDir();
+ QDir *OtherDir();
+ QListView *CurrentView();
+ QListView *OtherView();
+ void PopulateView();
protected slots:
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index bb80dc6..90425dc 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -231,12 +231,21 @@ void AdvancedFm::init() {
}
-void AdvancedFm::initConnections() {
- connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
- connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
- connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
- connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
- connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
- connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
- connect( homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+void AdvancedFm::initConnections()
+{
+
+ connect( qApp,SIGNAL( aboutToQuit()),
+ this, SLOT( cleanUp()) );
+ connect( qpeDirButton ,SIGNAL(released()),
+ this,SLOT( QPEButtonPushed()) );
+ connect( cfButton ,SIGNAL(released()),
+ this,SLOT( CFButtonPushed()) );
+ connect( sdButton ,SIGNAL(released()),
+ this,SLOT( SDButtonPushed()) );
+ connect( cdUpButton ,SIGNAL(released()),
+ this,SLOT( upDir()) );
+ connect( docButton,SIGNAL(released()),
+ this,SLOT( docButtonPushed()) );
+ connect( homeButton,SIGNAL(released()),
+ this,SLOT( homeButtonPushed()) );
connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
this, SLOT( currentPathComboActivated( const QString & ) ) );
@@ -246,14 +255,14 @@ void AdvancedFm::initConnections() {
connect( Local_View, SIGNAL( clicked( QListViewItem*)),
- this,SLOT( localListClicked(QListViewItem *)) );
+ this,SLOT( ListClicked(QListViewItem *)) );
connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
- this,SLOT( localListPressed(int, QListViewItem *, const QPoint&, int)) );
+ this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
- this,SLOT( remoteListClicked(QListViewItem *)) );
+ this,SLOT( ListClicked(QListViewItem *)) );
connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
- this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
+ this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
connect( TabWidget,SIGNAL(currentChanged(QWidget *)),
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index e7c0b6a..13dad33 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -47,14 +47,13 @@
-void AdvancedFm::doLocalCd() {
- localListClicked( Local_View->currentItem());
-}
-
-void AdvancedFm::doRemoteCd() {
- localListClicked( Remote_View->currentItem());
+void AdvancedFm::doDirChange()
+{
+ ListClicked( CurrentView()->currentItem());
}
-void AdvancedFm::showMenuHidden() {
- if (b) {
+void AdvancedFm::showMenuHidden()
+{
+ if (b)
+ {
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
@@ -62,5 +61,7 @@ void AdvancedFm::showMenuHidden() {
// b=FALSE;
- } else {
+ }
+ else
+ {
currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
@@ -70,81 +71,51 @@ void AdvancedFm::showMenuHidden() {
populateLocalView();
populateRemoteView();
-// if(TabWidget->getCurrentTab() == 0)
-// showHidden();
-// else
-// showRemoteHidden();
// if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true");
if(b) b = false; else b = true;
}
-void AdvancedFm::showHidden() {
- if (b) {
- currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+void AdvancedFm::showHidden()
+{
+ if (b)
+ {
+ CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
// fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
// b=FALSE;
- } else {
- currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-// fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
-// b=TRUE;
- }
- populateLocalView();
}
-
-void AdvancedFm::showRemoteHidden() {
- if (b) {
- currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+ else
+ {
+ CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+// fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
// b=TRUE;
-
- } else {
- currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-// b=FALSE;
}
- populateRemoteView();
+ PopulateView();
}
-QString AdvancedFm::dealWithSymName(const QString &fileName) {
+QString AdvancedFm::dealWithSymName(const QString &fileName)
+{
QString strItem = fileName;
return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
}
-void AdvancedFm::runThis() {
+void AdvancedFm::runThis()
+{
QString fs;
- if (TabWidget->getCurrentTab() == 0) {
- QString curFile = Local_View->currentItem()->text(0);
+ QDir *thisDir = CurrentDir();
+
+ QString curFile = CurrentView()->currentItem()->text(0);
+ QString path = thisDir->canonicalPath();
+
if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink
+
curFile = dealWithSymName((const QString&)curFile);
- if(curFile != "../") {
+ if(curFile != "../")
+ {
- fs = getFileSystemType((const QString &) currentDir.canonicalPath());
- QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
+ fs = getFileSystemType((const QString &) path);
+ QFileInfo fileInfo( path + "/" + curFile);
qDebug( fileInfo.owner());
- if( (fileInfo.permission( QFileInfo::ExeUser)
- | fileInfo.permission( QFileInfo::ExeGroup)
- | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
- | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
- QCopEnvelope e("QPE/System", "execute(QString)" );
- e << curFile;
- } else {
- curFile = currentDir.canonicalPath()+"/"+curFile;
- DocLnk nf(curFile);
- QString execStr = nf.exec();
- qDebug( execStr);
- if( execStr.isEmpty() ) {
- } else {
- nf.execute();
- }
- }
- }
- } else {
- QString curFile = Remote_View->currentItem()->text(0);
- if(curFile != "../") {
- if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink
- curFile = dealWithSymName((const QString&)curFile);
- fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
- qDebug("Filesystemtype is "+fs);
- QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
@@ -153,13 +124,17 @@ void AdvancedFm::runThis() {
QCopEnvelope e("QPE/System", "execute(QString)" );
e << curFile;
- } else {
- curFile = currentRemoteDir.canonicalPath()+"/"+curFile;
+ }
+ else
+ {
+ curFile = path + "/" + curFile;
DocLnk nf(curFile);
QString execStr = nf.exec();
qDebug(execStr);
- if( execStr.isEmpty() ) {
- } else {
- nf.execute();
+ if( execStr.isEmpty() )
+ {
}
+ else
+ {
+ nf.execute();
}
}
@@ -167,59 +142,46 @@ void AdvancedFm::runThis() {
}
-void AdvancedFm::runText() {
- if (TabWidget->getCurrentTab() == 0) {
- QString curFile = Local_View->currentItem()->text(0);
- if(curFile != "../") {
- if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink
- curFile = dealWithSymName((const QString&)curFile);
- curFile = currentDir.canonicalPath()+"/"+curFile;
- QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
- e << curFile;
- }
- } else {
- QString curFile = Remote_View->currentItem()->text(0);
- if(curFile != "../") {
- curFile = currentRemoteDir.canonicalPath()+"/"+curFile;
+void AdvancedFm::runText()
+{
+ QString curFile = CurrentView()->currentItem()->text(0);
+ if(curFile != "../")
+ {
if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink
curFile = dealWithSymName((const QString&)curFile);
- DocLnk nf(curFile);
+ curFile = CurrentDir()->canonicalPath()+"/"+curFile;
QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
e << curFile;
}
}
-}
-void AdvancedFm::localMakDir() {
+void AdvancedFm::makeDir()
+{
InputDialog *fileDlg;
fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
fileDlg->exec();
- if( fileDlg->result() == 1 ) {
+ if( fileDlg->result() == 1 )
+ {
+ QDir *thisDir = CurrentDir();
QString filename = fileDlg->LineEdit1->text();
- currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
+ thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
}
- populateLocalView();
+ PopulateView();
}
-void AdvancedFm::remoteMakDir() {
- InputDialog *fileDlg;
- fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
- fileDlg->exec();
- if( fileDlg->result() == 1 ) {
- QString filename = fileDlg->LineEdit1->text();
- currentRemoteDir.mkdir( currentRemoteDir.canonicalPath()+"/"+filename);
- }
- populateRemoteView();
-}
+void AdvancedFm::doDelete()
+{
-void AdvancedFm::localDelete() {
QStringList curFileList = getPath();
bool doMsg=true;
int count=curFileList.count();
- if( count > 0) {
- if(count > 1 ){
+ if( count > 0)
+ {
+ if(count > 1 )
+ {
QString msg;
msg=tr("Really delete\n%1 files?").arg(count);
switch ( QMessageBox::warning(this,tr("Delete"),msg
- ,tr("Yes"),tr("No"),0,0,1) ) {
+ ,tr("Yes"),tr("No"),0,0,1) )
+ {
case 0:
doMsg=false;
@@ -232,86 +194,26 @@ void AdvancedFm::localDelete() {
QString myFile;
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
myFile = (*it);
if( myFile.find(" -> ",0,TRUE) != -1)
myFile = myFile.left( myFile.find(" -> ",0,TRUE));
- QString f = currentDir.canonicalPath();
+ QString f = CurrentDir()->canonicalPath();
if(f.right(1).find("/",0,TRUE) == -1)
f+="/";
f+=myFile;
- if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
+ if(QDir(f).exists() && !QFileInfo(f).isSymLink() )
+ {
switch ( QMessageBox::warning(this,tr("Delete Directory?"),tr("Really delete\n")+f+
"\nand all it's contents ?"
- ,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() );
- populateLocalView();
- }
- break;
- case 1:
- // exit
- break;
- };
-
- } else {
- if(doMsg) {
- switch ( QMessageBox::warning(this,tr("Delete"),tr("Really delete\n")+f
- +" ?",tr("Yes"),tr("No"),0,0,1) ) {
- case 1:
- return;
- break;
- };
- }
- QString cmd="rm "+f;
- QFile file(f);
- if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1)
- file.remove();
- }
- }
- }
- populateLocalView();
-}
-
-void AdvancedFm::remoteDelete() {
- QStringList curFileList = getPath();
- bool doMsg=true;
- int count=curFileList.count();
- if( count > 0) {
- if(count > 1 ){
- QString msg;
- msg=tr("Really delete\n%1 files?").arg(count);
- switch ( QMessageBox::warning(this,tr("Delete"),msg
- ,tr("Yes"),tr("No"),0,0,1) ) {
+ ,tr("Yes"),tr("No"),0,0,1) )
+ {
case 0:
- doMsg=false;
- break;
- case 1:
- return;
- break;
- };
- }
-
- QString myFile;
-
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- myFile = (*it);
- if(myFile.find(" -> ",0,TRUE) != -1)
- myFile = myFile.left(myFile.find(" -> ",0,TRUE));
- QString f = currentRemoteDir.canonicalPath();
- if(f.right(1).find("/",0,TRUE) == -1)
- f+="/";
- f+=myFile;
- if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
- switch ( QMessageBox::warning(this,tr("Delete Directory"),tr("Really delete\n")+f+
- "\nand all it's contents ?",
- tr("Yes"),tr("No"),0,0,1) ) {
- case 0: {
+ {
f=f.left(f.length()-1);
QString cmd="rm -rf "+f;
- startProcess( (const QString)cmd );
- populateRemoteView();
+ startProcess( (const QString)cmd.latin1() );
+ PopulateView();
}
break;
@@ -337,20 +239,16 @@ void AdvancedFm::remoteDelete() {
}
}
- populateRemoteView();
+ PopulateView();
}
-
-void AdvancedFm::filePerms() {
-
+void AdvancedFm::filePerms()
+{
QStringList curFileList = getPath();
QString filePath;
- if (TabWidget->getCurrentTab() == 0) {
- filePath = currentDir.canonicalPath()+"/";
- } else {
- filePath= currentRemoteDir.canonicalPath()+"/";
- }
+ filePath = CurrentDir()->canonicalPath()+"/";
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
filePermissions *filePerm;
filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
@@ -360,12 +258,9 @@ void AdvancedFm::filePerms() {
delete filePerm;
}
- if (TabWidget->getCurrentTab() == 0) {
- populateLocalView();
- } else {
- populateRemoteView();
- }
+ PopulateView();
}
-void AdvancedFm::doProperties() {
+void AdvancedFm::doProperties()
+{
#if defined(QT_QWS_OPIE)
@@ -373,12 +268,10 @@ void AdvancedFm::doProperties() {
QString filePath;
- if (TabWidget->getCurrentTab() == 0) {
- filePath = currentDir.canonicalPath()+"/";
- } else {
- filePath= currentRemoteDir.canonicalPath()+"/";
- }
+ filePath = CurrentDir()->canonicalPath()+"/";
+
qDebug("%d",curFileList.count());
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
qDebug((filePath+*it));
DocLnk lnk( (filePath+*it));
@@ -391,29 +284,26 @@ void AdvancedFm::doProperties() {
}
-void AdvancedFm::upDir() {
- if (TabWidget->getCurrentTab() == 0) {
- QString current = currentDir.canonicalPath();
- QDir dir(current);
- dir.cdUp();
- current = dir.canonicalPath();
- chdir( current.latin1() );
- currentDir.cd( current, TRUE);
- populateLocalView();
- update();
- } else {
- QString current = currentRemoteDir.canonicalPath();
+void AdvancedFm::upDir()
+{
+ QDir *thisDir = CurrentDir();
+ QString current = thisDir->canonicalPath();
QDir dir(current);
dir.cdUp();
current = dir.canonicalPath();
chdir( current.latin1() );
- currentRemoteDir.cd( current, TRUE);
- populateRemoteView();
+ thisDir->cd( current, TRUE);
+
+ PopulateView();
update();
}
-}
-void AdvancedFm::copy() {
+void AdvancedFm::copy()
+{
qApp->processEvents();
QStringList curFileList = getPath();
+
+ QDir *thisDir = CurrentDir();
+ QDir *thatDir = OtherDir();
+
bool doMsg=true;
int count=curFileList.count();
@@ -423,5 +313,6 @@ void AdvancedFm::copy() {
msg=tr("Really copy\n%1 files?").arg(count);
switch ( QMessageBox::warning(this,tr("Delete"),msg
- ,tr("Yes"),tr("No"),0,0,1) ) {
+ ,tr("Yes"),tr("No"),0,0,1) )
+ {
case 0:
doMsg=false;
@@ -434,73 +325,48 @@ void AdvancedFm::copy() {
QString curFile, item, destFile;
- if (TabWidget->getCurrentTab() == 0) {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
item=(*it);
if(item.find("->",0,TRUE)) //symlink
item = item.left(item.find("->",0,TRUE));
- destFile = currentRemoteDir.canonicalPath()+"/"+ item;
- qDebug("Destination file is "+destFile);
-
- curFile = currentDir.canonicalPath()+"/"+ item;
- qDebug("CurrentFile file is " + curFile);
+ curFile = thisDir->canonicalPath()+"/"+ item;
+ destFile = thatDir->canonicalPath()+"/"+ item;
- QFile f(destFile);
- if( f.exists()) {
- if(doMsg) {
- switch ( QMessageBox::warning(this,tr("File Exists!"), tr("%1 exists. Ok to overwrite?").arg( item ), tr("Yes"),tr("No"),0,0,1) ) {
- case 1:
- return;
- break;
- };
- }
- f.remove();
- }
- if(!copyFile( curFile, destFile) ) {
- QMessageBox::message("AdvancedFm",tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
- return;
- }
- }
- populateRemoteView();
- TabWidget->setCurrentTab(1);
-
- } else {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- item= (*it);
- if(item.find("->",0,TRUE)) //symlink
- item = item.left(item.find("->",0,TRUE));
-
- destFile = currentDir.canonicalPath()+"/"+ item;
qDebug("Destination file is "+destFile);
-
- curFile = currentRemoteDir.canonicalPath()+"/"+ item;;
qDebug("CurrentFile file is " + curFile);
QFile f(destFile);
- if( f.exists()) {
+ if( f.exists())
+ {
+ if(doMsg)
+ {
switch ( QMessageBox::warning(this,tr("File Exists!"),
- item+tr("\nexists. Ok to overwrite?"),
- tr("Yes"),tr("No"),0,0,1) ) {
+ tr("%1 exists. Ok to overwrite?").arg( item ),
+ tr("Yes"),tr("No"),0,0,1) )
+ {
case 1:
return;
break;
};
+ }
f.remove();
}
- if(!copyFile( curFile, destFile) ) {
- QMessageBox::message("AdvancedFm",tr("Could not copy\n")
- +curFile +tr("to\n")+destFile);
- return;
+ if( !copyFile( curFile, destFile) )
+ {
+ QMessageBox::message("AdvancedFm",
+ tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
+ return;
}
}
- populateLocalView();
- TabWidget->setCurrentTab(0);
- }
+ PopulateView();
+// TabWidget->setCurrentTab(1);
}
}
-void AdvancedFm::copyAs() {
+void AdvancedFm::copyAs()
+{
qApp->processEvents();
@@ -508,64 +374,30 @@ void AdvancedFm::copyAs() {
QString curFile, item;
InputDialog *fileDlg;
- if (TabWidget->getCurrentTab() == 0) {
- qDebug("tab 1");
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- QString destFile;
- item=(*it);
- curFile = currentDir.canonicalPath()+"/"+(*it);
- fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
- fileDlg->setInputText((const QString &) destFile );
- fileDlg->exec();
-
- if( fileDlg->result() == 1 ) {
- QString filename = fileDlg->LineEdit1->text();
- destFile = currentRemoteDir.canonicalPath()+"/"+filename;
-
- QFile f(destFile);
- if( f.exists()) {
- switch (QMessageBox::warning(this,tr("File Exists!"),
- item+tr("\nexists. Ok to overwrite?"),
- tr("Yes"),tr("No"),0,0,1) ) {
- case 0:
- f.remove();
- break;
- case 1:
- return;
- break;
- };
- }
- if(!copyFile( curFile,destFile) ) {
- QMessageBox::message("AdvancedFm",tr("Could not copy\n")
- +curFile +tr("to\n")+destFile);
- return;
- }
- }
- delete fileDlg;
-
- }
- populateRemoteView();
- TabWidget->setCurrentTab(1);
-
- } else {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ QDir *thisDir = CurrentDir();
+ QDir *thatDir = OtherDir();
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
+ QString destFile;
item=(*it);
- curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+ curFile = thisDir->canonicalPath()+"/"+(*it);
fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
- QString destFile;
fileDlg->setInputText((const QString &) destFile);
fileDlg->exec();
- if( fileDlg->result() == 1 ) {
+ if( fileDlg->result() == 1 )
+ {
QString filename = fileDlg->LineEdit1->text();
- destFile = currentDir.canonicalPath()+"/"+filename;
+ destFile = thatDir->canonicalPath()+"/"+filename;
QFile f( destFile);
- if( f.exists()) {
+ if( f.exists())
+ {
switch ( QMessageBox::warning(this,tr("File Exists!"),
item+tr("\nexists. Ok to overwrite?"),
- tr("Yes"),tr("No"),0,0,1) ) {
+ tr("Yes"),tr("No"),0,0,1) )
+ {
case 0:
f.remove();
@@ -576,20 +408,19 @@ void AdvancedFm::copyAs() {
};
}
- if(!copyFile( curFile,destFile) ) {
+ if( !copyFile( curFile, destFile) )
+ {
QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+curFile +tr("to\n")+destFile);
return;
}
-
}
delete fileDlg;
}
- populateLocalView();
- TabWidget->setCurrentTab(0);
- }
+ PopulateView();
}
-void AdvancedFm::copySameDir() {
+void AdvancedFm::copySameDir()
+{
qApp->processEvents();
QStringList curFileList = getPath();
@@ -597,9 +428,10 @@ void AdvancedFm::copySameDir() {
InputDialog *fileDlg;
- if (TabWidget->getCurrentTab() == 0) {
+ QDir *thisDir = CurrentDir();
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
item=(*it);
- curFile = currentDir.canonicalPath()+"/"+ item;
+ curFile = thisDir->canonicalPath()+"/"+ item;
fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
@@ -607,11 +439,13 @@ void AdvancedFm::copySameDir() {
fileDlg->exec();
- if( fileDlg->result() == 1 ) {
+ if( fileDlg->result() == 1 )
+ {
QString filename = fileDlg->LineEdit1->text();
- destFile = currentDir.canonicalPath()+"/"+filename;
+ destFile = thisDir->canonicalPath()+"/"+filename;
QFile f(destFile);
- if( f.exists()) {
+ if( f.exists())
+ {
switch (QMessageBox::warning(this,tr("Delete"),
destFile+tr(" already exists.\nDo you really want to delete it?"),
@@ -626,5 +460,6 @@ void AdvancedFm::copySameDir() {
};
}
- if(!copyFile( curFile,destFile) ) {
+ if(!copyFile( curFile,destFile) )
+ {
QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+curFile +tr("to\n")+destFile);
@@ -636,68 +471,31 @@ void AdvancedFm::copySameDir() {
delete fileDlg;
}
- populateLocalView();
-
- } else {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- item=(*it);
- curFile = currentRemoteDir.canonicalPath()+"/"+ item;
-
- fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
- fileDlg->setInputText((const QString &) destFile);
- fileDlg->exec();
- if( fileDlg->result() == 1 ) {
- QString filename = fileDlg->LineEdit1->text();
-
- destFile = currentRemoteDir.canonicalPath()+"/"+filename;
-
- QFile f(destFile);
- if( f.exists()) {
- switch ( QMessageBox::warning(this,tr("Delete"),
- destFile+tr(" already exists.\nDo you really want to delete it?"),
- tr("Yes"),tr("No"),0,0,1) ) {
- case 0:
- f.remove();
- break;
- case 1:
- return;
- break;
- };
- }
- if(!copyFile( curFile,destFile) ) {
- QMessageBox::message("AdvancedFm",tr("Could not copy\n")
- +curFile +tr("to\n")+destFile);
- return;
- }
- qDebug("copy "+curFile+" as "+destFile);
- }
- delete fileDlg;
- }
- populateRemoteView();
- }
+ PopulateView();
}
-void AdvancedFm::move() {
+void AdvancedFm::move()
+{
qApp->processEvents();
QStringList curFileList = getPath();
- if( curFileList.count() > 0) {
+ if( curFileList.count() > 0)
+ {
QString curFile, destFile, item;
- if (TabWidget->getCurrentTab() == 0) {
-
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ QDir *thisDir = CurrentDir();
+ QDir *thatDir = OtherDir();
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
item=(*it);
- QString destFile = currentRemoteDir.canonicalPath();
+ QString destFile = thatDir->canonicalPath();
if(destFile.right(1).find("/",0,TRUE) == -1)
destFile+="/";
destFile += item;
- curFile = currentDir.canonicalPath();
-
qDebug("Destination file is "+destFile);
+ curFile = thisDir->canonicalPath();
if(curFile.right(1).find("/",0,TRUE) == -1)
curFile +="/";
-
curFile+= item;
qDebug("CurrentFile file is " + curFile);
@@ -705,5 +503,6 @@ void AdvancedFm::move() {
QFile f( curFile);
if( f.exists()) {
- if(!copyFile( curFile,destFile) ) {
+ if( !copyFile( curFile, destFile) )
+ {
QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
return;
@@ -713,43 +512,11 @@ void AdvancedFm::move() {
}
- TabWidget->setCurrentTab(1);
-
- } else { //view 2
-
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
- item = (*it);
- QString destFile = currentDir.canonicalPath();
-
- if(destFile.right(1).find("/",0,TRUE) == -1)
- destFile+="/";
-
- destFile += item;
-
- qDebug("Destination file is "+destFile);
-
- curFile = currentRemoteDir.canonicalPath();
-
- if(curFile.right(1).find("/",0,TRUE) == -1)
- curFile +="/";
- curFile+= item;
- qDebug("CurrentFile file is " + curFile);
-
- QFile f( curFile);
- if( f.exists()) {
- if(!copyFile( curFile, destFile) ) {
- QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile);
- return;
- } else
- QFile::remove( curFile);
- }
- TabWidget->setCurrentTab(0);
- }
}
populateRemoteView();
populateLocalView();
}
-}
-bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
+bool AdvancedFm::copyFile( const QString & src, const QString & dest )
+{
char bf[ 50000 ];
int bytesRead;
@@ -760,6 +527,8 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
QFile d( dest );
- if( s.open( IO_ReadOnly | IO_Raw ) && d.open( IO_WriteOnly | IO_Raw ) ) {
- while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
+ if( s.open( IO_ReadOnly | IO_Raw ) && d.open( IO_WriteOnly | IO_Raw ) )
+ {
+ while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) )
+ {
if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
success = FALSE;
@@ -767,13 +536,17 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
}
}
- if( success && (bytesRead > 0) ){
+ if( success && (bytesRead > 0) )
+ {
d.writeBlock( bf, bytesRead );
}
- } else {
+ }
+ else
+ {
success = FALSE;
}
// Set file permissions
- if( stat( (const char *) src, &status ) == 0 ){
+ if( stat( (const char *) src, &status ) == 0 )
+ {
chmod( (const char *) dest, status.st_mode );
}
@@ -782,13 +555,10 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
}
-void AdvancedFm::runCommand() {
+void AdvancedFm::runCommand()
+{
+ QDir *thisDir = CurrentDir();
+
QString curFile;
- if (TabWidget->getCurrentTab() == 0) {
- if( Local_View->currentItem())
- curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
- } else {
- if(Remote_View->currentItem())
- curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->currentItem()->text(0);
- }
+ curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
InputDialog *fileDlg;
@@ -798,5 +568,6 @@ void AdvancedFm::runCommand() {
//QString command;
- if( fileDlg->result() == 1 ) {
+ if( fileDlg->result() == 1 )
+ {
qDebug(fileDlg->LineEdit1->text());
QStringList command;
@@ -814,14 +585,11 @@ void AdvancedFm::runCommand() {
}
-void AdvancedFm::runCommandStd() {
+void AdvancedFm::runCommandStd()
+{
QString curFile;
- if (TabWidget->getCurrentTab() == 0) {
- if( Local_View->currentItem())
- curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
- } else {
- if(Remote_View->currentItem())
- curFile = currentRemoteDir.canonicalPath() +"/"
- + Remote_View->currentItem()->text(0);
- }
+ QDir *thisDir = CurrentDir();
+ QListView *thisView = CurrentView();
+ if( thisView->currentItem())
+ curFile = thisDir->canonicalPath() +"/"+ thisView->currentItem()->text(0);
InputDialog *fileDlg;
@@ -830,5 +598,6 @@ void AdvancedFm::runCommandStd() {
fileDlg->exec();
- if( fileDlg->result() == 1 ) {
+ if( fileDlg->result() == 1 )
+ {
qApp->processEvents();
startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
@@ -836,11 +605,8 @@ void AdvancedFm::runCommandStd() {
}
-void AdvancedFm::fileStatus() {
+void AdvancedFm::fileStatus()
+{
QString curFile;
- if (TabWidget->getCurrentTab() == 0) {
- curFile = Local_View->currentItem()->text(0);
- } else {
- curFile = Remote_View->currentItem()->text(0);
- }
+ curFile = CurrentView()->currentItem()->text(0);
QStringList command;
@@ -854,68 +620,43 @@ void AdvancedFm::fileStatus() {
outDlg->exec();
qApp->processEvents();
-
-
-// Output *outDlg;
-// outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
-// outDlg->showMaximized();
-// outDlg->show();
-// qApp->processEvents();
-
-// FILE *fp;
-// char line[130];
-// sleep(1);
-// fp = popen( (const char *) command, "r");
-// if ( !fp ) {
-// qDebug("Could not execute '" + command + "'! err=%d", fp);
-// QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
-// pclose(fp);
-// return;
-// } else {
-// while ( fgets( line, sizeof line, fp)) {
-// outDlg->OutputEdit->append(line);
-// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
-
-// }
-
-// }
-// pclose(fp);
}
-void AdvancedFm::mkDir() {
- if (TabWidget->getCurrentTab() == 0)
- localMakDir();
- else
- remoteMakDir();
-
+void AdvancedFm::mkDir()
+{
+ makeDir();
}
-void AdvancedFm::rn() {
- if (TabWidget->getCurrentTab() == 0)
- localRename();
- else
- remoteRename();
-
+void AdvancedFm::rn()
+{
+ renameIt();
}
-void AdvancedFm::del() {
- if (TabWidget->getCurrentTab() == 0)
- localDelete();
- else
- remoteDelete();
+void AdvancedFm::del()
+{
+ doDelete();
}
-void AdvancedFm::mkSym() {
+void AdvancedFm::mkSym()
+{
QString cmd;
QStringList curFileList = getPath();
- if( curFileList.count() > 0) {
-
- if (TabWidget->getCurrentTab() == 0) {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ if( curFileList.count() > 0)
+ {
+ if ( whichTab == 1)
+ {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
- if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
+ if(destName.right(1) == "/")
+ {
+ destName = destName.left( destName.length() -1);
+ }
QString curFile = currentDir.canonicalPath()+"/"+(*it);
- if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+ if( curFile.right(1) == "/")
+ {
+ curFile = curFile.left( curFile.length() -1);
+ }
cmd = "ln -s "+curFile+" "+destName;
qDebug(cmd);
@@ -924,11 +665,20 @@ void AdvancedFm::mkSym() {
populateRemoteView();
TabWidget->setCurrentTab(1);
- } else {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ }
+ else
+ {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
QString destName = currentDir.canonicalPath()+"/"+(*it);
- if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
+ if(destName.right(1) == "/")
+ {
+ destName = destName.left( destName.length() -1);
+ }
QString curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
- if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+ if( curFile.right(1) == "/")
+ {
+ curFile = curFile.left( curFile.length() -1);
+ }
cmd = "ln -s "+curFile+" "+destName;
@@ -942,32 +692,27 @@ void AdvancedFm::mkSym() {
}
-void AdvancedFm::doBeam() {
+void AdvancedFm::doBeam()
+{
Ir ir;
- if(!ir.supported()){
- } else {
+ if(!ir.supported())
+ {
+ }
+ else
+ {
QStringList curFileList = getPath();
- if( curFileList.count() > 0) {
-
- if (TabWidget->getCurrentTab() == 0) {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+ if( curFileList.count() > 0)
+ {
+ for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
+ {
- QString curFile = currentDir.canonicalPath()+"/"+(*it);
- if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
- Ir *file = new Ir(this, "IR");
- connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
- file->send( curFile, curFile );
+ QString curFile = CurrentDir()->canonicalPath()+"/"+(*it);
+ if( curFile.right(1) == "/")
+ {
+ curFile = curFile.left( curFile.length() -1);
}
-
- } else {
- for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-
- QString curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
- if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
Ir *file = new Ir(this, "IR");
connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
file->send( curFile, curFile );
-
- }
}
}
@@ -976,20 +721,23 @@ void AdvancedFm::doBeam() {
}
-void AdvancedFm::fileBeamFinished( Ir *) {
+void AdvancedFm::fileBeamFinished( Ir *)
+{
QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
-
}
-void AdvancedFm::selectAll() {
- if (TabWidget->getCurrentTab() == 0) {
- Local_View->selectAll(true);
- Local_View->setSelected( Local_View->firstChild(),false);
- } else {
- Remote_View->selectAll(true);
- Remote_View->setSelected( Remote_View->firstChild(),false);
- }
+void AdvancedFm::selectAll()
+{
+// if (TabWidget->getCurrentTab() == 0) {
+ QListView *thisView = CurrentView();
+ thisView->selectAll(true);
+ thisView->setSelected( thisView->firstChild(),false);
+// } else {
+// Remote_View->selectAll(true);
+// Remote_View->setSelected( Remote_View->firstChild(),false);
+// }
}
-void AdvancedFm::startProcess(const QString & cmd) {
+void AdvancedFm::startProcess(const QString & cmd)
+{
QStringList command;
OProcess *process;
@@ -1006,28 +754,39 @@ void AdvancedFm::startProcess(const QString & cmd) {
}
-void AdvancedFm::processEnded() {
+void AdvancedFm::processEnded()
+{
populateLocalView();
populateRemoteView();
}
-bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
- if ( o->inherits( "QLineEdit" ) ) {
- if ( e->type() == QEvent::KeyPress ) {
+bool AdvancedFm::eventFilter( QObject * o, QEvent * e )
+{
+ if ( o->inherits( "QLineEdit" ) )
+ {
+ if ( e->type() == QEvent::KeyPress )
+ {
QKeyEvent *ke = (QKeyEvent*)e;
if ( ke->key() == Key_Return ||
- ke->key() == Key_Enter ) {
+ ke->key() == Key_Enter )
+ {
okRename();
return true;
- } else if ( ke->key() == Key_Escape ) {
+ }
+ else if ( ke->key() == Key_Escape )
+ {
cancelRename();
return true;
}
- } else if ( e->type() == QEvent::FocusOut ) {
+ }
+ else if ( e->type() == QEvent::FocusOut )
+ {
cancelRename();
return true;
}
}
- if ( o->inherits( "QListView" ) ) {
- if ( e->type() == QEvent::FocusOut ) {
+ if ( o->inherits( "QListView" ) )
+ {
+ if ( e->type() == QEvent::FocusOut )
+ {
printf("focusIn\n");
@@ -1043,17 +802,11 @@ void AdvancedFm::cancelRename()
qDebug("cancel rename");
QListView * view;
- if (TabWidget->getCurrentTab() == 0)
- {
- view = Local_View;
- }
- else
- {
- view = Remote_View;
- }
+ view = CurrentView();
bool resetFocus = view->viewport()->focusProxy() == renameBox;
delete renameBox;
renameBox = 0;
- if ( resetFocus ) {
+ if ( resetFocus )
+ {
view->viewport()->setFocusProxy( view);
view->setFocus();
@@ -1086,16 +839,10 @@ void AdvancedFm::doRename(QListView * view)
-void AdvancedFm::localRename()
-{
- oldName = Local_View->currentItem()->text(0);
- doRename(Local_View );
- populateLocalView();
-}
-
-void AdvancedFm::remoteRename()
+void AdvancedFm::renameIt()
{
- oldName = Remote_View->currentItem()->text(0);
- doRename(Remote_View );
- populateRemoteView();
+ QListView *thisView = CurrentView();
+ oldName = thisView->currentItem()->text(0);
+ doRename( thisView );
+ PopulateView();
}
@@ -1104,21 +851,9 @@ void AdvancedFm::okRename()
QString newName = renameBox->text();
cancelRename();
- int tabs=0;
- QListView * view;
- tabs = TabWidget->getCurrentTab();
- if ( tabs == 0)
- {
- view = Local_View;
- QString path = currentDir.canonicalPath() + "/";
- oldName = path + oldName;
- newName = path + newName;
- }
- else
- {
- view = Remote_View;
- QString path = currentRemoteDir.canonicalPath() + "/";
+// int tabs=0;
+ QListView * view = CurrentView();
+ QString path = CurrentDir()->canonicalPath() + "/";
oldName = path + oldName;
newName = path + newName;
- }
if( view->currentItem() == NULL)
@@ -1131,7 +866,4 @@ void AdvancedFm::okRename()
view->takeItem( view->currentItem() );
delete view->currentItem();
- if ( tabs == 0)
- populateLocalView();
- else
- populateRemoteView();
+ PopulateView();
}