summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp209
-rw-r--r--noncore/apps/advancedfm/advancedfm.h42
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp56
3 files changed, 264 insertions, 43 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9edf7c1..d8bdff7 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -17,4 +17,5 @@
// #include <opie/ofiledialog.h>
+#include <qpe/config.h>
#include <qpe/filemanager.h>
#include <qpe/qcopenvelope_qws.h>
@@ -28,5 +29,8 @@
#include <qpe/ir.h>
#include <qpe/resource.h>
+#include <qpe/menubutton.h>
+
+#include <qregexp.h>
#include <qtabwidget.h>
#include <qtextstream.h>
@@ -91,5 +95,5 @@ void AdvancedFm::cleanUp() {
void AdvancedFm::tabChanged(QWidget *w) {
- qDebug("tab changed %d",TabWidget->getCurrentTab());
+// qDebug("tab changed %d",TabWidget->getCurrentTab());
if ( w == tab) {
@@ -195,5 +199,5 @@ void AdvancedFm::populateLocalView() {
while ((mydirent = readdir(dir)) != NULL) {
lstat( mydirent->d_name, &buf);
- qDebug(mydirent->d_name);
+// qDebug(mydirent->d_name);
fileL.sprintf("%s", mydirent->d_name);
devT = buf.st_dev;
@@ -294,5 +298,5 @@ void AdvancedFm::populateRemoteView() {
while ((mydirent = readdir(dir)) != NULL) {
lstat( mydirent->d_name, &buf);
- qDebug(mydirent->d_name);
+// qDebug(mydirent->d_name);
fileL.sprintf("%s", mydirent->d_name);
fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
@@ -408,5 +412,5 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
if(renameBox != 0 )
{
- qDebug("cancel rename");
+// qDebug("cancel rename");
cancelRename();
}
@@ -416,5 +420,5 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
case 2:
menuTimer.start( 500, TRUE );
- qDebug("Start menu timer\n");
+// qDebug("Start menu timer\n");
break;
};
@@ -428,5 +432,5 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, in
if(renameBox != 0 )
{
- qDebug("cancel rename");
+// qDebug("cancel rename");
cancelRename();
}
@@ -435,5 +439,5 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, in
case 2:
menuTimer.start( 500, TRUE );
- qDebug("Start menu timer");
+// qDebug("Start menu timer");
break;
};
@@ -481,5 +485,5 @@ void AdvancedFm::currentPathComboChanged() {
void AdvancedFm::fillCombo(const QString &currentPath) {
- qDebug("%d",TabWidget->getCurrentTab());
+// qDebug("%d",TabWidget->getCurrentTab());
if (TabWidget->getCurrentTab() == 0) {
// if (TabWidget->currentPageIndex() == 0) {
@@ -524,5 +528,5 @@ QStringList AdvancedFm::getPath() {
if ( it.current()->isSelected() ) {
strList << it.current()->text(0);
- qDebug(it.current()->text(0));
+// qDebug(it.current()->text(0));
}
}
@@ -534,5 +538,5 @@ QStringList AdvancedFm::getPath() {
if ( it.current()->isSelected() ) {
strList << it.current()->text(0);
- qDebug(it.current()->text(0));
+// qDebug(it.current()->text(0));
}
}
@@ -876,5 +880,5 @@ void AdvancedFm::addToDocs() {
for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
curFile = currentDir.canonicalPath()+"/"+(*it);
- qDebug(curFile);
+// qDebug(curFile);
DocLnk f;
// curFile.replace(QRegExp("\\..*"),"");
@@ -886,5 +890,5 @@ void AdvancedFm::addToDocs() {
for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
- qDebug(curFile);
+// qDebug(curFile);
DocLnk f;
@@ -898,2 +902,183 @@ void AdvancedFm::addToDocs() {
}
+
+void AdvancedFm::customDirsToMenu()
+{
+
+ Config cfg("AdvancedFm");
+ cfg.setGroup("Menu");
+
+ QStringList list = cfg.readListEntry( "CustomDir", ',');
+ menuButton->insertItems(list );
+
+// for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+// {
+// customDirMenu->insertItem(*it );
+// }
+}
+
+void AdvancedFm::dirMenuSelected(int item)
+{
+ qDebug("menu item %d", item);
+ switch(item)
+ {
+
+ case -21:
+ case 0:
+ addCustomDir();
+ break;
+ case -22:
+ case 1:
+ removeCustomDir();
+ break;
+ default:
+ {
+// gotoCustomDir( menuButton->text(item));
+// gotoCustomDir( customDirMenu->text(item));
+ }
+ break;
+
+ };
+}
+
+void AdvancedFm::addCustomDir()
+{
+ Config cfg("AdvancedFm");
+ cfg.setGroup("Menu");
+ QString dir;
+ QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
+
+ if (TabWidget->getCurrentTab() == 0)
+ {
+ dir = currentDir.canonicalPath();
+ }
+ else
+ {
+ dir = currentRemoteDir.canonicalPath();
+ }
+
+ bool addIt=true;
+ for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ {
+ if( dir == (*it))
+ {
+ addIt=false;
+ }
+ }
+ if(addIt)
+ {
+ menuButton->insertItem(dir);
+// customDirMenu->insertItem(dir);
+ list << dir;
+ }
+
+ cfg.writeEntry("CustomDir", list, ',');
+ cfg.write();
+}
+
+void AdvancedFm::removeCustomDir()
+{
+// qDebug("remove custom dir");
+ Config cfg("AdvancedFm");
+ cfg.setGroup("Menu");
+ QString dir;
+ QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
+ QStringList list2;
+
+ if (TabWidget->getCurrentTab() == 0)
+ {
+ dir = currentDir.canonicalPath();
+ }
+ else
+ {
+ dir = currentRemoteDir.canonicalPath();
+ }
+ int ramble=2;
+// int ramble=-24;
+//first remove list
+ if(list.grep(dir,true).isEmpty())
+ {
+ QMessageBox::message("AdvancedFm",tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!"));
+ }
+ else
+ {
+ for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+ {
+ if((*it) != dir)//current item is not our current dir, so add it to temp list
+ {
+ list2 <<(*it);
+ }
+ else
+ {
+// customDirMenu->removeItem( ramble);
+ menuButton->remove( ramble);
+
+ }
+ ramble++;
+// ramble--;
+ }
+
+ cfg.writeEntry("CustomDir", list2, ',');
+ cfg.write();
+ }
+// customDirsToMenu();
+
+}
+
+void AdvancedFm::gotoCustomDir(const QString &dir)
+{
+// qDebug("gotoCustomDir(const QString &dir) " +dir );
+ QString curDir = dir;
+// if( curDir.isEmpty()) {
+// }
+ if( curDir == s_addBookmark)
+ {
+ addCustomDir();
+ }
+ if( curDir == s_removeBookmark)
+ {
+ removeCustomDir( );
+ }
+ else
+ {
+ if(QDir( curDir).exists() )
+ {
+ if (TabWidget->getCurrentTab() == 0)
+ {
+ currentDir.setPath( curDir );
+ chdir( curDir.latin1() );
+ currentDir.cd( curDir, TRUE);
+ populateLocalView();
+ }
+ else
+ {
+ currentRemoteDir.setPath( curDir );
+ chdir( curDir.latin1() );
+ currentRemoteDir.cd( curDir, TRUE);
+ populateRemoteView();
+ }
+ }
+ }
+// menuButton
+// qDebug("gotoCustomDir(const QString &dir) " +dir );
+// QString curDir = dir;
+// if(QDir( curDir).exists() )
+// {
+// if (TabWidget->getCurrentTab() == 0)
+// {
+// currentDir.setPath( curDir );
+// chdir( curDir.latin1() );
+// currentDir.cd( curDir, TRUE);
+// populateLocalView();
+// }
+// else
+// {
+// currentRemoteDir.setPath( curDir );
+// chdir( curDir.latin1() );
+// currentRemoteDir.cd( curDir, TRUE);
+// populateRemoteView();
+// }
+// }
+// menuButton->setLabel(" ");
+// menuButton
+}
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 42775ee..7478dcb 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -45,4 +45,5 @@ class QFile;
class QListViewItem;
class QLineEdit;
+class MenuButton;
//class QPushButton;
@@ -56,21 +57,4 @@ public:
AdvancedFm();
~AdvancedFm();
-
- OTabWidget *TabWidget;
-// QTabWidget *TabWidget;
- QWidget *tab, *tab_2, *tab_3;
- QListView *Local_View, *Remote_View;
-
- QLineEdit *currentPathEdit;
- QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu;
- QToolButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
-// QPushButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
- QDir currentDir, currentRemoteDir;
- QComboBox *currentPathCombo;
- QString filterStr;
- QListViewItem * item;
- bool b;
- QStringList fileSystemTypeList, fsList;
- int currentServerConfig;
protected slots:
void selectAll();
@@ -115,4 +99,21 @@ protected slots:
protected:
+
+ OTabWidget *TabWidget;
+// QTabWidget *TabWidget;
+ QWidget *tab, *tab_2, *tab_3;
+ QListView *Local_View, *Remote_View;
+
+ QLineEdit *currentPathEdit;
+ QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
+ QToolButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
+// QPushButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
+ QDir currentDir, currentRemoteDir;
+ QComboBox *currentPathCombo;
+ QString filterStr, s_addBookmark, s_removeBookmark;
+ QListViewItem * item;
+ bool b;
+ QStringList fileSystemTypeList, fsList;
+ int currentServerConfig;
bool zaurusDevice;
QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
@@ -130,4 +131,5 @@ protected:
protected slots:
+ void dirMenuSelected(int);
void showFileMenu();
void cancelMenuTimer();
@@ -152,4 +154,5 @@ protected slots:
private:
+ MenuButton *menuButton;
QString oldName;
QTimer menuTimer;
@@ -159,6 +162,11 @@ private:
void doRename(QListView *);
void okRename();
+ void customDirsToMenu();
+ void addCustomDir();
+ void removeCustomDir();
+
private slots:
void processEnded();
+ void gotoCustomDir(const QString &);
};
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 0966f02..bb80dc6 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -17,4 +17,6 @@
#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
+#include <qpe/menubutton.h>
+#include <qpe/config.h>
#include <qlayout.h>
@@ -44,4 +46,5 @@ void AdvancedFm::init() {
fileMenu = new QPopupMenu( this );
viewMenu = new QPopupMenu( this );
+// customDirMenu = new QPopupMenu( this );
layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
@@ -49,34 +52,40 @@ void AdvancedFm::init() {
menuBar->insertItem( tr( "File" ), fileMenu);
menuBar->insertItem( tr( "View" ), viewMenu);
+// menuBar->insertItem( tr( "^" ), customDirMenu);
+
+ cdUpButton = new QToolButton( this,"cdUpButton");
+ cdUpButton->setPixmap(Resource::loadPixmap("up"));
+ cdUpButton->setFixedSize( QSize( 20, 20 ) );
+ layout->addMultiCellWidget( cdUpButton , 0, 0, 2, 2);
+
+ menuButton = new MenuButton(this);
+ menuButton->setFixedSize( QSize( 20, 20 ) );
+ layout->addMultiCellWidget( menuButton , 0, 0, 3, 3);
qpeDirButton= new QToolButton(this,"QPEButton");
qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
- layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
+ layout->addMultiCellWidget( qpeDirButton , 0, 0, 4, 4);
cfButton = new QToolButton( this,"CFButton");
cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
cfButton ->setFixedSize( QSize( 20, 20 ) );
- layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
+ layout->addMultiCellWidget( cfButton , 0, 0, 5, 5);
sdButton = new QToolButton( this,"SDButton");
sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
sdButton->setFixedSize( QSize( 20, 20 ) );
- layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
+ layout->addMultiCellWidget( sdButton , 0, 0, 6, 6);
- cdUpButton = new QToolButton( this,"cdUpButton");
- cdUpButton->setPixmap(Resource::loadPixmap("up"));
- cdUpButton ->setFixedSize( QSize( 20, 20 ) );
- layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
docButton = new QToolButton( this,"docsButton");
docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
docButton->setFixedSize( QSize( 20, 20 ) );
- layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
+ layout->addMultiCellWidget( docButton, 0, 0, 7, 7);
homeButton = new QToolButton( this,"homeButton");
homeButton->setPixmap(Resource::loadPixmap("home"));
homeButton->setFixedSize( QSize( 20, 20 ) );
- layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
+ layout->addMultiCellWidget( homeButton, 0, 0, 8, 8);
fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() ));
@@ -100,18 +109,32 @@ void AdvancedFm::init() {
viewMenu->setCheckable(TRUE);
+ s_addBookmark = tr("Bookmark Directory");
+ s_removeBookmark = tr("Remove Current Directory from Bookmarks");
+
+ menuButton->setUseLabel(false);
+ menuButton->insertItem( s_addBookmark);
+ menuButton->insertItem( s_removeBookmark);
+ menuButton->insertSeparator();
+// menuButton->insertItem("");
+
+// customDirMenu->insertItem(tr("Add This Directory"));
+// customDirMenu->insertItem(tr("Remove This Directory"));
+// customDirMenu->insertSeparator();
+
+ customDirsToMenu();
currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
currentPathCombo->setEditable(TRUE);
- layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+ layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
- layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+ layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab);
// TabWidget = new QTabWidget( this, "TabWidget" );
- layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7);
+ layout->addMultiCellWidget( TabWidget, 2, 2, 0, 8);
tab = new QWidget( TabWidget, "tab" );
@@ -215,5 +238,5 @@ void AdvancedFm::initConnections() {
connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
- connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+ connect( homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
this, SLOT( currentPathComboActivated( const QString & ) ) );
@@ -234,8 +257,13 @@ void AdvancedFm::initConnections() {
this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
- connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
+ connect( TabWidget,SIGNAL(currentChanged(QWidget *)),
this,SLOT(tabChanged(QWidget*)));
connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+ connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&)));
+// connect( menuButton, SIGNAL( selected( int)), SLOT( dirMenuSelected(int)));
+
+// connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
+
}