summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-16 15:17:00 (UTC)
committer llornkcor <llornkcor>2002-10-16 15:17:00 (UTC)
commit61f2f6ef32685002710f197dc8990fd9e99d83a5 (patch) (side-by-side diff)
tree5fa57efbff0e83a326f6e055c3c59be71d4328bd
parentee8da0d0b70318c24ee2417bbccd9b7cd6e1404e (diff)
downloadopie-61f2f6ef32685002710f197dc8990fd9e99d83a5.zip
opie-61f2f6ef32685002710f197dc8990fd9e99d83a5.tar.gz
opie-61f2f6ef32685002710f197dc8990fd9e99d83a5.tar.bz2
fix for popup menu crash.. didnt like loading executable pixmap
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp59
1 files changed, 31 insertions, 28 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d7bad51..b6e7a30 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -599,259 +599,262 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
break;
case Key_R:
rn();
break;
case Key_I:
fileStatus();
break;
case Key_U:
upDir();
break;
case Key_P:
filePerms();
break;
case Key_N:
mkDir();
break;
case Key_1:
switchToLocalTab();
break;
case Key_2:
switchToRemoteTab();
break;
case Key_3:
CFButtonPushed();
break;
case Key_4:
SDButtonPushed();
break;
case Key_5:
homeButtonPushed();
break;
case Key_6:
docButtonPushed();
break;
case Key_7:
break;
case Key_8:
break;
case Key_9:
break;
case Key_0:
break;
}
}
void AdvancedFm::QPEButtonPushed() {
QString current = QPEApplication::qpeDir();
chdir( current.latin1() );
if (TabWidget->currentPageIndex() == 0) {
currentDir.cd( current, TRUE);
populateLocalView();
} else {
currentRemoteDir.cd( current, TRUE);
populateRemoteView();
}
update();
}
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 ) {
QString deviceName = me->mnt_fsname;
QString filesystemType = me->mnt_type;
QString mountDir = me->mnt_dir;
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 &currentText) {
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) );
path = path.right( path.length()-1);
if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
}
}
return baseFs;
}
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;
long mult = blkSize / 1024;
long div = 1024 / blkSize;
if ( !mult ) mult = 1;
if ( !div ) div = 1;
return QString::number(availBlks * mult / div);
}
return "";
}
void AdvancedFm::showFileMenu() {
QString curApp;
bool isLocalView = false;
if (TabWidget->currentPageIndex() == 0) {
isLocalView = TRUE;
curApp = Local_View->currentItem()->text(0);
} else {
curApp = Remote_View->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);
-
- m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
- if ( !QFileInfo(fi).isDir() ) {
-// m->insertSeparator();
-// m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
-// } else {
-
- if ( app )
- m->insertItem( app->pixmap(), tr( "Open in "
- + app->name() ), this, SLOT( runThis() ) );
- else if( QFileInfo(fi).isExecutable() )
- m->insertItem( Resource::loadPixmap( app->name()), tr( "Execute" ), this, SLOT( runThis() ) );
-
- m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
- }
+ MimeType mt( curApp );
- m->insertItem(tr("Actions"),n);
- if(isLocalView)
- n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
- else
- n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+ const AppLnk* app = mt.application();
- n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
+ QFile fi(curApp);
+
+ QPopupMenu *m = new QPopupMenu(0);
+ QPopupMenu *n = new QPopupMenu(0);
+ // QPopupMenu *o = new QPopupMenu(0);
+
+ m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
+
+ if ( QFileInfo(fi).isDir() ) {
+ m->insertSeparator();
+ m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
+ } 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( /*Resource::loadPixmap( app->name()),*/ 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 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( "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() ));
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();
m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
#if defined(QT_QWS_OPIE)
m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
#endif
m->setCheckable(TRUE);
if (!b)
m->setItemChecked(m->idAt(0),TRUE);
else
m->setItemChecked(m->idAt(0),FALSE);
if(Ir::supported())
m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
m->setFocus();
m->exec( QCursor::pos() );
sleep(1);
if(m) delete m;
}
void AdvancedFm::cancelMenuTimer() {
// qDebug("selectionChanged: cancel menu timer");
if( menuTimer.isActive() )
menuTimer.stop();
}
QString AdvancedFm::checkDiskSpace(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;
long mult = blkSize / 1024;
long div = 1024 / blkSize;
if ( !mult ) mult = 1;
if ( !div ) div = 1;
return QString::number(availBlks * mult / div);
}
return "";
}
void AdvancedFm::addToDocs() {
QStringList strListPaths = getPath();
if( strListPaths.count() > 0) {
QString curFile;
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);
qDebug(curFile);
DocLnk f;
// curFile.replace(QRegExp("\\..*"),"");
f.setName((*it));
f.setFile( curFile);
f.writeLink();
}
}
}
}