1 files changed, 75 insertions, 16 deletions

diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index 21c970b..9cd371d 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -7,25 +7,46 @@ Derived from a file browser which was
 Extensive modification by Tim Wentford to allow it to work in rotated mode
 
 ****************************************************************************/
 #include "fileBrowser.h"
 
 #include "QtrListView.h"
+#include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
+#ifndef _WINDOWS
 #include <unistd.h>
+#endif
 #include <qlayout.h>
+#ifdef _WINDOWS
+#include <direct.h>
+#endif
 
-fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter, const QString iPath )
-    : QDialog( parent, name, modal, fl ), filterspec(QDir::All)
+#include "opie.h"
+
+fileBrowser::fileBrowser( bool allownew, QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter, const QString iPath )
+    : QDialog( parent, name, true,
+               fl/* | WStyle_Customize | WStyle_Tool*/),
+      filterspec(QDir::All)
 {
 //    showMaximized();
     if ( !name )
         setName( "fileBrowser" );
-    if (parent != NULL) resize( parent->width(), parent->height() );
+/*
+    if (parent != NULL)
+    {
+#ifdef OPIE
+        move(0,0);
+        resize( parent->width(), parent->height() );
+#else
+        setGeometry(parent->x(), parent->y(), parent->width(), parent->height() );
+#endif
+    }
+*/
+//    showFullScreen();
     setCaption(tr( "Browse for file" ) );
     filterStr=filter;
 
     buttonOk = new QPushButton( this, "buttonOk" );
     buttonOk->setFixedSize( 25, 25 );
     buttonOk->setAutoDefault( false );
@@ -63,25 +84,41 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     QVBoxLayout* grid = new QVBoxLayout(this);
     QHBoxLayout* hgrid = new QHBoxLayout(grid);
     hgrid->addWidget(dirLabel,1);
     hgrid->addWidget(buttonShowHidden);
     hgrid->addWidget(buttonOk);
     grid->addWidget(ListView,1);
+    if (allownew)
+    {
+        m_filename = new QLineEdit(this);
+        grid->addWidget(m_filename);
+        connect( m_filename, SIGNAL( returnPressed() ), this, SLOT( onReturn() ));
+    }
+    else
+    {
+        m_filename = NULL;
+    }
 
     if (QFileInfo(iPath).exists())
     {
         currentDir.setPath(iPath);
+#ifdef _WINDOWS
+        _chdir(iPath.latin1());
+#else
         chdir(iPath.latin1());
+#endif
     }
     else
     {
         currentDir.setPath(QDir::currentDirPath());
         chdir(QDir::currentDirPath().latin1());
     }
 
     populateList();
+
+    if (modal) showMaximized();
 }
 
 void fileBrowser::resizeEvent(QResizeEvent* e)
 {
     ListView->setColumnWidth(1,(ListView->width())/4);
     ListView->setColumnWidth(0,ListView->width()-20-ListView->columnWidth(1));    
@@ -92,13 +129,13 @@ fileBrowser::~fileBrowser()
 }
 
 
 void fileBrowser::populateList()
 {
     ListView->clear();
-//qDebug(currentDir.canonicalPath());
+////qDebug(currentDir.canonicalPath());
 //    currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
     currentDir.setFilter( filterspec );
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter(filterStr);
@@ -116,34 +153,34 @@ void fileBrowser::populateList()
             if( fi->isDir() )
             {
                 fileL+="/";
             } 
             else 
             {
-//        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+////        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             }
             new QListViewItem( ListView,fileL,fileS );
         }
         ++it;
     }
     ListView->setSorting( 2, FALSE);
     dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
     ListView->setFocus();
 }
 
 void fileBrowser::upDir()
 {
-//    qDebug(currentDir.canonicalPath());
+////    qDebug(currentDir.canonicalPath());
 }
 
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
     if (selectedItem == NULL) return;
     QString strItem=selectedItem->text(0);
 
-//    qDebug("%s", (const char*)strItem);
+////    qDebug("%s", (const char*)strItem);
     
 
     QString strSize=selectedItem->text(1);
 
     strSize.stripWhiteSpace();
 
@@ -158,33 +195,41 @@ void fileBrowser::listClicked(QListViewItem *selectedItem)
         if(QDir(strItem).exists())
         {
             currentDir.cd(strItem, TRUE);
             populateList();
         }
     } else
+    {
+        QListViewItem *selectedItem = ListView->selectedItem();
+        if (selectedItem == NULL)
+        {
+            filename = "";
+        }
+        else
+        {
+            filename = QDir::cleanDirPath(currentDir.canonicalPath()+"/"+selectedItem->text(0));
+        }
         OnOK();
+    }
     chdir(strItem.latin1());
 //
 
 }
 
 // you may want to switch these 2 functions. I like single clicks
 void fileBrowser::listDoubleClicked(QListViewItem *selectedItem)
 {
 }
 
-void fileBrowser::OnOK() {
+QString fileBrowser::getCurrentFile()
+{
+    return filename;
+}
 
-    QListViewItemIterator it1( ListView);
-    for ( ; it1.current(); ++it1 ) {
-        if ( it1.current()->isSelected() ) {
-            selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0));
-        //    qDebug("selected filename is "+selectedFileName);
-            fileList.append( selectedFileName );
-        }
-    }
+void fileBrowser::OnOK()
+{
     accept();
 }
 
 void fileBrowser::OnRoot()
 {
     currentDir.cd("/", TRUE);
@@ -202,6 +247,20 @@ void fileBrowser::setHidden(bool _hidden)
     if (_hidden)
         filterspec = QDir::All | QDir::Hidden;
     else
         filterspec = QDir::All;
     populateList();
 }
+
+void fileBrowser::onReturn()
+{
+    QListViewItem *selectedItem = ListView->selectedItem();
+    if (selectedItem == NULL)
+    {
+        filename = m_filename->text();
+    }
+    else
+    {
+        filename = QDir::cleanDirPath(currentDir.canonicalPath()+"/"+m_filename->text());
+    }
+    OnOK();
+}