start changing things around

4 files changed, 272 insertions, 257 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index c054465..8f49a53 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -21,5 +21,4 @@
 //  #include <opie/ofiledialog.h>
 
-
 #include <qpe/lnkproperties.h>
 #include <qpe/filemanager.h>
@@ -28,5 +27,4 @@
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
@@ -34,11 +32,12 @@
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
+#include <qpe/resource.h>
 
 //#include <opie/ofileselector.h>
 #include <qmultilineedit.h>
 
+#include <qtabwidget.h>
 #include <qtextstream.h>
 #include <qpushbutton.h>
-#include <qtoolbutton.h>
 #include <qdatetime.h>
 #include <qdir.h>
@@ -52,5 +51,4 @@
 #include <qprogressbar.h>
 #include <qspinbox.h>
-#include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
@@ -76,202 +74,6 @@
 
 AdvancedFm::AdvancedFm( )
-  : QMainWindow( )
-{
-  setCaption( tr( "AdvancedFm" ) );
-
-  QGridLayout *layout = new QGridLayout( this );
-  layout->setSpacing( 2);
-  layout->setMargin( 2);
-
-  connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
-
-  QPEMenuBar *menuBar = new QPEMenuBar(this);
-  fileMenu = new QPopupMenu( this );
-  viewMenu  = new QPopupMenu( this );
-
-  layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
-
-  menuBar->insertItem( tr( "File" ), fileMenu);
-  menuBar->insertItem( tr( "View" ), viewMenu);
-
-  qpeDirButton= new QToolButton(this,"QPEButton");
-  qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
-  qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
-  connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
-  layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
-
-  cfButton = new QToolButton( this,"CFButton");
-  cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
-  cfButton ->setFixedSize( QSize( 20, 20 ) );
-  connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
-  layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
-
-  sdButton = new QToolButton( this,"SDButton");
-  sdButton->setPixmap(Resource::loadPixmap("sdmon/sdcard"));
-  sdButton->setFixedSize( QSize( 20, 20 ) );
-  connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
-  layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
-
-  cdUpButton = new QToolButton( this,"cdUpButton");
-  cdUpButton->setPixmap(Resource::loadPixmap("up"));
-  cdUpButton ->setFixedSize( QSize( 20, 20 ) );
-  connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
-  layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
-
-  docButton = new QToolButton( this,"docsButton");
-  docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
-  docButton->setFixedSize( QSize( 20, 20 ) );
-  connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
-  layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
-
-  homeButton = new QToolButton( this,"homeButton");
-  homeButton->setPixmap(Resource::loadPixmap("home"));
-  homeButton->setFixedSize( QSize( 20, 20 ) );
-  connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
-  layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
-
-  fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
-  fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
-  fileMenu->insertSeparator();
-  fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
-  fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
-  fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
-  fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
-  fileMenu->insertSeparator();
-  fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
-  fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
-  fileMenu->setCheckable(TRUE);
-
-  viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
-  viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
-  viewMenu->insertSeparator();
-  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, 2, 2, 0, 7);
-
-  tab = new QWidget( TabWidget, "tab" );
-  tabLayout = new QGridLayout( tab );
-  tabLayout->setSpacing( 2);
-  tabLayout->setMargin( 2);
-
-  Local_View = new QListView( tab, "Local_View" );
-  Local_View->addColumn( tr("File"),130);
-  Local_View->addColumn( tr("Size"),-1);
-  Local_View->setColumnAlignment(1,QListView::AlignRight);
-  Local_View->addColumn( tr("Date"),-1);
-  Local_View->setColumnAlignment(2,QListView::AlignRight);
-  Local_View->setAllColumnsShowFocus(TRUE);
-  Local_View->setMultiSelection( TRUE );
-  Local_View->setSelectionMode(QListView::Extended);
-
-  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"));
-
-  tab_2 = new QWidget( TabWidget, "tab_2" );
-  tabLayout_2 = new QGridLayout( tab_2 );
-  tabLayout_2->setSpacing( 2);
-  tabLayout_2->setMargin( 2);
-
-  Remote_View = new QListView( tab_2, "Remote_View" );
-  Remote_View->addColumn( tr("File"),130);
-  Remote_View->addColumn( tr("Size"),-1);
-  Remote_View->setColumnAlignment(1,QListView::AlignRight);
-  Remote_View->addColumn( tr("Date"),-1);
-  Remote_View->setColumnAlignment(2,QListView::AlignRight);
-  Remote_View->setAllColumnsShowFocus(TRUE);
-  Remote_View->setMultiSelection( TRUE );
-  Remote_View->setSelectionMode(QListView::Extended);
-
-
-  QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
-
-  connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
-           this,SLOT( remoteListClicked(QListViewItem *)) );
-  connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-           this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
-
-  tabLayout_2->addWidget( Remote_View, 0, 0 );
-
-
-  TabWidget->insertTab( tab_2, tr( "2"));
-
-  connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
-          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);
-
-
-         //     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,"/");
-
-         QListView *fileTree;
-         fileTree = new QListView( tab_3, "tree" );
-
-      
-         tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
-
-         TabWidget->insertTab( tab_3, tr( "Remote" ) );
-  */
-         
-  ///////////////
-
-  struct utsname name; /* check for embedix kernel running on the zaurus*/
-  if (uname(&name) != -1) {
-      QString release=name.release;
-      if(release.find("embedix",0,TRUE) !=-1) {
-          zaurusDevice=TRUE;
-     } else {
-          zaurusDevice=FALSE;
-          sdButton->hide();
-      }
-  }
-  
-  currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-  currentDir.setPath( QDir::currentDirPath());
-
-  currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-  currentRemoteDir.setPath( QDir::currentDirPath());
-
-  b = TRUE;
-
-  filterStr="*";
-  b=FALSE;
-
-  connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+  : QMainWindow( ) {
+    init();
     
   populateLocalView();
@@ -280,10 +82,8 @@ AdvancedFm::AdvancedFm( )
 }
 
-AdvancedFm::~AdvancedFm()
-{
+AdvancedFm::~AdvancedFm() {
 }
 
-void AdvancedFm::cleanUp()
-{
+void AdvancedFm::cleanUp() {
   QString sfile=QDir::homeDirPath();
   if(sfile.right(1) != "/")
@@ -296,6 +96,5 @@ void AdvancedFm::cleanUp()
 }
 
-void AdvancedFm::tabChanged(QWidget *)
-{
+void AdvancedFm::tabChanged(QWidget *) {
   if (TabWidget->currentPageIndex() == 0) {
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
@@ -316,6 +115,5 @@ void AdvancedFm::tabChanged(QWidget *)
 
 
-void AdvancedFm::populateLocalView()
-{
+void AdvancedFm::populateLocalView() {
   QPixmap pm;
   Local_View->clear();
@@ -413,6 +211,5 @@ void AdvancedFm::populateLocalView()
 
 
-void AdvancedFm::populateRemoteView()
-{
+void AdvancedFm::populateRemoteView() {
   QPixmap pm;
   Remote_View->clear();
@@ -510,6 +307,5 @@ void AdvancedFm::populateRemoteView()
 }
 
-void AdvancedFm::localListClicked(QListViewItem *selectedItem)
-{
+void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
   if(selectedItem) {
     QString strItem=selectedItem->text(0);
@@ -551,6 +347,6 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem)
 }
 
-void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
-{
+void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) {
+    
   if(selectedItem) {
     QString strItem=selectedItem->text(0);
@@ -592,16 +388,13 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
 }
 
-void AdvancedFm::doLocalCd()
-{
+void AdvancedFm::doLocalCd() {
   localListClicked( Local_View->currentItem());
 }
 
-void AdvancedFm::doRemoteCd()
-{
+void AdvancedFm::doRemoteCd() {
   localListClicked( Remote_View->currentItem());
 }
 
-void AdvancedFm::showHidden()
-{
+void AdvancedFm::showHidden() {
   if (b) {
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
@@ -618,6 +411,5 @@ void AdvancedFm::showHidden()
 }
 
-void AdvancedFm::showRemoteHidden()
-{
+void AdvancedFm::showRemoteHidden() {
   if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
@@ -631,6 +423,5 @@ void AdvancedFm::showRemoteHidden()
 }
 
-void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int )
-{
+void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
   qDebug("list pressed");
   switch (mouse) {
@@ -644,6 +435,5 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , i
 }
 
-void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int )
-{
+void AdvancedFm::remoteListPressed( int mouse, QListViewItem*, const QPoint&, int ) {
 
   switch (mouse) {
@@ -729,6 +519,5 @@ void AdvancedFm::runText() {
 }
 
-void AdvancedFm::localMakDir()
-{
+void AdvancedFm::localMakDir() {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
@@ -741,6 +530,5 @@ void AdvancedFm::localMakDir()
 }
 
-void AdvancedFm::remoteMakDir()
-{
+void AdvancedFm::remoteMakDir() {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
@@ -753,6 +541,5 @@ void AdvancedFm::remoteMakDir()
 }
 
-void AdvancedFm::localDelete()
-{
+void AdvancedFm::localDelete() {
   QStringList curFileList = getPath();
   if(curFileList.count() > 0) {
@@ -803,6 +590,5 @@ void AdvancedFm::localDelete()
 }
 
-void AdvancedFm::remoteDelete()
-{
+void AdvancedFm::remoteDelete() {
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
@@ -853,6 +639,5 @@ void AdvancedFm::remoteDelete()
 }
 
-void AdvancedFm::localRename()
-{
+void AdvancedFm::localRename() {
   QString curFile = Local_View->currentItem()->text(0);
   qDebug("currentItem "+curFile);
@@ -890,28 +675,23 @@ void AdvancedFm::remoteRename()
 }
 
-void AdvancedFm::switchToLocalTab()
-{
+void AdvancedFm::switchToLocalTab() {
   TabWidget->setCurrentPage(0);
   Local_View->setFocus();
 }
 
-void AdvancedFm::switchToRemoteTab()
-{
+void AdvancedFm::switchToRemoteTab() {
   TabWidget->setCurrentPage(1);
   Remote_View->setFocus();
 }
 
-void AdvancedFm::readConfig()
-{
+void AdvancedFm::readConfig() {
   Config cfg("AdvancedFm");
 }
 
-void AdvancedFm::writeConfig()
-{
+void AdvancedFm::writeConfig() {
   Config cfg("AdvancedFm");
 }
 
-void  AdvancedFm::currentPathComboChanged()
-{
+void  AdvancedFm::currentPathComboChanged() {
   if (TabWidget->currentPageIndex() == 0) {
     if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
@@ -1095,6 +875,5 @@ void AdvancedFm::CFButtonPushed() {
 
 
-void AdvancedFm::upDir()
-{
+void AdvancedFm::upDir() {
   if (TabWidget->currentPageIndex() == 0) {
     QString current = currentDir.canonicalPath();
@@ -1118,6 +897,5 @@ void AdvancedFm::upDir()
 }
 
-void AdvancedFm::copy()
-{
+void AdvancedFm::copy() {
   qApp->processEvents();
   QStringList curFileList = getPath();
@@ -1596,6 +1374,5 @@ void AdvancedFm::doAbout() {
 }
 
-void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
-{
+void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
   if( TabWidget->hasFocus()) 
     switch ( e->key() ) {
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 53dad50..b2705b8 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -1,4 +1,4 @@
 /***************************************************************************
-   opieftp.h
+   advancedfm.h
                              -------------------
 ** Created: Sat Mar 9 23:33:09 2002
@@ -111,10 +111,12 @@ protected:
   QStringList remoteDirPathStringList, localDirPathStringList;
 
+  void init();
+  void initConnections();
   void keyReleaseEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
   QString getDiskSpace(const QString &);
-
   void parsetab(const QString &fileName);
 QString checkDiskSpace(const QString &);  
+  
 protected slots:
   void showFileMenu();
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 0f0f770..9629f0e 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -2,5 +2,5 @@ TEMPLATE  = app
 CONFIG    += qt warn_on release
 HEADERS   = advancedfm.h inputDialog.h filePermissions.h output.h
-SOURCES   = advancedfm.cpp inputDialog.cpp filePermissions.cpp output.cpp main.cpp
+SOURCES   = advancedfm.cpp advancedfmData.cpp inputDialog.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 REQUIRES=medium-config
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
new file mode 100644
index 0000000..a4f4d59
--- a/dev/null
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -0,0 +1,236 @@
+/***************************************************************************
+   advancedfmData.cpp
+                             -------------------
+** Created: Mon 09-23-2002 13:24:11
+    copyright            : (C) 2002 by ljp
+    email                : ljp@llornkcor.com
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+#include "advancedfm.h"
+
+#include <qpe/qpeapplication.h>
+#include <qpe/qpemenubar.h>
+#include <qpe/qpetoolbar.h>
+#include <qpe/resource.h>
+
+#include <qlayout.h>
+#include <qpixmap.h>
+#include <qcombobox.h>
+#include <qpopupmenu.h>
+#include <qtabwidget.h>
+#include <qtoolbutton.h>
+#include <qtabwidget.h>
+#include <qlineedit.h>
+#include <qlistview.h>
+
+#include <sys/utsname.h>
+
+
+void AdvancedFm::init() {
+    
+  setCaption( tr( "AdvancedFm" ) );
+
+  QGridLayout *layout = new QGridLayout( this );
+  layout->setSpacing( 2);
+  layout->setMargin( 2);
+
+
+  QPEMenuBar *menuBar = new QPEMenuBar(this);
+  fileMenu = new QPopupMenu( this );
+  viewMenu  = new QPopupMenu( this );
+
+  layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
+
+  menuBar->insertItem( tr( "File" ), fileMenu);
+  menuBar->insertItem( tr( "View" ), viewMenu);
+
+  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);
+
+  cfButton = new QToolButton( this,"CFButton");
+  cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
+  cfButton ->setFixedSize( QSize( 20, 20 ) );
+  layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
+
+  sdButton = new QToolButton( this,"SDButton");
+  sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
+  sdButton->setFixedSize( QSize( 20, 20 ) );
+  layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
+
+  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);
+
+  homeButton = new QToolButton( this,"homeButton");
+  homeButton->setPixmap(Resource::loadPixmap("home"));
+  homeButton->setFixedSize( QSize( 20, 20 ) );
+  layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
+
+  fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
+  fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
+  fileMenu->insertSeparator();
+  fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
+  fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
+  fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
+  fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
+  fileMenu->insertSeparator();
+  fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
+  fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
+  fileMenu->setCheckable(TRUE);
+
+  viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
+  viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
+  viewMenu->insertSeparator();
+  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());
+
+  currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+
+  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+
+
+  TabWidget = new QTabWidget( this, "TabWidget" );
+  layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7);
+
+  tab = new QWidget( TabWidget, "tab" );
+  tabLayout = new QGridLayout( tab );
+  tabLayout->setSpacing( 2);
+  tabLayout->setMargin( 2);
+
+  Local_View = new QListView( tab, "Local_View" );
+  Local_View->addColumn( tr("File"),130);
+  Local_View->addColumn( tr("Size"),-1);
+  Local_View->setColumnAlignment(1,QListView::AlignRight);
+  Local_View->addColumn( tr("Date"),-1);
+  Local_View->setColumnAlignment(2,QListView::AlignRight);
+  Local_View->setAllColumnsShowFocus(TRUE);
+  Local_View->setMultiSelection( TRUE );
+  Local_View->setSelectionMode(QListView::Extended);
+
+  QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
+
+  tabLayout->addWidget( Local_View, 0, 0 );
+
+  TabWidget->insertTab( tab, tr("1"));
+
+  tab_2 = new QWidget( TabWidget, "tab_2" );
+  tabLayout_2 = new QGridLayout( tab_2 );
+  tabLayout_2->setSpacing( 2);
+  tabLayout_2->setMargin( 2);
+
+  Remote_View = new QListView( tab_2, "Remote_View" );
+  Remote_View->addColumn( tr("File"),130);
+  Remote_View->addColumn( tr("Size"),-1);
+  Remote_View->setColumnAlignment(1,QListView::AlignRight);
+  Remote_View->addColumn( tr("Date"),-1);
+  Remote_View->setColumnAlignment(2,QListView::AlignRight);
+  Remote_View->setAllColumnsShowFocus(TRUE);
+  Remote_View->setMultiSelection( TRUE );
+  Remote_View->setSelectionMode(QListView::Extended);
+
+
+  QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
+
+  tabLayout_2->addWidget( Remote_View, 0, 0 );
+
+
+  TabWidget->insertTab( tab_2, tr( "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,"/");
+
+         QListView *fileTree;
+         fileTree = new QListView( tab_3, "tree" );
+
+      
+         tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
+
+         TabWidget->insertTab( tab_3, tr( "Remote" ) );
+  */
+         
+  ///////////////
+
+  struct utsname name; /* check for embedix kernel running on the zaurus*/
+  if (uname(&name) != -1) {
+      QString release=name.release;
+      if(release.find("embedix",0,TRUE) !=-1) {
+          zaurusDevice=TRUE;
+     } else {
+          zaurusDevice=FALSE;
+          sdButton->hide();
+      }
+  }
+  
+  currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+  currentDir.setPath( QDir::currentDirPath());
+
+  currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+  currentRemoteDir.setPath( QDir::currentDirPath());
+
+  b = TRUE;
+
+  filterStr="*";
+  b=FALSE;
+
+
+    
+}
+
+void AdvancedFm::initConnections() {
+  connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
+  connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
+  connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
+  connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
+  connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
+  connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
+  connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+  connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
+           this, SLOT(  currentPathComboActivated( const QString & ) ) );
+
+  connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
+           this,SLOT(currentPathComboChanged()));
+
+  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() ) );
+
+  connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
+           this,SLOT( remoteListClicked(QListViewItem *)) );
+  connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+           this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
+
+  connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
+          this,SLOT(tabChanged(QWidget*)));
+
+  connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+
+}