2 files changed, 13 insertions, 13 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index f3e4e1e..e103bcb 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -1,149 +1,148 @@
 /****************************************************************************
 ** 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 "inputDialog.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/menubutton.h>
 #include <qpe/mimetype.h>
 
 #include <qdict.h>
 #include <qwidgetstack.h>
 #include <qlistview.h>
 #include <qcombo.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qlayout.h>
 #include <unistd.h>
 #include <qpopupmenu.h>
 #include <qlineedit.h>
 #include <qstringlist.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 
 static int u_id = 1;
 static int get_unique_id()
 {
     return u_id++;
 }
 
 fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
         setName( "fileBrowser" );
     setCaption(tr( name ) );
-    filterStr=filter;
-
+    filterStr = filter;
 //      channel = new QCopChannel( "QPE/fileDialog", this );
 //      connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 //         this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
     dirPathCombo = new QComboBox( FALSE, this, "dorPathCombo" );
     dirPathCombo->setEditable(TRUE);
 
     connect( dirPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT( dirPathComboActivated( const QString & ) ) );
 
     connect( dirPathCombo->lineEdit(), SIGNAL( returnPressed(  ) ),
               this, SLOT( dirPathEditPressed( ) ) );
 
     dirPathStringList << "/";
 // we can get the storage here
 
     layout->addMultiCellWidget( dirPathCombo, 0, 0, 0, 4 );
 
     cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
     cdUpButton ->setMinimumSize( QSize( 20, 20 ) );
     cdUpButton ->setMaximumSize( QSize( 20, 20 ) );
     connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
     cdUpButton ->setFlat(TRUE);
     layout->addMultiCellWidget( cdUpButton, 0, 0, 5, 5 );
 
 
     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
     docButton->setMinimumSize( QSize( 20, 20 ) );
     docButton->setMaximumSize( QSize( 20, 20 ) );
     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
     docButton->setFlat(TRUE);
     layout->addMultiCellWidget( docButton, 0, 0, 6, 6 );
 
     homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
     homeButton->setMinimumSize( QSize( 20, 20 ) );
     homeButton->setMaximumSize( QSize( 20, 20 ) );
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
     homeButton->setFlat(TRUE);
     layout->addMultiCellWidget( homeButton, 0, 0, 7, 7 );
 
     FileStack = new QWidgetStack( this );
 
 
     ListView = new QListView( this, "ListView" );
 //     ListView->setMinimumSize( QSize( 100, 25 ) );
     ListView->addColumn( tr( "Name" ) );
     ListView->setColumnWidth(0,120);
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,-1);
     ListView->addColumn( "Date",-1);
 
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
     ListView->setColumnAlignment(2,QListView::AlignRight);
     ListView->setAllColumnsShowFocus( TRUE );
 
     QPEApplication::setStylusOperation( ListView->viewport(),QPEApplication::RightOnHold);
     connect( ListView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
     connect( ListView, SIGNAL( clicked( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
 
     FileStack->addWidget( ListView, get_unique_id() );
 mimeType="text/*";
     fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
 //    connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
 //    connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
     connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) );
     layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 );
 
     SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" );
     SelectionCombo->insertItem( tr( "Documents" ) );
     SelectionCombo->insertItem( tr( "All files" ) );
     SelectionCombo->insertItem( tr( "Hidden files" ) );
 //      SelectionCombo->setMaximumWidth(120);
     layout->addMultiCellWidget( SelectionCombo, 2, 2, 0, 3 );
 
     connect( SelectionCombo, SIGNAL( activated( const QString & ) ),
             this, SLOT( selectionChanged( const QString & ) ) );
 
     typemb = new MenuButton(this);
     typemb->setLabel(tr("Type: %1"));
     typemb->setMinimumWidth(110);
     typemb->setFixedHeight(22);
     layout->addMultiCellWidget( typemb, 2, 2, 4, 7 );
     updateMimeTypeMenu() ;
 
     currentDir.setPath(QDir::currentDirPath());
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All);
 
     populateList();
diff --git a/core/apps/textedit/fileBrowser.h b/core/apps/textedit/fileBrowser.h
index 42f93b6..77ac166 100644
--- a/core/apps/textedit/fileBrowser.h
+++ b/core/apps/textedit/fileBrowser.h
@@ -1,118 +1,119 @@
 /****************************************************************************
 **
 ** Created: Fri Dec 14 08:16:02 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.
 **
 copyright Sun 02-17-2002 22:28:23 L. J. Potter ljp@llornkcor.com
 ****************************************************************************/
 #ifndef FILEBROWSER_H
 #define FILEBROWSER_H
 
 //#include <qvariant.h>
 #include <qdialog.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qstringlist.h>
 #include <qlabel.h>
 #include <qstring.h>
 #include <qdict.h>
 
 #include <qpe/filemanager.h>
 
 #include <qvariant.h>
 #include <qdialog.h>
 class QLineEdit;
 
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QListView;
 class QListViewItem;
 class QPushButton;
 class QComboBox;
 class QWidgetStack;
 class FileSelector;
 class QPoint;
 class MenuButton;
 class QRegExp;
 
 
 class fileBrowser : public QDialog
 {
     Q_OBJECT
 
 public:
     fileBrowser( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ,const QString filter=0);
     ~fileBrowser();
 
+    QString selectedFileName, mimeType;
+    QFile file;
+    QStringList fileList;
+    QComboBox *SelectionCombo;
+public slots:
+    void setFileView( int );
+
+private:
+//    QDict<void> mimes;
     QPushButton *buttonOk, *buttonCancel, *homeButton, *docButton, *hideButton, *cdUpButton;
     QListView* ListView;
-
     QLabel *dirLabel;
-    QString selectedFileName, filterStr;
+    QString filterStr;
     QDir currentDir;
-    QFile file;
-    QStringList fileList, dirPathStringList;
+    QStringList dirPathStringList;
     QListViewItem * item;
-    QComboBox *SelectionCombo, *dirPathCombo;
+    QComboBox *dirPathCombo;
     MenuButton *typemb;
     QWidgetStack *FileStack;
     FileSelector *fileSelector;
-    QString mimeType;
-public slots:
-        void setFileView( int );
-
-private:
-//    QDict<void> mimes;
     QRegExp tf;
     QStringList getMimeTypes();
     void fillCombo( const QString&);
 
 private slots:
     void populateList();
     void homeButtonPushed();
     void docButtonPushed();
     void ListPressed( int, QListViewItem *, const QPoint&, int);
     void showListMenu(QListViewItem*);
     void doCd();
     void makDir();
     void localRename();
     void localDelete();
     void receive( const QCString &msg, const QByteArray &data );
     void dirPathComboActivated( const QString & );
     void upDir();
     void listClicked( QListViewItem * );
     void selectionChanged( const QString & );
     void OnOK();
     void docOpen( const DocLnk & );
     void updateMimeTypeMenu();
     void showType(const QString &);
     void dirPathEditPressed();
     
 protected slots:
 
 protected:
 
 };
 
 
 class InputDialog : public QDialog
 { 
     Q_OBJECT
 
 public:
     InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~InputDialog();
     QString inputText;
     QLineEdit* LineEdit1;
 
 };
 
 #endif // FILEBROWSER_H