2 files changed, 49 insertions, 49 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 3a11032..0a6e595 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -28,97 +28,144 @@
 
 #include <qnamespace.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qwidgetstack.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qheader.h>
 #include <qdir.h>
 #include <qpainter.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qcursor.h>
 #include <qstringlist.h>
 #include <qmessagebox.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/mimetype.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 
 #include "ofileselector.h"
 
 QMap<QString,QPixmap> *OFileSelector::m_pixmaps = 0;
 
 namespace {
 
   int indexByString( const QComboBox *box, const QString &str ){
     int index= -1;
     for(int i= 0; i < box->count(); i++ ){
       if( str == box->text(i ) ){
     index= i;
     break;
       }
     }
     return index;
   }
-
+  class OFileSelectorItem : public QListViewItem {
+  public:
+    OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path,
+                      const QString &date, const QString &size, const QString &mDir,
+                      bool isLocked=false, bool isDir=false ): QListViewItem(view) {
+      setPixmap(0, pixmap );
+      setText(1, path );
+      setText(2, size );
+      setText(3, date );
+      //setText(4, mDir );
+      m_dir = mDir;
+      dir = isDir;
+      mLocked = isLocked;
+    }
+    bool isLocked() const{
+      return mLocked;
+    }
+    QString directory()const{
+      return m_dir;
+    }
+    bool isDir()const{
+      return dir;
+    }
+    QString path()const{
+      return text(1 );
+    }
+    QString key(int id, bool )const {
+      QString ke;
+      if( id == 0 || id == 1 ){ // name
+        if( dir ){
+          ke.append("0" );
+          ke.append( text(1) );
+        }else{
+          ke.append("1" );
+          ke.append( text(1) );
+        }
+      }else if( id == 2 ){ // size
+        return text(2);
+      }else if( id == 3 ){ // date
+        return text(3);
+      }
+      return ke;
+    };
+  private:
+    bool mLocked:1;
+    bool dir:1;
+    QString m_dir;
+  };
 };
 
 
 OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName,
            const QString &fileName, const QStringList &mimetypes ) : QWidget( wid )
 {
   if(wid!=0)
     resize(wid->width(),wid->height());
   m_selector = selector;
   m_currentDir = dirName;
   m_name = fileName;
   m_mimetypes = mimetypes;
   
   if( mimetypes.isEmpty() )
     m_autoMime = true;
 
   qWarning("OFileSelector mimetypes %s", mimetypes.join(" ").latin1() );
   m_mode = mode;
   m_shTool = true;
   m_shPerm = true;
   m_shLne = true;
   m_shChooser = true;
   m_shYesNo = true;
 
   // for FILESELECTOR only view is interesting
   m_location = 0;
   m_homeButton = 0;
   m_docButton = 0;
   m_hideButton = 0;
   m_ok = 0;
   m_cancel = 0;
   m_reread = 0;
   m_up = 0;
   m_View = 0;
   m_select = 0;
   m_stack = 0;
 
   m_select = 0;
   m_stack = 0;
   m_lay = 0;
   m_boxToolbar = 0;
   m_boxOk = 0;
   m_edit = 0;
 
   m_fnLabel = 0;
   m_checkPerm = 0;
   m_mimeCheck = 0;
   m_viewCheck = 0;
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index babe09f..8173d76 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -19,144 +19,97 @@
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-        
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB. 
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef opiefileselector_h
 #define opiefileselector_h
 
 #include <qwidget.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qmap.h>
 #include <qvaluelist.h>
 
 #include <qpe/applnk.h>
 #include <qlistview.h>
 /** This is OPIEs FileDialog Widget. You can use it
  *  as a dropin replacement of the fileselector and
  *  or use any of the new features.
  *  This is also a complete FileSave and FileLoad widget
  *  If you look for a Dialog check OFileDialog  
  *
  */
 class DocLnk;
 class QCheckBox;
 class QComboBox;
 class QPushButton;
 class FileSelector;
 class QGridLayout;
 class QLineEdit;
 class QLabel;
 class QWidgetStack;
 class QHBoxLayout;
 class QVBoxLayout;
 class QPopupMenu;
 class QFileInfo;
 // 
-class OFileSelectorItem : public QListViewItem {
- public:
-  OFileSelectorItem(QListView *view, const QPixmap &pixmap, const QString &path,
-        const QString &date, const QString &size, const QString &mDir,
-        bool isLocked=false, bool isDir=false ): QListViewItem(view) {
-    setPixmap(0, pixmap );
-    setText(1, path );
-    setText(2, size );
-    setText(3, date );
-    //setText(4, mDir );
-    m_dir = mDir;
-    dir = isDir;
-    mLocked = isLocked;
-  }
-  bool isLocked() const{
-    return mLocked;
-  }
-  QString directory()const{
-    return m_dir;
-  }
-  bool isDir()const{
-    return dir;
-  }
-  QString path()const{
-    return text(1 );
-  }
-  QString key(int id, bool )const {
-    QString ke;
-    if( id == 0 || id == 1 ){ // name
-      if( dir ){
-  ke.append("0" );
-  ke.append( text(1) );
-      }else{
-  ke.append("1" );
-  ke.append( text(1) );
-      }
-    }else if( id == 2 ){ // size
-      return text(2);
-    }else if( id == 3 ){ // date
-      return text(3);
-    }
-    return ke;
-  };
- private:
-  bool mLocked:1;
-  bool dir:1;
-  QString m_dir;
-};
+
 
 class OFileSelector : public QWidget {
   Q_OBJECT
  public:
   enum Mode {OPEN=1, SAVE=2, FILESELECTOR=4, DIR=8 };
   enum Selector{NORMAL=1, EXTENDED = 2, EXTENDED_ALL =4 };
   enum View { DIRS = 1, FILES = 2, TREE = 4, ICON = 8 };
   OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName, const QString &fileName = QString::null, const QStringList &mimetypes = QStringList() );
   ~OFileSelector() {};
   bool isToolbarVisible() const { return m_shTool;  };
   bool isPermissionBarVisible() const {  return m_shPerm; };
   bool isLineEditVisible()const { return m_shLne; };
   bool isChooserVisible( )const { return m_shChooser; };
   bool isYesCancelVisible()const { return m_shYesNo;  };
   void setYesCancelVisible( bool show );
   void setToolbarVisible( bool show );
   void setPermissionBarVisible( bool show );
   void setLineEditVisible(bool show) ;
   void setChooserVisible( bool chooser );
 
   QCheckBox* permissionCheckbox();
   bool setPermission() const;
   void setPermissionChecked( bool check );
 
   void setMode( int );
 
   bool showDirs()const { return m_dir; }
   void setShowDirs(bool );
 
   const QListView* listView() { return m_View; };
 
   bool isCaseSensetive()const {  return m_case; }
   void setCaseSensetive(bool caSe );
 
   bool showFiles()const { return m_files; };
   void setShowFiles(bool );
   bool cd(const QString &path );
 
 
   int mode()const { return m_mode;  };
   int selector()const { return m_selector; };
   void setSelector( int );
   
   bool showPopup()const { return m_showPopup; };
   void setShowPopup( bool pop ) { m_showPopup = pop; };
   void setPopupMenu( QPopupMenu * );
 
   void updateLay();