fixed menu items

2 files changed, 34 insertions, 7 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 1083f23..4289fcf 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -113,23 +113,24 @@ AdvancedFm::AdvancedFm( )
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
     homeButton->setFlat(TRUE);
     layout->addMultiCellWidget( homeButton, 0, 0, 6, 6);
 //     fileMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
 //     fileMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
 //     fileMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
+        fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
     fileMenu->insertSeparator();
-    fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
-    fileMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+    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( "Delete" ), this, SLOT( localDelete() ));
+    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);
 
@@ -196,23 +197,24 @@ AdvancedFm::AdvancedFm( )
 //      tabLayout_3->setMargin( 2);
 
 //     OFileSelector *fileSelector;
 //     fileSelector = new OFileSelector(tab_3,0,0,"/","","*");
 //     tabLayout_3->addMultiCellWidget( fileSelector, 0, 0, 0, 3 );
     
 //     TabWidget->insertTab( tab_3, tr( "Files" ) );
 
-    currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+    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.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentRemoteDir.setPath( QDir::currentDirPath());
 
-    currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
+b = TRUE;
+ currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
     currentPathCombo->setEditable(TRUE);
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 6);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
@@ -1257,14 +1259,37 @@ void AdvancedFm::fileStatus() {
             outDlg->OutputEdit->append(line);
             outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                   
         }
               
     }
 }
 
+void AdvancedFm::mkDir() {
+    if (TabWidget->currentPageIndex() == 0) 
+        localMakDir();
+    else
+        remoteMakDir();
+        
+}
+
+void AdvancedFm::rn() {
+    if (TabWidget->currentPageIndex() == 0)
+        localRename();
+    else
+        remoteRename();
+
+}
+
+void AdvancedFm::del() {
+    if (TabWidget->currentPageIndex() == 0)
+        localDelete();
+    else
+        remoteDelete();
+}
+
 void AdvancedFm::doAbout() {
     QMessageBox::message("AdvancedFm","Advanced FileManager\n"
                          "is copyright 2002 by\n"
                          "L.J.Potter<llornkcor@handhelds.org>\n"
                          "and is licensed by the GPL");
 }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 30ff28c..a5f26a7 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -59,17 +59,19 @@ public:
     bool b;
     int currentServerConfig;
 protected slots:
     void showLocalMenu( QListViewItem *);
     void showRemoteMenu( QListViewItem *);
     void doLocalCd();
     void doRemoteCd();
 //    void copy();
-
+    void mkDir();
+    void del();
+    void rn();
     void populateLocalView();
     void populateRemoteView();
     void showHidden();
     void showRemoteHidden();
     void writeConfig();
     void readConfig();
     void localListClicked(QListViewItem *);
     void remoteListClicked(QListViewItem *);