author | llornkcor <llornkcor> | 2003-02-24 01:37:16 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-02-24 01:37:16 (UTC) |
commit | 56b89312a374b62ee20f6ad2b62b6426183d4d26 (patch) (side-by-side diff) | |
tree | f57607a3f7b9e267245e79ea38a43694ebdefbb3 /noncore/apps | |
parent | 041eda0d7482d60cd67731b81fd36104fcd3120f (diff) | |
download | opie-56b89312a374b62ee20f6ad2b62b6426183d4d26.zip opie-56b89312a374b62ee20f6ad2b62b6426183d4d26.tar.gz opie-56b89312a374b62ee20f6ad2b62b6426183d4d26.tar.bz2 |
first part refactoring simplify
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 680 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 30 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 33 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 858 |
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 @@ -79,52 +79,50 @@ AdvancedFm::AdvancedFm( ) currentPathCombo->setFocus(); } AdvancedFm::~AdvancedFm() { } -void AdvancedFm::cleanUp() { + +void AdvancedFm::cleanUp() +{ QString sfile=QDir::homeDirPath(); if(sfile.right(1) != "/") sfile+="/._temp"; else sfile+="._temp"; QFile file( sfile); if(file.exists()) file.remove(); } -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(); currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); currentDir.setMatchAllDirs(TRUE); currentDir.setNameFilter(filterStr); QString fileL, fileS, fileDate; @@ -132,54 +130,69 @@ void AdvancedFm::populateLocalView() { setCaption("AdvancedFm :: "+fs+" :: " +checkDiskSpace((const QString &) currentDir.canonicalPath())+" kB free" ); bool isDir=FALSE; const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); 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); fileS.sprintf( "%10i", sym.size() ); 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; } } 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 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 { //everything else goes by mimetype + } + else { //everything else goes by mimetype MimeType mt(fi->filePath()); pm=mt.pixmap(); //sets the correct pixmap for mimetype if(pm.isNull()) pm = Resource::loadPixmap( "UnknownDocument-14" ); } 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" ); QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); QPainter painter( &pm ); painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); pm.setMask( pm.createHeuristicMask( FALSE ) ); @@ -187,26 +200,30 @@ void AdvancedFm::populateLocalView() { } } isDir=FALSE; ++it; } - 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); fileL.sprintf("%s", mydirent->d_name); devT = buf.st_dev; 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" ); item->setPixmap( 0,pm); } } @@ -215,13 +232,14 @@ void AdvancedFm::populateLocalView() { Local_View->setSorting( 3,FALSE); fillCombo( (const QString &) currentDir.canonicalPath()); } -void AdvancedFm::populateRemoteView() { +void AdvancedFm::populateRemoteView() +{ QPixmap pm; Remote_View->clear(); currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); currentRemoteDir.setMatchAllDirs(TRUE); currentRemoteDir.setNameFilter(filterStr); QString fileL, fileS, fileDate; @@ -230,56 +248,74 @@ void AdvancedFm::populateRemoteView() { setCaption("AdvancedFm :: "+fs+" :: " +checkDiskSpace((const QString &) currentRemoteDir.canonicalPath())+" kB free" ); bool isDir=FALSE; const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); 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); QFileInfo sym( symLink); fileS.sprintf( "%10i", sym.size() ); 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; // qDebug( fileL); } } + 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 if(pm.isNull()) 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" ); QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); QPainter painter( &pm ); painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); pm.setMask( pm.createHeuristicMask( FALSE ) ); @@ -287,24 +323,29 @@ void AdvancedFm::populateRemoteView() { item->setPixmap( 0, pm); } isDir=FALSE; ++it; } - 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); fileL.sprintf("%s", mydirent->d_name); 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" ); item->setPixmap( 0,pm); } } @@ -312,349 +353,243 @@ void AdvancedFm::populateRemoteView() { } Remote_View->setSorting( 3,FALSE); fillCombo( (const QString &) currentRemoteDir.canonicalPath() ); } -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: { if(renameBox != 0 ) { -// qDebug("cancel rename"); cancelRename(); } } break; 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 ¤tPath) { +void AdvancedFm::fillCombo(const QString ¤tPath) +{ // 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 ); currentPathCombo->insertStringList( remoteDirPathStringList,-1); } } } -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)); } } 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) current= "/mnt/cf"; //zaurus else current = "/mnt/hda"; //ipaq 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: switchToLocalTab(); break; case Key_2: switchToRemoteTab(); @@ -676,55 +611,63 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e) { case Key_8: break; case Key_9: break; 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(); fsList.clear(); 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 & filesystemType.find("cramfs",0,TRUE) == -1 & filesystemType.find("auto",0,TRUE) == -1) fsList << filesystemType; fileSystemTypeList << mountDir+"::"+filesystemType; } } } endmntent( mntfp ); } -QString AdvancedFm::getFileSystemType(const QString ¤tText) { +QString AdvancedFm::getFileSystemType(const QString ¤tText) +{ parsetab("/etc/mtab"); //why did TT forget filesystem type? QString current = currentText;//.right( currentText.length()-1); QString baseFs; for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) { QString temp = (*it); QString path = temp.left(temp.find("::",0,TRUE) ); @@ -734,13 +677,14 @@ QString AdvancedFm::getFileSystemType(const QString ¤tText) { return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); } } return baseFs; } -QString AdvancedFm::getDiskSpace( const QString &path) { +QString AdvancedFm::getDiskSpace( const QString &path) +{ struct statfs fss; if ( !statfs( path.latin1(), &fss ) ) { int blkSize = fss.f_bsize; // int totalBlks = fs.f_blocks; int availBlks = fss.f_bavail; @@ -752,77 +696,56 @@ QString AdvancedFm::getDiskSpace( const QString &path) { return QString::number(availBlks * mult / div); } return ""; } -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 ); const AppLnk* app = mt.application(); QFile fi(curApp); QPopupMenu *m = new QPopupMenu(0); 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 ) m->insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( runThis() ) ); else if( QFileInfo(fi).isExecutable() ) //damn opie doesnt like this m->insertItem( tr( "Execute" ), this, SLOT( runThis() ) ); m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) ); } 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() )); n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() )); n->insertItem( tr( "Move" ), this, SLOT( move() )); 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() )); m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); m->insertSeparator(); @@ -843,22 +766,24 @@ void AdvancedFm::showFileMenu() { m->exec( QPoint( 4,QCursor::pos().y()) ); if(m) delete m; } -void AdvancedFm::cancelMenuTimer() { - +void AdvancedFm::cancelMenuTimer() +{ // qDebug("selectionChanged: cancel menu timer"); if( menuTimer.isActive() ) menuTimer.stop(); } -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; int availBlks = fss.f_bavail; long mult = blkSize / 1024; long div = 1024 / blkSize; @@ -868,41 +793,32 @@ QString AdvancedFm::checkDiskSpace(const QString &path) { return QString::number(availBlks * mult / div); } return ""; } -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("\\..*"),""); f.setName((*it)); f.setFile( curFile); f.writeLink(); } } } -} void AdvancedFm::customDirsToMenu() { Config cfg("AdvancedFm"); @@ -945,20 +861,13 @@ void AdvancedFm::addCustomDir() { Config cfg("AdvancedFm"); cfg.setGroup("Menu"); QString dir; 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; for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { if( dir == (*it)) { @@ -981,21 +890,13 @@ void AdvancedFm::removeCustomDir() // qDebug("remove custom dir"); Config cfg("AdvancedFm"); cfg.setGroup("Menu"); QString dir; 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; //first remove list if(list.grep(dir,true).isEmpty()) { QMessageBox::message("AdvancedFm",tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!")); @@ -1026,12 +927,13 @@ void AdvancedFm::removeCustomDir() } void AdvancedFm::gotoCustomDir(const QString &dir) { // qDebug("gotoCustomDir(const QString &dir) " +dir ); QString curDir = dir; + QDir *thisDir = CurrentDir(); // if( curDir.isEmpty()) { // } if( curDir == s_addBookmark) { addCustomDir(); } @@ -1040,45 +942,61 @@ void AdvancedFm::gotoCustomDir(const QString &dir) removeCustomDir( ); } else { 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 ¤tDir; } else { - currentRemoteDir.setPath( curDir ); - chdir( curDir.latin1() ); - currentRemoteDir.cd( curDir, TRUE); - populateRemoteView(); + return ¤tRemoteDir; } } + +QDir *AdvancedFm::OtherDir() +{ + if ( whichTab == 1) + { + return ¤tRemoteDir; } -// 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 ¤tDir; + } +} + +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 @@ -56,39 +56,30 @@ class AdvancedFm : public QMainWindow public: AdvancedFm(); ~AdvancedFm(); protected slots: void selectAll(); void addToDocs(); - void doLocalCd(); - void doRemoteCd(); -// void copy(); + void doDirChange(); void mkDir(); void del(); void rn(); void populateLocalView(); void populateRemoteView(); 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(); void filePerms(); void doProperties(); void runCommand(); void runCommandStd(); @@ -97,12 +88,13 @@ protected slots: void switchToLocalTab(); void switchToRemoteTab(); protected: OTabWidget *TabWidget; + int whichTab; // QTabWidget *TabWidget; QWidget *tab, *tab_2, *tab_3; QListView *Local_View, *Remote_View; QLineEdit *currentPathEdit; QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/; @@ -120,17 +112,23 @@ protected: QStringList remoteDirPathStringList, localDirPathStringList; QLineEdit *renameBox; void init(); void initConnections(); void keyReleaseEvent( QKeyEvent *); + void keyPressEvent( QKeyEvent *); QString getFileSystemType(const QString &); QString getDiskSpace(const QString &); void parsetab(const QString &fileName); QString checkDiskSpace(const QString &); QString dealWithSymName(const QString &); + QDir *CurrentDir(); + QDir *OtherDir(); + QListView *CurrentView(); + QListView *OtherView(); + void PopulateView(); protected slots: void dirMenuSelected(int); void showFileMenu(); void cancelMenuTimer(); void homeButtonPushed(); 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 @@ -227,37 +227,46 @@ void AdvancedFm::init() { filterStr="*"; b=FALSE; TabWidget->setCurrentTab(0); } -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 & ) ) ); connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), this,SLOT(currentPathComboChanged())); 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 *)), this,SLOT(tabChanged(QWidget*))); connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) ); 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 @@ -43,279 +43,181 @@ #include <stdlib.h> #include <unistd.h> #include <sys/stat.h> #include <dirent.h> -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); fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); // b=FALSE; - } else { + } + else + { currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); // b=TRUE; } 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) | 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 = 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(); } } } } -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; break; case 1: return; break; }; } 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; case 1: // exit break; }; @@ -333,474 +235,343 @@ void AdvancedFm::remoteDelete() { QFile file(f); if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) file.remove(); } } } - 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)); filePerm->showMaximized(); filePerm->exec(); if( filePerm) delete filePerm; } - if (TabWidget->getCurrentTab() == 0) { - populateLocalView(); - } else { - populateRemoteView(); - } + PopulateView(); } -void AdvancedFm::doProperties() { +void AdvancedFm::doProperties() +{ #if defined(QT_QWS_OPIE) QStringList curFileList = getPath(); 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)); LnkProperties prop( &lnk ); prop.showMaximized(); prop.exec(); } #endif } -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(); if( count > 0) { if(count > 1 ){ QString msg; 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; break; case 1: return; break; }; } 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(); QStringList curFileList = getPath(); 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(); break; case 1: return; break; }; } - 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(); QString curFile, item, destFile; 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); 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 = 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?"), tr("Yes"),tr("No"),0,0,1) ) { case 0: f.remove(); break; case 1: return; break; }; } - if(!copyFile( curFile,destFile) ) { + 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; } - 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); 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; } else QFile::remove(curFile); } } - 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; bool success = TRUE; struct stat status; QFile s( src ); 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; break; } } - 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 ); } return success; } -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; fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0); fileDlg->setInputText(curFile); fileDlg->exec(); //QString command; - if( fileDlg->result() == 1 ) { + if( fileDlg->result() == 1 ) + { qDebug(fileDlg->LineEdit1->text()); QStringList command; command << "/bin/sh"; command << "-c"; command << fileDlg->LineEdit1->text(); @@ -810,190 +581,167 @@ void AdvancedFm::runCommand() { outDlg->exec(); qApp->processEvents(); } } -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; fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0); fileDlg->setInputText(curFile); fileDlg->exec(); - if( fileDlg->result() == 1 ) { + if( fileDlg->result() == 1 ) + { qApp->processEvents(); startProcess( (const QString)fileDlg->LineEdit1->text().latin1()); } } -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; command << "/bin/sh"; command << "-c"; command << "stat -l "+ curFile; Output *outDlg; outDlg = new Output( command, this, tr("AdvancedFm Output"), true); outDlg->showMaximized(); 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); startProcess( (const QString)cmd ); } 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; qDebug(cmd); startProcess( (const QString)cmd ); } populateLocalView(); TabWidget->setCurrentTab(0); } } } -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 ); - - } } } } } -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; process = new OProcess(); connect(process, SIGNAL(processExited(OProcess *)), this, SLOT( processEnded())); @@ -1002,36 +750,47 @@ void AdvancedFm::startProcess(const QString & cmd) { command << cmd.latin1(); *process << command; if(!process->start(OProcess::NotifyOnExit) ) qDebug("could not start process"); } -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"); } } return QWidget::eventFilter( o, e ); @@ -1039,25 +798,19 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { 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(); } } void AdvancedFm::doRename(QListView * view) @@ -1082,56 +835,35 @@ void AdvancedFm::doRename(QListView * view) renameBox->setFocus(); renameBox->show(); } -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(); } 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) return; if( rename(oldName.latin1(), newName.latin1())== -1) QMessageBox::message(tr("Note"),tr("Could not rename")); else oldName = ""; view->takeItem( view->currentItem() ); delete view->currentItem(); - if ( tabs == 0) - populateLocalView(); - else - populateRemoteView(); + PopulateView(); } |