changes for osplitter functionality

1 files changed, 158 insertions, 187 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 91318f1..2fc4b49 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -42,2 +42,4 @@
 
+#include <qpe/qpemessagebox.h>
+
 #include <sys/stat.h>
@@ -69,4 +71,3 @@ AdvancedFm::~AdvancedFm() {
 
-void AdvancedFm::cleanUp()
-{
+void AdvancedFm::cleanUp() {
   QString sfile=QDir::homeDirPath();
@@ -81,11 +82,4 @@ void AdvancedFm::cleanUp()
 
-void AdvancedFm::tabChanged(QWidget *w)
-{
-  if( w == tab)
-    whichTab = 1;
-  else
-    whichTab = 2;
-
-//  qDebug("tab changed %d", whichTab );
-
+void AdvancedFm::tabChanged(QWidget *) {
+//   qWarning("tab changed");
    QString path = CurrentDir()->canonicalPath();
@@ -93,4 +87,9 @@ void AdvancedFm::tabChanged(QWidget *w)
 
-  viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
-  viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
+   if(whichTab == 1) {
+      viewMenu->setItemChecked(viewMenu->idAt(0), true);
+      viewMenu->setItemChecked(viewMenu->idAt(1), false);
+   } else {
+      viewMenu->setItemChecked(viewMenu->idAt(0), false);
+      viewMenu->setItemChecked(viewMenu->idAt(1), true);
+   }
 
@@ -98,4 +97,4 @@ void AdvancedFm::tabChanged(QWidget *w)
 
-  setCaption("AdvancedFm :: "+fs+" :: "
-             +checkDiskSpace( (const QString &) path )+ " kB free" );
+   setCaption(tr("AdvancedFm :: ")+fs+" :: "
+              +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
   chdir( path.latin1());
@@ -104,4 +103,3 @@ void AdvancedFm::tabChanged(QWidget *w)
 
-void AdvancedFm::populateView()
-{
+void AdvancedFm::populateView() {
   QPixmap pm;
@@ -110,3 +108,3 @@ void AdvancedFm::populateView()
   QString path = thisDir->canonicalPath();
-
+//   qWarning("path is "+path);
   thisView->clear();
@@ -117,4 +115,4 @@ void AdvancedFm::populateView()
   QString fs= getFileSystemType((const QString &) path);
-  setCaption("AdvancedFm :: "+fs+" :: "
-             +checkDiskSpace((const QString &) path)+" kB free" );
+   setCaption(tr("AdvancedFm :: ")+fs+" :: "
+              +checkDiskSpace((const QString &) path)+ tr(" kB free") );
   bool isDir=FALSE;
@@ -135,2 +133,3 @@ void AdvancedFm::populateView()
           if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
+//           if(fileL == "..")
               fileL+="/";
@@ -213,20 +212,22 @@ void AdvancedFm::populateView()
 
-void AdvancedFm::rePopulate()
-{
-  int tmpTab = whichTab;
-  qDebug("%d", tmpTab);
-
-  for(int i =1; i < 3; i++)
-    {
-      TabWidget->setCurrentWidget(i - 1);
+void AdvancedFm::rePopulate() {
       populateView();
-    }
-  TabWidget->setCurrentWidget( tmpTab - 1);
+     setOtherTabCurrent();
+     populateView();
+
+//      int tmpTab = whichTab;
+// //  qDebug("%d", tmpTab);
+
+//    for(int i =1; i < 3; i++) {
+//       TabWidget->setCurrentWidget(i - 1);
+//       populateView();
+//    }
+//    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 
-void AdvancedFm::ListClicked(QListViewItem *selectedItem)
-{
-  if(selectedItem)
-    {
+void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
+//qWarning("listclicked");
+   if(selectedItem) {
       QString strItem=selectedItem->text(0);
+//      qWarning(strItem);
       QString strSize=selectedItem->text(1);
@@ -236,4 +237,3 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem)
 
-      if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 )//if symlink
-        {
+      if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
           strItem2 = dealWithSymName((const QString&)strItem);
@@ -243,4 +243,3 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem)
 
-      if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 )
-        {
+      if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
 
@@ -250,4 +249,3 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem)
 
-      if( isDirectory )
-        {
+      if( isDirectory ) {
           CurrentDir()->cd( strItem, TRUE);
@@ -260,3 +258,4 @@ void AdvancedFm::ListClicked(QListViewItem *selectedItem)
 
-void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
+void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) {
+   dealWithSchmooSchmaa( item->listView());
   switch (mouse) {
@@ -264,4 +263,3 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int )
   {
-    if(renameBox != 0 )
-      {
+      if(renameBox != 0 ) {
         cancelRename();
@@ -276,4 +274,5 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int )
 
-void AdvancedFm::switchToLocalTab()
-{
+
+void AdvancedFm::switchToLocalTab() {
+//qWarning("switch to local view");
   TabWidget->setCurrentWidget(0);
@@ -282,4 +281,4 @@ void AdvancedFm::switchToLocalTab()
 
-void AdvancedFm::switchToRemoteTab()
-{
+void AdvancedFm::switchToRemoteTab() {
+//qWarning("switch to local view");
   TabWidget->setCurrentWidget(1);
@@ -288,4 +287,3 @@ void AdvancedFm::switchToRemoteTab()
 
-void AdvancedFm::readConfig()
-{
+void AdvancedFm::readConfig() {
   Config cfg("AdvancedFm");
@@ -293,4 +291,3 @@ void AdvancedFm::readConfig()
 
-void AdvancedFm::writeConfig()
-{
+void AdvancedFm::writeConfig() {
   Config cfg("AdvancedFm");
@@ -298,11 +295,7 @@ void AdvancedFm::writeConfig()
 
-void  AdvancedFm::currentPathComboChanged()
-{
-  if(QDir( currentPathCombo->lineEdit()->text()).exists())
-    {
+void  AdvancedFm::currentPathComboChanged() {
+   if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
-    }
-  else
-    {
+   } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
@@ -311,10 +304,7 @@ void  AdvancedFm::currentPathComboChanged()
 
-void  AdvancedFm::fillCombo(const QString &currentPath)
-{
-//    qDebug("%d",TabWidget->currentTab());
-  if ( whichTab == 1)
-    {
+void  AdvancedFm::fillCombo(const QString &currentPath) {
+
+   if ( whichTab == 1) {
       currentPathCombo->lineEdit()->setText( currentPath);
-      if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() )
-        {
+      if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
           currentPathCombo->clear();
@@ -323,8 +313,5 @@ void  AdvancedFm::fillCombo(const QString &currentPath)
         }
-    }
-  else
-    {
+   } else {
       currentPathCombo->lineEdit()->setText( currentPath);
-      if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() )
-        {
+      if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
           currentPathCombo->clear();
@@ -336,4 +323,3 @@ void  AdvancedFm::fillCombo(const QString &currentPath)
 
-void AdvancedFm::currentPathComboActivated(const QString & currentPath)
-{
+void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
     chdir( currentPath.latin1() );
@@ -344,4 +330,3 @@ void AdvancedFm::currentPathComboActivated(const QString & currentPath)
 
-QStringList AdvancedFm::getPath()
-{
+QStringList AdvancedFm::getPath() {
   QStringList strList;
@@ -350,6 +335,4 @@ QStringList AdvancedFm::getPath()
   QListViewItemIterator it( thisView );
-  for ( ; it.current(); ++it )
-    {
-      if ( it.current()->isSelected() )
-        {
+   for ( ; it.current(); ++it ) {
+      if ( it.current()->isSelected() ) {
           strList <<  it.current()->text(0);
@@ -361,4 +344,3 @@ QStringList AdvancedFm::getPath()
 
-void AdvancedFm::homeButtonPushed()
-{
+void AdvancedFm::homeButtonPushed() {
   QString current = QDir::homeDirPath();
@@ -370,4 +352,3 @@ void AdvancedFm::homeButtonPushed()
 
-void AdvancedFm::docButtonPushed()
-{
+void AdvancedFm::docButtonPushed() {
   QString current = QPEApplication::documentDir();
@@ -379,4 +360,3 @@ void AdvancedFm::docButtonPushed()
 
-void AdvancedFm::SDButtonPushed()
-{
+void AdvancedFm::SDButtonPushed() {
   QString current = "/mnt/card";// this can change so fix
@@ -388,4 +368,3 @@ void AdvancedFm::SDButtonPushed()
 
-void AdvancedFm::CFButtonPushed()
-{
+void AdvancedFm::CFButtonPushed() {
   QString current;
@@ -402,4 +381,3 @@ void AdvancedFm::CFButtonPushed()
 
-void AdvancedFm::doAbout()
-{
+void AdvancedFm::doAbout() {
   QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
@@ -410,8 +388,20 @@ void AdvancedFm::doAbout()
 
-void AdvancedFm::keyPressEvent( QKeyEvent *e)
-{
-//    e->accept();
-  if( CurrentView()->hasFocus()  )
+void AdvancedFm::keyPressEvent( QKeyEvent *e) {
+//   qWarning("key %d", e->key());
+//   if( CurrentView()->hasFocus()  )
     {
       switch ( e->key() ) {
+      case Key_Left:
+         upDir();
+         break;
+      case Key_Next:
+         break;
+      case Key_Return:
+      case Key_Enter:
+         navigateToSelected();
+         break;
+      case Key_Tab: {
+         setOtherTabCurrent();
+      }
+         break;
       case Key_Delete:
@@ -486,4 +476,3 @@ void AdvancedFm::keyPressEvent( QKeyEvent *e)
 
-void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
-{
+void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
   if( CurrentView()->hasFocus() )
@@ -493,4 +482,3 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 
-void AdvancedFm::QPEButtonPushed()
-{
+void AdvancedFm::QPEButtonPushed() {
   QString current = QPEApplication::qpeDir();
@@ -502,4 +490,3 @@ void AdvancedFm::QPEButtonPushed()
 
-void AdvancedFm::parsetab(const QString &fileName)
-{
+void AdvancedFm::parsetab(const QString &fileName) {
 
@@ -509,6 +496,4 @@ void AdvancedFm::parsetab(const QString &fileName)
   FILE *mntfp = setmntent( fileName.latin1(), "r" );
-  if ( mntfp )
-    {
-    while ( (me = getmntent( mntfp )) != 0 )
-      {
+   if ( mntfp ) {
+      while ( (me = getmntent( mntfp )) != 0 ) {
       QString deviceName = me->mnt_fsname;
@@ -516,4 +501,3 @@ void AdvancedFm::parsetab(const QString &fileName)
       QString mountDir = me->mnt_dir;
-      if(deviceName != "none")
-        {
+         if(deviceName != "none") {
         if( fsList.contains(filesystemType) == 0
@@ -530,4 +514,3 @@ void AdvancedFm::parsetab(const QString &fileName)
 
-QString  AdvancedFm::getFileSystemType(const QString &currentText)
-{
+QString  AdvancedFm::getFileSystemType(const QString &currentText) {
   parsetab("/etc/mtab"); //why did TT forget filesystem type?
@@ -547,4 +530,3 @@ QString  AdvancedFm::getFileSystemType(const QString &currentText)
 
-QString  AdvancedFm::getDiskSpace( const QString &path)
-{
+QString  AdvancedFm::getDiskSpace( const QString &path) {
   struct statfs fss;
@@ -566,4 +548,3 @@ QString  AdvancedFm::getDiskSpace( const QString &path)
 
-void AdvancedFm::showFileMenu()
-{
+void AdvancedFm::showFileMenu() {
   QString curApp;
@@ -579,9 +560,6 @@ void AdvancedFm::showFileMenu()
 
-  if ( QFileInfo(fi).isDir() )
-    {
+   if ( QFileInfo(fi).isDir() ) {
       m->insertSeparator();
       m->insertItem( tr( "Change Directory" ), this, SLOT( doDirChange() ));
-    }
-  else
-    {
+   } else {
 
@@ -636,5 +614,4 @@ void AdvancedFm::showFileMenu()
 
-void AdvancedFm::cancelMenuTimer()
-{
-//  qDebug("selectionChanged: cancel menu timer");
+void AdvancedFm::cancelMenuTimer() {
+
   if( menuTimer.isActive() )
@@ -643,7 +620,5 @@ void AdvancedFm::cancelMenuTimer()
 
-QString AdvancedFm::checkDiskSpace(const QString &path)
-{
+QString AdvancedFm::checkDiskSpace(const QString &path) {
   struct statfs fss;
-  if ( !statfs( path.latin1(), &fss ) )
-    {
+   if ( !statfs( path.latin1(), &fss ) ) {
     int blkSize = fss.f_bsize;
@@ -663,4 +638,3 @@ QString AdvancedFm::checkDiskSpace(const QString &path)
 
-void AdvancedFm::addToDocs()
-{
+void AdvancedFm::addToDocs() {
   QStringList strListPaths = getPath();
@@ -684,4 +658,3 @@ void AdvancedFm::addToDocs()
 
-void AdvancedFm::customDirsToMenu()
-{
+void AdvancedFm::customDirsToMenu() {
 
@@ -699,5 +672,3 @@ void AdvancedFm::customDirsToMenu()
 
-void AdvancedFm::dirMenuSelected(int item)
-{
-  qDebug("menu item %d", item);
+void AdvancedFm::dirMenuSelected(int item) {
   switch(item)
@@ -723,4 +694,3 @@ void AdvancedFm::dirMenuSelected(int item)
 
-void AdvancedFm::addCustomDir()
-{
+void AdvancedFm::addCustomDir() {
   Config cfg("AdvancedFm");
@@ -733,6 +703,4 @@ void AdvancedFm::addCustomDir()
   bool addIt=true;
-  for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
-    {
-      if( dir == (*it))
-        {
+   for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+      if( dir == (*it)) {
           addIt=false;
@@ -740,4 +708,3 @@ void AdvancedFm::addCustomDir()
     }
-  if(addIt)
-    {
+   if(addIt) {
       menuButton->insertItem(dir);
@@ -751,4 +718,3 @@ void AdvancedFm::addCustomDir()
 
-void AdvancedFm::removeCustomDir()
-{
+void AdvancedFm::removeCustomDir() {
 //  qDebug("remove custom dir");
@@ -763,17 +729,11 @@ void AdvancedFm::removeCustomDir()
 //first remove list
-  if(list.grep(dir,true).isEmpty())
-    {
+   if(list.grep(dir,true).isEmpty()) {
       QMessageBox::message(tr( "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
-            {
+   } 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
-            {
+         } else {
 //              customDirMenu->removeItem( ramble);
@@ -793,4 +753,3 @@ void AdvancedFm::removeCustomDir()
 
-void AdvancedFm::gotoCustomDir(const QString &dir)
-{
+void AdvancedFm::gotoCustomDir(const QString &dir) {
 //     qDebug("gotoCustomDir(const QString &dir) " +dir );
@@ -800,12 +759,8 @@ void AdvancedFm::gotoCustomDir(const QString &dir)
 //     }
-  if( dir == s_addBookmark)
-    {
+   if( dir == s_addBookmark) {
       addCustomDir();
     }
-  if( dir == s_removeBookmark)
-    {
+   if( dir == s_removeBookmark) {
       removeCustomDir( );
-    }
-  else
-    {
+   } else {
        gotoDirectory( dir);
@@ -821,10 +776,7 @@ void AdvancedFm::gotoCustomDir(const QString &dir)
 
-QDir *AdvancedFm::CurrentDir()
-{
-  if ( whichTab == 1)
-    {
+QDir *AdvancedFm::CurrentDir() {
+   
+   if ( whichTab == 1) {
     return &currentDir;
-    }
-  else
-    {
+   } else {
     return &currentRemoteDir;
@@ -833,10 +785,6 @@ QDir *AdvancedFm::CurrentDir()
 
-QDir *AdvancedFm::OtherDir()
-{
-  if ( whichTab == 1)
-    {
+QDir *AdvancedFm::OtherDir() {
+   if ( whichTab == 1) {
     return &currentRemoteDir;
-    }
-  else
-    {
+   } else {
     return &currentDir;
@@ -845,12 +793,13 @@ QDir *AdvancedFm::OtherDir()
 
-QListView * AdvancedFm::CurrentView()
-{
-  if ( whichTab == 1)
+QListView * AdvancedFm::CurrentView() {
+   if ( whichTab == 1) {
+//      qWarning("CurrentView Tab 1");
     return Local_View;
-  else
+   } else {
+//      qWarning("CurrentView Tab 2");
     return Remote_View;
 }
+}
 
-QListView * AdvancedFm::OtherView()
-{
+QListView * AdvancedFm::OtherView() {
   if ( whichTab == 1)
@@ -861,15 +810,18 @@ QListView * AdvancedFm::OtherView()
 
-void AdvancedFm::setOtherTabCurrent()
-{
-  if ( whichTab == 1)
+void AdvancedFm::setOtherTabCurrent() {
+//   qWarning("setOtherTabCurrent()");
+   if ( whichTab == 1) {
     TabWidget->setCurrentWidget(1);
-  else
+   } else {
     TabWidget->setCurrentWidget(0);
 }
+   OtherView()->setFocus();
+   OtherView()->setSelected( CurrentView()->firstChild(), true);      
+}
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
-   qDebug("qcop message "+msg );
+//   qDebug("qcop message "+msg );
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
-      qDebug("received");
+//      qDebug("received");
       QString file;
@@ -886,3 +838,3 @@ void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 void AdvancedFm::gotoDirectory(const QString &file) {
-
+//   qWarning("goto dir "+file);
   QString curDir = file;
@@ -920 +872,20 @@ void AdvancedFm::findFile(const QString &fileName) {
 }
+
+void AdvancedFm::slotSwitchMenu(int ) {
+//   qDebug("Switch %d", item);
+   //   viewMenu->setItemChecked(item, true);
+}
+
+void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) {
+   tabChanged( w);
+   if( w == Local_View) {
+      Remote_View->clearFocus();
+   } else {
+      Local_View->clearFocus();
+   }
+}
+
+void AdvancedFm::navigateToSelected() {
+   if( !CurrentView()->currentItem()) return;
+   doDirChange();
+}