2 files changed, 31 insertions, 16 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index c16bd41..2e88067 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -1,110 +1,124 @@
 /****************************************************************************
 ** copyright 2001 ljp ljp@llornkcor.com
 ** Created: Fri Dec 14 08:16:46 2001
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 #include "fileBrowser.h"
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
+#include <qlayout.h>
 #include <unistd.h>
 
 
 
 fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
-  setName( "fileBrowser" );
-    resize( 240, 280 );
+        setName( "fileBrowser" );
     setCaption(tr( name ) );
     filterStr=filter;
 
+    QGridLayout *layout = new QGridLayout( this );
+    layout->setSpacing( 4 );
+    layout->setMargin( 4 );
+
+
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
-    dirLabel->setGeometry(10,20,230,15);
+    dirLabel->setMinimumSize( QSize( 50, 15 ) );
+    dirLabel->setMaximumSize( QSize( 250, 15 ) );
+    layout->addWidget( dirLabel, 0, 0 );
 
-    homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
-    homeButton->setGeometry(200,4,25,25);
-    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
-    homeButton->setFlat(TRUE);
+    hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton");
+    hideButton->setMinimumSize( QSize( 25, 25 ) );
+    hideButton->setMaximumSize( QSize( 25, 25 ) );
+    connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) );
+    hideButton->setToggleButton(TRUE);
+    hideButton->setFlat(TRUE);
+    layout->addWidget( hideButton, 0, 1 );
 
     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
-    docButton->setGeometry(170,4,25,25);
+    docButton->setMinimumSize( QSize( 25, 25 ) );
+    docButton->setMaximumSize( QSize( 25, 25 ) );
     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
     docButton->setFlat(TRUE);
+    layout->addWidget( docButton, 0, 2 );
+
+    homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
+    homeButton->setMinimumSize( QSize( 25, 25 ) );
+    homeButton->setMaximumSize( QSize( 25, 25 ) );
+    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+    homeButton->setFlat(TRUE);
+    layout->addWidget( homeButton, 0, 3 );
 
-    hideButton = new QPushButton( Resource::loadIconSet("s_hidden"),"",this,"hideButton");
-    hideButton->setGeometry(140,4,25,25);
-    connect( hideButton,SIGNAL(toggled(bool)),this,SLOT( hideButtonPushed(bool)) );
-    hideButton->setToggleButton(TRUE);
-    hideButton->setFlat(TRUE);
-    
     ListView = new QListView( this, "ListView" );
+    ListView->setMinimumSize( QSize( 100, 25 ) );
     ListView->addColumn( tr( "Name" ) );
     ListView->setColumnWidth(0,140);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,59);
 //      ListView->addColumn( tr( "" ) );
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
 //      ListView->setMultiSelection(true);
 //      ListView->setSelectionMode(QListView::Extended);
 
     ListView->setAllColumnsShowFocus( TRUE );
-    ListView->setGeometry( QRect( 10, 35, 220, 240 ) );
+    layout->addMultiCellWidget( ListView, 1, 1, 0, 3 );
 
     // signals and slots connections
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(pressed( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     currentDir.setPath(QDir::currentDirPath());
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All);
 
     populateList();
-    move(0,15); 
+    move(0,15);
 }
 
 fileBrowser::~fileBrowser()
 {
 }
 
 
 void fileBrowser::populateList()
 {
     ListView->clear();
 //qDebug(currentDir.canonicalPath());
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter(filterStr);
 //    currentDir.setNameFilter("*.txt;*.etx");
     QString fileL, fileS;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
 
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
          QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
 
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index c46f089..3a189cb 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -511,64 +511,65 @@ void TextEdit::fileNew()
     newFile(DocLnk());
 }
 
 void TextEdit::fileOpen()
 {
 //      if ( !save() ) {
 //    if ( QMessageBox::critical( this, tr( "Out of space" ),
 //              tr( "Text Editor was unable to\n"
 //            "save your changes.\n"
 //            "Free some space and try again.\n"
 //            "\nContinue anyway?" ),
 //              QMessageBox::Yes|QMessageBox::Escape,
 //              QMessageBox::No|QMessageBox::Default )
 //         != QMessageBox::Yes )
 //        return;
 //    else {
 //        delete doc;
 //        doc = 0;
 //    }
 //      }
     menu->hide();
     editBar->hide();
     searchBar->hide();
     clearWState (WState_Reserved1 );
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
     updateCaption();
 }
 
 void TextEdit::newFileOpen()
 {
     browseForFiles=new fileBrowser(this,"Open File",TRUE,0, "*");
+    browseForFiles->showMaximized();
     if( browseForFiles->exec() != -1 ) {
         QString selFile= browseForFiles->selectedFileName;
         QStringList fileList=browseForFiles->fileList;
         qDebug(selFile);
         QStringList::ConstIterator f;
         QString fileTemp;
         for (  f = fileList.begin(); f != fileList.end(); f++ ) {
             fileTemp = *f;
             fileTemp.right( fileTemp.length()-5);
             QString  fileName = fileTemp;
             if( fileName != "Unnamed" || fileName != "Empty Text"  ) {
                 currentFileName = fileName;
                 qDebug("please open "+currentFileName);
                 openFile(fileName );
             }
         }
     }
     delete browseForFiles;
     editor->setEdited( FALSE);
     edited1=FALSE;
     edited=FALSE;
     if(caption().left(1)=="*")
         setCaption(caption().right(caption().length()-1));
 }
 
 #if 0
 void TextEdit::slotFind()
 {
     FindDialog frmFind( "Text Editor", this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));