summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp245
-rw-r--r--noncore/apps/advancedfm/advancedfm.h16
2 files changed, 155 insertions, 106 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index f32031b..869a433 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -71,6 +71,7 @@ AdvancedFm::AdvancedFm( )
: QMainWindow( )
{
setCaption( tr( "AdvancedFm" ) );
+// menuTimer( this );
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 2);
@@ -144,8 +145,25 @@ AdvancedFm::AdvancedFm( )
viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
viewMenu->setCheckable(TRUE);
+
+ currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
+ currentPathCombo->setEditable(TRUE);
+ layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+ currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+
+ connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
+ this, SLOT( currentPathComboActivated( const QString & ) ) );
+
+ connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
+ this,SLOT(currentPathComboChanged()));
+
+ currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+
+ layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+
+
TabWidget = new QTabWidget( this, "TabWidget" );
- layout->addMultiCellWidget( TabWidget, 1, 1, 0, 7);
+ layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7);
tab = new QWidget( TabWidget, "tab" );
tabLayout = new QGridLayout( tab );
@@ -165,12 +183,15 @@ AdvancedFm::AdvancedFm( )
QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
+
+
tabLayout->addWidget( Local_View, 0, 0 );
connect( Local_View, SIGNAL( clicked( QListViewItem*)),
this,SLOT( localListClicked(QListViewItem *)) );
connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( localListPressed(int, QListViewItem *, const QPoint&, int)) );
+ connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
TabWidget->insertTab( tab, tr("1"));
@@ -195,6 +216,7 @@ 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 );
@@ -221,23 +243,12 @@ AdvancedFm::AdvancedFm( )
currentRemoteDir.setPath( QDir::currentDirPath());
b = TRUE;
- currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
- currentPathCombo->setEditable(TRUE);
- layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 7);
- currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-
- connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
- this, SLOT( currentPathComboActivated( const QString & ) ) );
-
- connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
- this,SLOT(currentPathComboChanged()));
-
- currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-
- layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 7);
filterStr="*";
b=FALSE;
+
+ connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+
populateLocalView();
populateRemoteView();
}
@@ -641,107 +652,29 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint
case 1:
break;
case 2:
- showLocalMenu(item);
- Local_View->clearSelection();
+ menuTimer.start( 500, TRUE );
break;
};
}
void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
{
+
switch (mouse) {
case 1:
break;
case 2:
- showRemoteMenu(item);
- Remote_View->clearSelection();
+ menuTimer.start( 500, TRUE );
break;
};
}
-void AdvancedFm::showLocalMenu(QListViewItem * item)
-{
- if(item) {
- QPopupMenu m;
- m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
- m.insertSeparator();
- if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
- m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
- else
- m.insertItem( tr( "Open / Execute" ), this, SLOT( runThis() ));
- m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
- m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
- m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
- m.insertSeparator();
- m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
- m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
- m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
- m.insertItem( tr( "Move" ), this, SLOT( move() ));
- m.insertSeparator();
- m.insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
- m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
- m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
- m.insertSeparator();
- m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
- m.insertSeparator();
- m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
- if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) //bad hack for Sharp zaurus failings
- m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
- 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.exec( QCursor::pos() );
- }
-}
-
-void AdvancedFm::showRemoteMenu(QListViewItem * item)
-{
- if(item) {
- QPopupMenu m;
- m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showRemoteHidden() ));
- m.insertSeparator();
- if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) !=-1)
- m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
- else
- m.insertItem( tr( "Open / Execute" ), this, SLOT( runThis() ));
- m.insertItem( tr( "Open as Text" ), this, SLOT( runText() ));
- m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
- m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
- m.insertSeparator();
- m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
- m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
- m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
- m.insertItem( tr( "Move" ), this, SLOT( move() ));
- m.insertSeparator();
- m.insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
- m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
- m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
- m.insertSeparator();
- m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
- m.insertSeparator();
- m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
- if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) //bad hack for Sharp zaurus failings
- m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
- 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.exec( QCursor::pos() );
- }
-}
-
void AdvancedFm::runThis() {
// QFileInfo *fi;
QString fs;
if (TabWidget->currentPageIndex() == 0) {
QString curFile = Local_View->currentItem()->text(0);
+ if(curFile != "../") {
fs= getFileSystemType((const QString &) currentDir.canonicalPath());
QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
@@ -763,9 +696,12 @@ QString fs;
nf.execute();
}
}
+ }
// MimeType mt( curFile);
} else {
QString curFile = Remote_View->currentItem()->text(0);
+ if(curFile != "../") {
+
fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
qDebug("Filesystemtype is "+fs);
QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
@@ -785,6 +721,7 @@ QString fs;
nf.execute();
}
}
+ }
// MimeType mt( curFile);
}
}
@@ -792,17 +729,21 @@ QString fs;
void AdvancedFm::runText() {
if (TabWidget->currentPageIndex() == 0) {
QString curFile = Local_View->currentItem()->text(0);
+ if(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;
DocLnk nf(curFile);
QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
e << curFile;
}
}
+}
void AdvancedFm::localMakDir()
{
@@ -831,6 +772,7 @@ void AdvancedFm::remoteMakDir()
void AdvancedFm::localDelete()
{
QStringList curFileList = getPath();
+ if(curFileList.count() > 0) {
QString myFile;
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
myFile = (*it);
@@ -875,10 +817,12 @@ void AdvancedFm::localDelete()
}
}
}
+}
void AdvancedFm::remoteDelete()
{
QStringList curFileList = getPath();
+ if( curFileList.count() > 0) {
QString myFile;
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -923,10 +867,13 @@ void AdvancedFm::remoteDelete()
}
}
}
+}
void AdvancedFm::localRename()
{
QString curFile = Local_View->currentItem()->text(0);
+ qDebug("currentItem "+curFile);
+ if( curFile !="../") {
InputDialog *fileDlg;
fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
fileDlg->setInputText((const QString &)curFile);
@@ -939,10 +886,12 @@ void AdvancedFm::localRename()
}
populateLocalView();
}
+}
void AdvancedFm::remoteRename()
{
- QString curFile = Local_View->currentItem()->text(0);
+ QString curFile = Remote_View->currentItem()->text(0);
+ if( curFile !="../") {
InputDialog *fileDlg;
fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
fileDlg->setInputText((const QString &)curFile);
@@ -955,6 +904,7 @@ void AdvancedFm::remoteRename()
}
populateRemoteView();
}
+}
void AdvancedFm::switchToLocalTab()
{
@@ -1055,15 +1005,12 @@ void AdvancedFm::filePerms() {
} else {
populateRemoteView();
}
-
-
}
void AdvancedFm::doProperties() {
QStringList curFileList = getPath();
QString filePath;
if (TabWidget->currentPageIndex() == 0) {
-
filePath = currentDir.canonicalPath()+"/";
} else {
filePath= currentRemoteDir.canonicalPath()+"/";
@@ -1184,6 +1131,7 @@ void AdvancedFm::upDir()
void AdvancedFm::copy()
{
QStringList curFileList = getPath();
+ if( curFileList.count() > 0) {
QString curFile;
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -1228,10 +1176,12 @@ void AdvancedFm::copy()
TabWidget->setCurrentPage(0);
}
}
+}
void AdvancedFm::copyAs()
{
QStringList curFileList = getPath();
+ if( curFileList.count() > 0) {
QString curFile;
InputDialog *fileDlg;
fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
@@ -1286,10 +1236,12 @@ void AdvancedFm::copyAs()
}
}
}
+}
void AdvancedFm::move() {
QStringList curFileList = getPath();
+ if( curFileList.count() > 0) {
QString curFile;
// qDebug(curFile);
QString destFile;
@@ -1342,6 +1294,7 @@ void AdvancedFm::move() {
populateRemoteView();
populateLocalView();
}
+ }
bool AdvancedFm::copyFile( const QString & dest, const QString & src )
{
@@ -1574,6 +1527,7 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
void AdvancedFm::mkSym() {
QString cmd;
QStringList curFileList = getPath();
+ if( curFileList.count() > 0) {
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -1604,6 +1558,7 @@ void AdvancedFm::mkSym() {
TabWidget->setCurrentPage(0);
}
}
+}
void AdvancedFm::QPEButtonPushed() {
QString current = QPEApplication::qpeDir();
@@ -1668,6 +1623,7 @@ void AdvancedFm::doBeam() {
} else {
QStringList curFileList = getPath();
+ if( curFileList.count() > 0) {
if (TabWidget->currentPageIndex() == 0) {
for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
@@ -1693,6 +1649,8 @@ void AdvancedFm::doBeam() {
}
}
+}
+
void AdvancedFm::fileBeamFinished( Ir *ir) {
QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
@@ -1708,3 +1666,88 @@ void AdvancedFm::fileBeamFinished( Ir *ir) {
// QFileInfo fi(localFile);
// }
// }
+
+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;
+ m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
+ m.insertSeparator();
+ if ( QFileInfo(fi).isDir() ) {
+ m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
+ } else {
+
+ if ( app )
+ m.insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( run() ) );
+ else if( QFileInfo(fi).isExecutable() )
+ m.insertItem( tr( "Execute" ), this, SLOT( run() ) );
+
+ m.insertItem( /*Resource::loadPixmap( "txt" ),*/ tr( "Open as text" ),this, SLOT( runText() ) );
+ }
+ m.insertSeparator();
+
+
+ if(isLocalView)
+ m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
+ else
+ m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+
+ m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
+ m.insertSeparator();
+
+ if(isLocalView)
+ m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+ else
+ m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+
+ m.insertItem( tr( "Copy" ), this, SLOT( copy() ));
+ m.insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
+ m.insertItem( tr( "Move" ), this, SLOT( move() ));
+ m.insertSeparator();
+
+ if(isLocalView)
+ m.insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
+ else
+ m.insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+
+ m.insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
+ m.insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
+ m.insertSeparator();
+
+ if(isLocalView)
+ m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
+ else
+ m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
+
+ m.insertSeparator();
+ m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
+ if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) //bad hack for Sharp zaurus failings
+ m.insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
+ 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.exec( QCursor::pos() );
+}
+
+
+void AdvancedFm::cancelMenuTimer()
+{
+qDebug("cancel menu timer");
+ if( menuTimer.isActive() )
+ menuTimer.stop();
+}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 5817fca..0cf94c6 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -12,14 +12,16 @@
#ifndef ADVANCEDFM_H
#define ADVANCEDFM_H
+#include <qpe/ir.h>
+
#include <qvariant.h>
#include <qdialog.h>
#include <qmainwindow.h>
+#include <qstringlist.h>
#include <qdir.h>
#include <qstring.h>
#include <qpoint.h>
-#include <qstringlist.h>
-#include <qpe/ir.h>
+#include <qtimer.h>
class QVBoxLayout;
class QHBoxLayout;
@@ -39,6 +41,7 @@ class QFile;
class QListViewItem;
class QLineEdit;
class QPushButton;
+class Ir;
class AdvancedFm : public QMainWindow
{
@@ -62,8 +65,6 @@ public:
QStringList fileSystemTypeList, fsList;
int currentServerConfig;
protected slots:
- void showLocalMenu( QListViewItem *);
- void showRemoteMenu( QListViewItem *);
void doLocalCd();
void doRemoteCd();
// void copy();
@@ -104,11 +105,14 @@ protected slots:
protected:
QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
QStringList remoteDirPathStringList, localDirPathStringList;
+
void keyReleaseEvent( QKeyEvent *);
QString getFileSystemType(const QString &);
void parsetab(const QString &fileName);
protected slots:
+ void showFileMenu();
+ void cancelMenuTimer();
void homeButtonPushed();
void docButtonPushed();
void SDButtonPushed();
@@ -125,7 +129,9 @@ protected slots:
void fileStatus();
void doAbout();
void doBeam();
- void fileBeamFinished( Ir *ir);
+ void fileBeamFinished( Ir *);
+private:
+ QTimer menuTimer;
};
#endif // ADVANCEDFM_H