Diffstat (limited to 'noncore/apps/advancedfm/advancedfmMenu.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 858 |
1 files changed, 295 insertions, 563 deletions
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 @@ -48,12 +48,11 @@ -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); @@ -63,3 +62,5 @@ void AdvancedFm::showMenuHidden() { - } else { + } + else + { currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); @@ -71,6 +72,2 @@ void AdvancedFm::showMenuHidden() { populateRemoteView(); -// if(TabWidget->getCurrentTab() == 0) -// showHidden(); -// else -// showRemoteHidden(); // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); @@ -79,5 +76,7 @@ void AdvancedFm::showMenuHidden() { -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); @@ -85,23 +84,14 @@ void AdvancedFm::showHidden() { - } 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; @@ -110,40 +100,21 @@ QString AdvancedFm::dealWithSymName(const QString &fileName) { -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) @@ -154,4 +125,6 @@ void AdvancedFm::runThis() { e << curFile; - } else { - curFile = currentRemoteDir.canonicalPath()+"/"+curFile; + } + else + { + curFile = path + "/" + curFile; DocLnk nf(curFile); @@ -159,6 +132,8 @@ void AdvancedFm::runThis() { qDebug(execStr); - if( execStr.isEmpty() ) { - } else { - nf.execute(); + if( execStr.isEmpty() ) + { } + else + { + nf.execute(); } @@ -168,19 +143,10 @@ 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)" ); @@ -189,5 +155,5 @@ void AdvancedFm::runText() { } -} -void AdvancedFm::localMakDir() { +void AdvancedFm::makeDir() +{ InputDialog *fileDlg; @@ -195,21 +161,14 @@ void AdvancedFm::localMakDir() { 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(); @@ -217,4 +176,6 @@ void AdvancedFm::localDelete() { int count=curFileList.count(); - if( count > 0) { - if(count > 1 ){ + if( count > 0) + { + if(count > 1 ) + { QString msg; @@ -222,3 +183,4 @@ void AdvancedFm::localDelete() { switch ( QMessageBox::warning(this,tr("Delete"),msg - ,tr("Yes"),tr("No"),0,0,1) ) { + ,tr("Yes"),tr("No"),0,0,1) ) + { case 0: @@ -233,3 +195,4 @@ 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); @@ -238,3 +201,3 @@ void AdvancedFm::localDelete() { - QString f = currentDir.canonicalPath(); + QString f = CurrentDir()->canonicalPath(); if(f.right(1).find("/",0,TRUE) == -1) @@ -242,75 +205,14 @@ void AdvancedFm::localDelete() { 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(); } @@ -338,8 +240,7 @@ void AdvancedFm::remoteDelete() { } - populateRemoteView(); + PopulateView(); } - -void AdvancedFm::filePerms() { - +void AdvancedFm::filePerms() +{ QStringList curFileList = getPath(); @@ -347,9 +248,6 @@ void AdvancedFm::filePerms() { - 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; @@ -361,10 +259,7 @@ void AdvancedFm::filePerms() { } - if (TabWidget->getCurrentTab() == 0) { - populateLocalView(); - } else { - populateRemoteView(); - } + PopulateView(); } -void AdvancedFm::doProperties() { +void AdvancedFm::doProperties() +{ #if defined(QT_QWS_OPIE) @@ -374,10 +269,8 @@ 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)); @@ -392,14 +285,6 @@ 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); @@ -408,11 +293,16 @@ void AdvancedFm::upDir() { 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; @@ -424,3 +314,4 @@ void AdvancedFm::copy() { switch ( QMessageBox::warning(this,tr("Delete"),msg - ,tr("Yes"),tr("No"),0,0,1) ) { + ,tr("Yes"),tr("No"),0,0,1) ) + { case 0: @@ -435,4 +326,4 @@ 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); @@ -441,37 +332,6 @@ void AdvancedFm::copy() { - 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); @@ -479,6 +339,10 @@ void AdvancedFm::copy() { 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: @@ -487,15 +351,16 @@ void AdvancedFm::copy() { }; + } 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); } @@ -503,3 +368,4 @@ void AdvancedFm::copy() { -void AdvancedFm::copyAs() { +void AdvancedFm::copyAs() +{ qApp->processEvents(); @@ -509,50 +375,13 @@ void AdvancedFm::copyAs() { 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); @@ -560,11 +389,14 @@ void AdvancedFm::copyAs() { - 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: @@ -577,3 +409,4 @@ void AdvancedFm::copyAs() { } - if(!copyFile( curFile,destFile) ) { + if( !copyFile( curFile, destFile) ) + { QMessageBox::message("AdvancedFm",tr("Could not copy\n") @@ -582,3 +415,2 @@ void AdvancedFm::copyAs() { } - } @@ -587,8 +419,7 @@ void AdvancedFm::copyAs() { } - populateLocalView(); - TabWidget->setCurrentTab(0); - } + PopulateView(); } -void AdvancedFm::copySameDir() { +void AdvancedFm::copySameDir() +{ qApp->processEvents(); @@ -598,7 +429,8 @@ void AdvancedFm::copySameDir() { - 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; @@ -608,9 +440,11 @@ void AdvancedFm::copySameDir() { - 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"), @@ -627,3 +461,4 @@ void AdvancedFm::copySameDir() { } - if(!copyFile( curFile,destFile) ) { + if(!copyFile( curFile,destFile) ) + { QMessageBox::message("AdvancedFm",tr("Could not copy\n") @@ -637,44 +472,7 @@ void AdvancedFm::copySameDir() { } - 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(); @@ -682,10 +480,12 @@ void AdvancedFm::move() { 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(); @@ -694,9 +494,7 @@ void AdvancedFm::move() { destFile += item; - curFile = currentDir.canonicalPath(); - qDebug("Destination file is "+destFile); + curFile = thisDir->canonicalPath(); if(curFile.right(1).find("/",0,TRUE) == -1) curFile +="/"; - curFile+= item; @@ -706,3 +504,4 @@ void AdvancedFm::move() { if( f.exists()) { - if(!copyFile( curFile,destFile) ) { + if( !copyFile( curFile, destFile) ) + { QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); @@ -714,34 +513,2 @@ 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); - } } @@ -750,5 +517,5 @@ void AdvancedFm::move() { } -} -bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { +bool AdvancedFm::copyFile( const QString & src, const QString & dest ) +{ char bf[ 50000 ]; @@ -761,4 +528,6 @@ bool AdvancedFm::copyFile( const QString & src, const QString & 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 ) ){ @@ -768,6 +537,9 @@ 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; @@ -776,3 +548,4 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { // Set file permissions - if( stat( (const char *) src, &status ) == 0 ){ + if( stat( (const char *) src, &status ) == 0 ) + { chmod( (const char *) dest, status.st_mode ); @@ -783,11 +556,8 @@ 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); @@ -799,3 +569,4 @@ void AdvancedFm::runCommand() { - if( fileDlg->result() == 1 ) { + if( fileDlg->result() == 1 ) + { qDebug(fileDlg->LineEdit1->text()); @@ -815,12 +586,9 @@ 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); @@ -831,3 +599,4 @@ void AdvancedFm::runCommandStd() { - if( fileDlg->result() == 1 ) { + if( fileDlg->result() == 1 ) + { qApp->processEvents(); @@ -837,9 +606,6 @@ 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); @@ -855,28 +621,2 @@ void AdvancedFm::fileStatus() { 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); } @@ -884,37 +624,38 @@ void AdvancedFm::fileStatus() { -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; @@ -925,9 +666,18 @@ void AdvancedFm::mkSym() { 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); + } @@ -943,25 +693,22 @@ 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"); @@ -969,4 +716,2 @@ void AdvancedFm::doBeam() { file->send( curFile, curFile ); - - } } @@ -977,18 +722,21 @@ 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; @@ -1007,3 +755,4 @@ void AdvancedFm::startProcess(const QString & cmd) { -void AdvancedFm::processEnded() { +void AdvancedFm::processEnded() +{ populateLocalView(); @@ -1012,11 +761,17 @@ void AdvancedFm::processEnded() { -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(); @@ -1024,3 +779,5 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { } - } else if ( e->type() == QEvent::FocusOut ) { + } + else if ( e->type() == QEvent::FocusOut ) + { cancelRename(); @@ -1029,4 +786,6 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { } - if ( o->inherits( "QListView" ) ) { - if ( e->type() == QEvent::FocusOut ) { + if ( o->inherits( "QListView" ) ) + { + if ( e->type() == QEvent::FocusOut ) + { printf("focusIn\n"); @@ -1044,10 +803,3 @@ void AdvancedFm::cancelRename() QListView * view; - if (TabWidget->getCurrentTab() == 0) - { - view = Local_View; - } - else - { - view = Remote_View; - } + view = CurrentView(); @@ -1056,3 +808,4 @@ void AdvancedFm::cancelRename() renameBox = 0; - if ( resetFocus ) { + if ( resetFocus ) + { view->viewport()->setFocusProxy( view); @@ -1087,14 +840,8 @@ 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(); } @@ -1105,19 +852,7 @@ void AdvancedFm::okRename() 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; - } @@ -1132,6 +867,3 @@ void AdvancedFm::okRename() delete view->currentItem(); - if ( tabs == 0) - populateLocalView(); - else - populateRemoteView(); + PopulateView(); } |