summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp137
-rw-r--r--noncore/apps/advancedfm/advancedfm.pro2
2 files changed, 84 insertions, 55 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a000e9b..ebd7fc3 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -18,4 +18,8 @@
#include "output.h"
+#include <opie/ofileselector.h>
+#include <opie/ofiledialog.h>
+
+
#include <qpe/lnkproperties.h>
#include <qpe/filemanager.h>
@@ -90,5 +94,5 @@ AdvancedFm::AdvancedFm( )
menuBar->insertItem( tr( "View" ), viewMenu);
- qpeDirButton= new QPushButton(Resource::loadIconSet("go"),"",this,"QPEButton");
+ qpeDirButton= new QPushButton(Resource::loadIconSet("launcher/opielogo16x16"),"",this,"QPEButton");
qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
@@ -192,4 +196,5 @@ AdvancedFm::AdvancedFm( )
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() ) );
@@ -217,5 +222,5 @@ AdvancedFm::AdvancedFm( )
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() ) );
+// connect( Remote_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
tabLayout_2->addWidget( Remote_View, 0, 0 );
@@ -226,15 +231,28 @@ AdvancedFm::AdvancedFm( )
this,SLOT(tabChanged(QWidget*)));
-// tab_3 = new QWidget( TabWidget, "tab_3" );
-// tabLayout_3 = new QGridLayout( tab_3 );
-// tabLayout_3->setSpacing( 2);
-// tabLayout_3->setMargin( 2);
+ tab_3 = new QWidget( TabWidget, "tab_3" );
+ tabLayout_3 = new QGridLayout( tab_3 );
+ tabLayout_3->setSpacing( 2);
+ tabLayout_3->setMargin( 2);
+
+
+// OFileDialog fileDialog;
+// fileDialog;
+// fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy
+// fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow");
+// OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/");
-// OFileSelector *fileSelector;
-// fileSelector = new OFileSelector(tab_3,0,0,"/","","*");
-// tabLayout_3->addMultiCellWidget( fileSelector, 0, 0, 0, 3 );
+QListView *fileTree;
+ fileTree = new QListView( tab_3, "tree" );
-// TabWidget->insertTab( tab_3, tr( "Files" ) );
+
+ tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
+ TabWidget->insertTab( tab_3, tr( "Remote" ) );
+///////////////
+
+////////////////////
+
+
currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
currentDir.setPath( QDir::currentDirPath());
@@ -252,4 +270,5 @@ AdvancedFm::AdvancedFm( )
populateLocalView();
populateRemoteView();
+ currentPathCombo->setFocus();
}
@@ -548,7 +567,7 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem)
strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
if( QFile::exists(strItem ) ) {
- qDebug("clicked item "+strItem);
- DocLnk doc( strItem, FALSE );
- doc.execute();
+// qDebug("clicked item "+strItem);
+// DocLnk doc( strItem, FALSE );
+// doc.execute();
// Local_View->clearSelection();
}
@@ -589,7 +608,7 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
if( QFile::exists(strItem ) ) {
- qDebug("clicked item "+strItem);
- DocLnk doc( strItem, FALSE );
- doc.execute();
+// qDebug("clicked item "+strItem);
+// DocLnk doc( strItem, FALSE );
+// doc.execute();
// Remote_View->clearSelection();
}
@@ -649,9 +668,11 @@ void AdvancedFm::showRemoteHidden()
void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
{
- switch (mouse) {
+qDebug("list pressed");
+ switch (mouse) {
case 1:
break;
case 2:
- menuTimer.start( 500, TRUE );
+ menuTimer.start( 750, TRUE );
+ qDebug("Start menu timer\n");
break;
};
@@ -661,9 +682,10 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint
{
- switch (mouse) {
+ switch (mouse) {
case 1:
break;
case 2:
- menuTimer.start( 500, TRUE );
+ menuTimer.start( 750, TRUE );
+ qDebug("Start menu timer");
break;
};
@@ -1462,4 +1484,5 @@ void AdvancedFm::doAbout() {
void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
{
+ if( TabWidget->hasFocus())
switch ( e->key() ) {
case Key_Delete:
@@ -1669,4 +1692,5 @@ void AdvancedFm::fileBeamFinished( Ir *ir) {
void AdvancedFm::showFileMenu() {
+
QString curApp;
bool isLocalView = false;
@@ -1682,65 +1706,69 @@ void AdvancedFm::showFileMenu() {
QFile fi(curApp);
- QPopupMenu m;
- m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
- m.insertSeparator();
+// QPopupMenu m;
+ QPopupMenu *m = new QPopupMenu(0);
+
+ m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
+ m->insertSeparator();
if ( QFileInfo(fi).isDir() ) {
- m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
+ m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
} else {
if ( app )
- m.insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( runThis() ) );
+ m->insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( runThis() ) );
else if( QFileInfo(fi).isExecutable() )
- m.insertItem( tr( "Execute" ), this, SLOT( runThis() ) );
+ m->insertItem( tr( "Execute" ), this, SLOT( runThis() ) );
- m.insertItem( /*Resource::loadPixmap( "txt" ),*/ tr( "Open as text" ),this, SLOT( runText() ) );
+ m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
}
- m.insertSeparator();
+ m->insertSeparator();
if(isLocalView)
- m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
+ m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
else
- m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+ m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
- m.insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
- m.insertSeparator();
+ m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
+ m->insertSeparator();
if(isLocalView)
- m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+ m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
else
- m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+ 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( "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() ));
+ m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
else
- m.insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+ 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( "Run Command" ), this, SLOT( runCommand() ));
+ m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
+ m->insertSeparator();
if(isLocalView)
- m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
+ m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
else
- m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
+ m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
- m.insertSeparator();
- m.insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
+ 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);
+ m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
+ m->setCheckable(TRUE);
if (!b)
- m.setItemChecked(m.idAt(0),TRUE);
+ m->setItemChecked(m->idAt(0),TRUE);
else
- m.setItemChecked(m.idAt(0),FALSE);
+ m->setItemChecked(m->idAt(0),FALSE);
if(Ir::supported())
- m.insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
- m.exec( QCursor::pos() );
+ m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
+ m->setFocus();
+ m->exec( QCursor::pos() );
+ if(m) delete m;
}
@@ -1748,5 +1776,6 @@ void AdvancedFm::showFileMenu() {
void AdvancedFm::cancelMenuTimer()
{
-qDebug("cancel menu timer");
+
+ qDebug("selectionChanged: cancel menu timer");
if( menuTimer.isActive() )
menuTimer.stop();
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 25fb782..299f870 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -8,4 +8,4 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
DESTDIR = $(OPIEDIR)/bin
-LIBS += -lqpe
+LIBS += -lqpe -lopie