summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp106
-rw-r--r--noncore/apps/advancedfm/advancedfm.h3
2 files changed, 3 insertions, 106 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d0ccc3f..96a2d0a 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -75,7 +75,6 @@ AdvancedFm::AdvancedFm( )
: QMainWindow( )
{
setCaption( tr( "AdvancedFm" ) );
-// menuTimer( this );
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 2);
@@ -84,7 +83,6 @@ AdvancedFm::AdvancedFm( )
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
QPEMenuBar *menuBar = new QPEMenuBar(this);
-// fileMenu = new QPopupMenu( this );
fileMenu = new QPopupMenu( this );
viewMenu = new QPopupMenu( this );
@@ -95,54 +93,39 @@ AdvancedFm::AdvancedFm( )
qpeDirButton= new QToolButton(this,"QPEButton");
qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
-// qpeDirButton= new QPushButton(Resource::loadIconSet("launcher/opielogo16x16"),"",this,"QPEButton");
qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
- //qpeDirButton->setFlat(TRUE);
layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
cfButton = new QToolButton( this,"CFButton");
cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
-// cfButton = new QPushButton(Resource::loadIconSet("cardmon/pcmcia"),"",this,"CFButton");
cfButton ->setFixedSize( QSize( 20, 20 ) );
connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
- //cfButton->setFlat(TRUE);
layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
sdButton = new QToolButton( this,"SDButton");
sdButton->setPixmap(Resource::loadPixmap("sdmon/sdcard"));
-// sdButton = new QPushButton(Resource::loadIconSet("sdmon/sdcard"),"",this,"SDButton");
sdButton->setFixedSize( QSize( 20, 20 ) );
connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
-// sdButton->setFlat(TRUE);
layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
cdUpButton = new QToolButton( this,"cdUpButton");
cdUpButton->setPixmap(Resource::loadPixmap("up"));
-// cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
cdUpButton ->setFixedSize( QSize( 20, 20 ) );
connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
- //cdUpButton ->setFlat(TRUE);
layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
docButton = new QToolButton( this,"docsButton");
docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
-// docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
docButton->setFixedSize( QSize( 20, 20 ) );
connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
-// docButton->setFlat(TRUE);
layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
homeButton = new QToolButton( this,"homeButton");
homeButton->setPixmap(Resource::loadPixmap("home"));
-// homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
homeButton->setFixedSize( QSize( 20, 20 ) );
connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
-// homeButton->setFlat(TRUE);
layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
-// fileMenu->insertItem( tr( "New" ), this, SLOT( newConnection() ));
-// fileMenu->insertItem( tr( "Connect" ), this, SLOT( connector() ));
-// fileMenu->insertItem( tr( "Disconnect" ), this, SLOT( disConnector() ));
fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
@@ -187,7 +170,6 @@ AdvancedFm::AdvancedFm( )
tabLayout->setMargin( 2);
Local_View = new QListView( tab, "Local_View" );
-// Local_View->setResizePolicy( QListView::AutoOneFit );
Local_View->addColumn( tr("File"),130);
Local_View->addColumn( tr("Size"),-1);
Local_View->setColumnAlignment(1,QListView::AlignRight);
@@ -199,8 +181,6 @@ AdvancedFm::AdvancedFm( )
QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
-
-
tabLayout->addWidget( Local_View, 0, 0 );
connect( Local_View, SIGNAL( clicked( QListViewItem*)),
@@ -234,7 +214,6 @@ AdvancedFm::AdvancedFm( )
this,SLOT( remoteListClicked(QListViewItem *)) );
connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
-// connect( Remote_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
tabLayout_2->addWidget( Remote_View, 0, 0 );
@@ -267,9 +246,6 @@ QListView *fileTree;
///////////////
-////////////////////
-
-
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
currentDir.setPath( QDir::currentDirPath());
@@ -327,9 +303,6 @@ void AdvancedFm::populateLocalView()
currentDir.setMatchAllDirs(TRUE);
currentDir.setNameFilter(filterStr);
QString fileL, fileS, fileDate;
-// qDebug(currentDir.canonicalPath());
-// struct stat buf;
-// mode_t mode;
QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
setCaption("AdvancedFm :: "+fs);
bool isDir=FALSE;
@@ -339,7 +312,6 @@ void AdvancedFm::populateLocalView()
while ( (fi=it.current()) ) {
if (fi->isSymLink() ) {
QString symLink=fi->readLink();
-// qDebug("Symlink detected "+symLink);
QFileInfo sym( symLink);
fileS.sprintf( "%10li", sym.size() );
fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.absFilePath().data() );
@@ -351,7 +323,6 @@ void AdvancedFm::populateLocalView()
if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
fileL+="/";
isDir=TRUE;
-// qDebug( fileL);
}
}
QFileInfo fileInfo( currentDir.canonicalPath()+"/"+fileL);
@@ -364,26 +335,19 @@ void AdvancedFm::populateLocalView()
pm = Resource::loadPixmap( "lockedfolder" );
else
pm= Resource::loadPixmap( "folder" );
-// item->setPixmap( 0,pm );
} else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
pm = Resource::loadPixmap( "exec");
} else if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
| fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
pm = Resource::loadPixmap( "exec");
-// else { //is exec
-// pm = Resource::loadPixmap( "exec");
-// }
-// // item->setPixmap( 0,pm);
} else if( !fi->isReadable() ) {
pm = Resource::loadPixmap( "locked" );
-// item->setPixmap( 0,pm);
} 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);
}
item->setPixmap( 0,pm);
if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) {
@@ -402,23 +366,16 @@ void AdvancedFm::populateLocalView()
if(currentDir.canonicalPath().find("dev",0,TRUE) != -1) {
struct stat buf;
-// struct stat st;
dev_t devT;
-// mode_t mode;
DIR *dir;
-// int fd = 0;
struct dirent *mydirent;
-// int i = 1;
if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
while ((mydirent = readdir(dir)) != NULL) {
lstat( mydirent->d_name, &buf);
qDebug(mydirent->d_name);
-// mode = buf.st_mode;
fileL.sprintf("%s", mydirent->d_name);
-// fileS.sprintf("%d, %d", ); //this isn't correct
devT = buf.st_dev;
fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
-// fileS.sprintf("%d,%d", devT, devT);
fileDate.sprintf("%s", ctime( &buf.st_mtime));
if( fileL.find(".") == -1 ){
item= new QListViewItem( Local_View, fileL, fileS, fileDate);
@@ -437,15 +394,6 @@ void AdvancedFm::populateLocalView()
void AdvancedFm::populateRemoteView()
{
-// QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-// QListViewItemIterator it( Remote_View );
-// for ( ; it.current(); ++it ) {
-// if ( it.current()->isSelected() ) {
-// QString strItem = it.current()->text(0);
-// QString localFile = currentRemoteDir.canonicalPath()+"/"+strItem;
-// QFileInfo fi(localFile);
-// }
-// }
QPixmap pm;
Remote_View->clear();
currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
@@ -488,23 +436,19 @@ void AdvancedFm::populateRemoteView()
pm = Resource::loadPixmap( "lockedfolder" );
else
pm= Resource::loadPixmap( "folder" );
-// item->setPixmap( 0,pm );
} else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
pm = Resource::loadPixmap( "exec");
} else if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
| fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
pm = Resource::loadPixmap( "exec");
-// item->setPixmap( 0,pm);
} else if( !fi->isReadable() ) {
pm = Resource::loadPixmap( "locked" );
-// item->setPixmap( 0,pm);
} else {
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) {
// overlay link image
@@ -513,7 +457,6 @@ void AdvancedFm::populateRemoteView()
QPainter painter( &pm );
painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
pm.setMask( pm.createHeuristicMask( FALSE ) );
-// item->setPixmap( 0, pm);
}
item->setPixmap( 0, pm);
}
@@ -523,19 +466,13 @@ void AdvancedFm::populateRemoteView()
if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) {
struct stat buf;
-// struct stat st;
-// mode_t mode;
DIR *dir;
-// int fd = 0;
struct dirent *mydirent;
-// int i = 1;
if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
while ((mydirent = readdir(dir)) != NULL) {
lstat( mydirent->d_name, &buf);
qDebug(mydirent->d_name);
-// mode = buf.st_mode;
fileL.sprintf("%s", mydirent->d_name);
-// fileS.sprintf("%d, %d", ); //this isn't correct
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 ){
@@ -649,15 +586,11 @@ void AdvancedFm::showHidden()
if (b) {
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
-// localMenu->setItemChecked(localMenu->idAt(0),TRUE);
-// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
b=FALSE;
} else {
currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
-// localMenu->setItemChecked(localMenu->idAt(0),FALSE);
-// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
b=TRUE;
}
populateLocalView();
@@ -668,14 +601,10 @@ void AdvancedFm::showRemoteHidden()
{
if (b) {
currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-// viewMenu->setItemChecked(localMenu->idAt(0),TRUE);
-// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
b=TRUE;
} else {
currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-// localMenu->setItemChecked(localMenu->idAt(0),FALSE);
-// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
b=FALSE;
}
populateRemoteView();
@@ -708,7 +637,6 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint
}
void AdvancedFm::runThis() {
-// QFileInfo *fi;
QString fs;
if (TabWidget->currentPageIndex() == 0) {
QString curFile = Local_View->currentItem()->text(0);
@@ -721,7 +649,6 @@ void AdvancedFm::runThis() {
| fileInfo.permission( QFileInfo::ExeGroup)
| fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
| fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-// if( fileInfo.isExecutable() |
QCopEnvelope e("QPE/System", "execute(QString)" );
e << curFile;
} else {
@@ -735,7 +662,6 @@ void AdvancedFm::runThis() {
}
}
}
-// MimeType mt( curFile);
} else {
QString curFile = Remote_View->currentItem()->text(0);
if(curFile != "../") {
@@ -760,7 +686,6 @@ void AdvancedFm::runThis() {
}
}
}
-// MimeType mt( curFile);
}
}
@@ -1058,7 +983,6 @@ void AdvancedFm::doProperties() {
qDebug((filePath+*it));
DocLnk lnk( (filePath+*it));
LnkProperties prop( &lnk );
-// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
prop.showMaximized();
prop.exec();
}
@@ -1175,15 +1099,7 @@ void AdvancedFm::copy()
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-// if(destFile.right(1).find("/",0,TRUE) == -1)
-// destFile+="/";
-// destFile +=(*it);
-
curFile = currentDir.canonicalPath()+"/"+(*it);
-// if(curFile.right(1).find("/",0,TRUE) == -1)
-// curFile +="/";
-// curFile +=(*it);
-
QFile f(destFile);
if( f.exists()) {
switch ( QMessageBox::warning(this,tr("Delete"),
@@ -1248,8 +1164,6 @@ void AdvancedFm::copyAs()
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
QString destFile;
curFile = currentDir.canonicalPath()+"/"+(*it);
-// InputDialog *fileDlg;
-// fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
fileDlg->setInputText((const QString &) destFile );
fileDlg->exec();
if( fileDlg->result() == 1 ) {
@@ -1328,8 +1242,6 @@ void AdvancedFm::copySameDir() {
QString destFile;
curFile = currentDir.canonicalPath()+"/"+(*it);
fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-// InputDialog *fileDlg;
-// fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
fileDlg->setInputText((const QString &) destFile );
fileDlg->exec();
if( fileDlg->result() == 1 ) {
@@ -1531,7 +1443,6 @@ void AdvancedFm::runCommand() {
if( fileDlg->result() == 1 ) {
command = fileDlg->LineEdit1->text();
-// int err=0;
Output *outDlg;
outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
outDlg->showMaximized();
@@ -1540,7 +1451,6 @@ void AdvancedFm::runCommand() {
FILE *fp;
char line[130];
sleep(1);
-// if(command.find("2>",0,TRUE) != -1)
command +=" 2>&1";
fp = popen( (const char *) command, "r");
if ( !fp ) {
@@ -1589,7 +1499,6 @@ void AdvancedFm::fileStatus() {
curFile = Remote_View->currentItem()->text(0);
}
QString command = " stat -l "+ curFile +" 2>&1";
-// int err=0;
Output *outDlg;
outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
outDlg->showMaximized();
@@ -1764,7 +1673,6 @@ void AdvancedFm::parsetab(const QString &fileName) {
fileSystemTypeList.clear();
fsList.clear();
struct mntent *me;
-// if(fileName == "/etc/mtab") {
FILE *mntfp = setmntent( fileName.latin1(), "r" );
if ( mntfp ) {
while ( (me = getmntent( mntfp )) != 0 ) {
@@ -1777,8 +1685,6 @@ void AdvancedFm::parsetab(const QString &fileName) {
& filesystemType.find("cramfs",0,TRUE) == -1
& filesystemType.find("auto",0,TRUE) == -1)
fsList << filesystemType;
-// deviceList << deviceName;
-// qDebug(mountDir+"::"+filesystemType);
fileSystemTypeList << mountDir+"::"+filesystemType;
}
}
@@ -1845,17 +1751,6 @@ void AdvancedFm::fileBeamFinished( Ir *ir) {
}
-
-// QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-// QListViewItemIterator it( Local_View );
-// for ( ; it.current(); ++it ) {
-// if ( it.current()->isSelected() ) {
-// QString strItem = it.current()->text(0);
-// QString localFile = currentDir.canonicalPath()+"/"+strItem;
-// QFileInfo fi(localFile);
-// }
-// }
-
void AdvancedFm::showFileMenu() {
QString curApp;
@@ -1871,7 +1766,6 @@ void AdvancedFm::showFileMenu() {
const AppLnk* app = mt.application();
QFile fi(curApp);
- // QPopupMenu m;
QPopupMenu *m = new QPopupMenu(0);
m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 7665fe9..45f00ad 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -110,6 +110,8 @@ protected:
void keyReleaseEvent( QKeyEvent *);
QString getFileSystemType(const QString &);
+ QString getDiskSpace(const QString &);
+
void parsetab(const QString &fileName);
protected slots:
@@ -133,6 +135,7 @@ protected slots:
void doAbout();
void doBeam();
void fileBeamFinished( Ir *);
+
private:
QTimer menuTimer;
};