1 files changed, 20 insertions, 18 deletions

diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 463b202..ddaa39a 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -95,17 +95,19 @@ void AdvancedFm::init() {
   fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
   fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
   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);
+  viewMenu->insertItem( tr( "Switch to View 1" ), this, SLOT( switchToLocalTab()));
+  viewMenu->insertItem( tr( "Switch to View 2" ), this, SLOT( switchToRemoteTab()));
+//     viewMenu->insertSeparator();
+//     viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
+  viewMenu->setCheckable(true);
+  viewMenu->setItemChecked( viewMenu->idAt(0), true);
+  viewMenu->setItemChecked( viewMenu->idAt(1), false);
 
   s_addBookmark = tr("Bookmark Directory");
   s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
 //    menuButton->insertItem("");
 
@@ -117,19 +119,20 @@ void AdvancedFm::init() {
 
   menuButton->setUseLabel(false);
   menuButton->setMaximumWidth( 20 );
   menuButton->insertItem( s_addBookmark);
   menuButton->insertItem( s_removeBookmark);
   menuButton->insertSeparator();
+  menuButton->setFocusPolicy(NoFocus);
 
   customDirsToMenu();
 
   currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" );
   currentPathCombo->setEditable(TRUE);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-
+  currentPathCombo->setFocusPolicy(NoFocus);  
   layout->addWidget( lineBox );
 
 
   TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
 //  TabWidget = new QTabWidget( this, "TabWidget" );
   layout->addWidget( TabWidget, 4 );
@@ -145,13 +148,15 @@ void AdvancedFm::init() {
   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);
-
+  Local_View->setFocusPolicy(StrongFocus);
+  Local_View->installEventFilter( this );
+ 
   QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
   tabLayout->addWidget( Local_View, 0, 0 );
 
   TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1"));
 //  TabWidget->insertTab( tab, tr("1"));
@@ -167,14 +172,15 @@ void AdvancedFm::init() {
   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);
-
-
+  Remote_View->setFocusPolicy(StrongFocus);
+  Remote_View->installEventFilter( this );
+ 
   QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
   tabLayout_2->addWidget( Remote_View, 0, 0 );
 
   TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
   TabWidget->setSizeChange( 370 );
@@ -200,22 +206,17 @@ void AdvancedFm::init() {
 
          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) {
+    if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
           zaurusDevice=TRUE;
-     } else {
+    else 
           zaurusDevice=FALSE;
-      }
-  }
+
 
   if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
      qDebug("not have sd");
      sdButton->hide();
   }
   if( !StorageInfo::hasCf() ) {
@@ -277,10 +278,11 @@ void AdvancedFm::initConnections()
           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( viewMenu, SIGNAL( activated(int )), this, SLOT(slotSwitchMenu(int )));
 //  connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
 
 }
+