1 files changed, 23 insertions, 13 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 6a3a64d..118275b 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -61,64 +61,65 @@ static int log_progress(netbuf *ctl, int xfered, void *arg)
 
 OpieFtp::OpieFtp( )
         : QMainWindow( )
 {
     setCaption( tr( "OpieFtp" ) );
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
 
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
     remoteMenu  = new QPopupMenu( this );
-  tabMenu = new QPopupMenu( this );
+    tabMenu = new QPopupMenu( this );
 
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 );
 
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
     menuBar->insertItem( tr( "Local" ), localMenu);
     menuBar->insertItem( tr( "Remote" ), remoteMenu);
     menuBar->insertItem( tr( "View" ), tabMenu);
 
-  connectionMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
+    connectionMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
     connectionMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
     connectionMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     localMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
     localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
     localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
 
     remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
     remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
     remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
     remoteMenu->insertSeparator();
     remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
     tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
     tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
     tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
+    tabMenu->setCheckable(TRUE);
 
-  TabWidget = new QTabWidget( this, "TabWidget" );
+    TabWidget = new QTabWidget( this, "TabWidget" );
     layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
 
     TabWidget->setTabShape(QTabWidget::Triangular);
 
     tab = new QWidget( TabWidget, "tab" );
     tabLayout = new QGridLayout( tab );
     tabLayout->setSpacing( 2);
     tabLayout->setMargin( 2);
 
     Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
     Local_View->addColumn( "File",120);
     Local_View->addColumn( "Size",-1);
     Local_View->setColumnAlignment(1,QListView::AlignRight);
     Local_View->addColumn( "Date",-1);
     Local_View->setColumnAlignment(2,QListView::AlignRight);
@@ -135,40 +136,40 @@ OpieFtp::OpieFtp( )
     TabWidget->insertTab( tab, tr( "Local" ) );
 
     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( "File",120);
     Remote_View->addColumn( "Size",-1);
     Remote_View->setColumnAlignment(1,QListView::AlignRight);
     Remote_View->addColumn( "Date",-1);
     Remote_View->setColumnAlignment(2,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
-  connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
+    connect( Remote_View, SIGNAL( doubleClicked( 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( "Remote" ) );
+    TabWidget->insertTab( tab_2, tr( "Remote" ) );
 
     tab_3 = new QWidget( TabWidget, "tab_3" );
     tabLayout_3 = new QGridLayout( tab_3 );
     tabLayout_3->setSpacing( 2);
     tabLayout_3->setMargin( 2);
 
     TextLabel1 = new QLabel( tab_3, "TextLabel1" );
     TextLabel1->setText( tr( "Username" ) );
     tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
 
     UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" );
     UsernameComboBox->setEditable(TRUE);
 //    UsernameComboBox->lineEdit()->setText("anonymous");
     UsernameComboBox->lineEdit()->setText("root");
 //    UsernameComboBox->lineEdit()->setText("llornkcor");
     tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 );
@@ -192,92 +193,101 @@ OpieFtp::OpieFtp( )
     ServerComboBox->lineEdit()->setText( tr( "" ) );
     tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 );
 //    ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
     ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) );
 
     QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" );
     TextLabel5->setText( tr( "Remote path" ) );
     tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 );
 
     remotePath = new QLineEdit( "/", tab_3, "remotePath" );
     remotePath->setText( currentRemoteDir = "/");
     tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
 //    remotePath->setText( currentRemoteDir = "/home/llornkcor/");
 
     TextLabel4 = new QLabel( tab_3, "TextLabel4" );
     TextLabel4->setText( tr( "Port" ) );
-  tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
+    tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
 
-  PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
+    PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
     PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
     PortSpinBox->setMaxValue(32786);
     PortSpinBox->setValue( 4242);
 //    PortSpinBox->setValue( 21);
-  tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
+    tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
 
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_3->addItem( spacer, 5, 0 );
 
-  TabWidget->insertTab( tab_3, tr( "Config" ) );
+    TabWidget->insertTab( tab_3, tr( "Config" ) );
 
     connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
             this,SLOT(tabChanged(QWidget*)));
 
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 //      currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" );
     layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 );
 
-  currentPathEdit->setText( currentDir.canonicalPath());
+    currentPathEdit->setText( currentDir.canonicalPath());
     connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
 
     ProgressBar = new QProgressBar( this, "ProgressBar" );
     layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
 
     filterStr="*";
     populateLocalView();
 }
 
 OpieFtp::~OpieFtp()
 {
 }
 
 void OpieFtp::cleanUp()
 {
     if(conn)
         FtpQuit(conn);
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     if(file.exists())
         file.remove();
 }
 
 void OpieFtp::tabChanged(QWidget *w)
 {
     if (TabWidget->currentPageIndex() == 0) {
             currentPathEdit->setText( currentDir.canonicalPath());
+            tabMenu->setItemChecked(tabMenu->idAt(0),TRUE);
+            tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
+            tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
     }
   if (TabWidget->currentPageIndex() == 1) {
             currentPathEdit->setText( currentRemoteDir );
+            tabMenu->setItemChecked(tabMenu->idAt(1),TRUE);
+            tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
+            tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
     }
   if (TabWidget->currentPageIndex() == 2) {
+            tabMenu->setItemChecked(tabMenu->idAt(2),TRUE);
+            tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
+            tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
     }
 }
 
 void OpieFtp::localUpload()
 {
     int fsz;
     QCopEnvelope ( "QPE/System", "busy()" );
     qApp->processEvents();
     QString strItem = Local_View->currentItem()->text(0);
     QString localFile = currentDir.canonicalPath()+"/"+strItem;
     QString remoteFile= currentRemoteDir+strItem;
     QFileInfo fi(localFile);
     if( !fi.isDir()) {
         fsz=fi.size();
         ProgressBar->setTotalSteps(fsz);
 
@@ -840,28 +850,28 @@ void OpieFtp::currentPathEditChanged()
         currentRemoteDir = currentPathEdit->text();
         if(currentRemoteDir.right(1) !="/") {
             currentRemoteDir = currentRemoteDir +"/";
             currentPathEdit->setText( currentRemoteDir );
         }
             if( !remoteChDir( (const QString &)currentRemoteDir) ) {
                 currentRemoteDir = oldRemoteCurrentDir;
                 currentPathEdit->setText( currentRemoteDir );
             }
 
         remoteDirList( (const QString &)currentRemoteDir);
     }
 }
 
 void OpieFtp::switchToLocalTab()
 {
-TabWidget->setCurrentPage(0);
+    TabWidget->setCurrentPage(0);
 }
 
 void OpieFtp::switchToRemoteTab()
 {
-TabWidget->setCurrentPage(1);
+    TabWidget->setCurrentPage(1);
 }
 
 void OpieFtp::switchToConfigTab()
 {
-TabWidget->setCurrentPage(2);
+    TabWidget->setCurrentPage(2);
 }