3 files changed, 183 insertions, 17 deletions

diff --git a/libopie/TODO b/libopie/TODO
index c1bf6d1..a4e1ada 100644
--- a/libopie/TODO
+++ b/libopie/TODO
@@ -7,5 +7,6 @@
    
 - OFileSelector
-   - DocLnk when not in Document Mode
+   - DocLnk when not in Document Mode ( and vice versa )
+   - MultipleDocuments
    - TreeView have a own OFileSelectorItem for this
    - IconView add a QIconView to the widgetstack
@@ -13,4 +14,5 @@
    - add functions to access the member variables
    - debug
+   - new Dirs created inside the listview
    
 - Clickable labels?
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index b583125..14f035e 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -50,4 +50,5 @@
 #include <qpe/mimetype.h>
 #include <qpe/resource.h>
+#include <qpe/storage.h>
 
 #include <unistd.h>
@@ -117,7 +118,11 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString
   m_viewCheck = 0;
 
+  m_pseudo = 0;
+  m_pseudoLayout = 0;
+
   m_dir = true;
   m_files = true;
   m_custom = 0;
+  m_showPopup = true;
 
   if(m_pixmaps == 0 ) // init the pixmaps
@@ -230,9 +235,17 @@ void OFileSelector::setToolbarVisible( bool show )
   if ( m_shTool == show )
     return;
-  /*  if( show ){
-
-  }else {
-
-  }*/
+  if(!m_shTool ){
+    delete m_boxToolbar;
+    delete m_homeButton;
+    delete m_docButton;
+    delete m_location;
+    delete m_up;
+    m_boxToolbar = 0;
+    m_homeButton = 0;
+    m_docButton = 0;
+    m_location = 0;
+    m_up = 0;
+  };
+  updateLay();// overkill fix it
 }
 
@@ -419,5 +432,23 @@ void OFileSelector::reparse()
   QDir dir( m_currentDir );
   //dir.setFilter(-1 );
-  dir.setSorting(QDir::Name | QDir::DirsFirst | QDir::Reversed | QDir::IgnoreCase  );
+  int sort = QDir::Name | QDir::DirsFirst | QDir::Reversed;
+  if( m_case )
+    sort = QDir::IgnoreCase;
+  dir.setSorting( sort  );
+  
+  int filter;
+  /*  if( m_dir && !m_files)
+      filter |= QDir::Dirs;
+      else if( !m_dir && m_files )
+      filter |= QDir::Files;
+      else
+      filter |= QDir::All;
+  */
+  if( m_selector == EXTENDED_ALL )
+    filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
+  else
+    filter = QDir::Files | QDir::Dirs | QDir::All;
+  dir.setFilter( filter );
+
   const QFileInfoList *list = dir.entryInfoList();
   QFileInfoListIterator it( *list );
@@ -555,7 +586,23 @@ void OFileSelector::slotViewCheck(const QString &view ){
     // get the mimetype now
     // check if we're the current widget and return
-    if( m_View != 0) // delete 0 shouldn't crash but it did :( 
+    if( m_View != 0) { // delete 0 shouldn't crash but it did :( 
       delete m_View;
+      delete m_boxToolbar;
+      delete m_homeButton;
+      delete m_docButton;
+      delete m_location;
+      delete m_up;
+      delete m_pseudo;
+      delete m_pseudoLayout;
+    }
     m_View = 0;
+    m_boxToolbar = 0;
+    m_homeButton = 0;
+    m_docButton = 0;
+    m_location = 0;
+    m_up = 0;
+    m_pseudo = 0;
+    m_pseudoLayout = 0;
+
     delete m_select;
     m_select = new FileSelector( currMime == "All" ? QString::null : currMime,
@@ -575,4 +622,20 @@ void OFileSelector::slotViewCheck(const QString &view ){
     delete m_View;
     m_View = 0;
+
+    delete m_boxToolbar;
+    delete m_homeButton;
+    delete m_docButton;
+    delete m_location;
+    delete m_up;
+    delete m_pseudo;
+    delete m_pseudoLayout;
+    m_boxToolbar = 0;
+    m_homeButton = 0;
+    m_docButton = 0;
+    m_location = 0;
+    m_up = 0;
+    m_pseudo = 0;
+    m_pseudoLayout = 0;
+
     m_selector = EXTENDED;
     // create the ListView or IconView
@@ -586,4 +649,19 @@ void OFileSelector::slotViewCheck(const QString &view ){
     delete m_View;
     m_View = 0;
+    delete m_boxToolbar;
+    delete m_homeButton;
+    delete m_docButton;
+    delete m_location;
+    delete m_up;
+    delete m_pseudo;
+    delete m_pseudoLayout;
+    m_boxToolbar = 0;
+    m_homeButton = 0;
+    m_docButton = 0;
+    m_location = 0;
+    m_up = 0;
+    m_pseudo = 0;
+    m_pseudoLayout = 0;
+
     m_selector = EXTENDED_ALL;
     initializeListView();
@@ -612,8 +690,67 @@ void OFileSelector::updateMimes() // lets check which mode is active
 };
 void OFileSelector::initializeListView()
-{
-  m_View = new QListView(m_stack, "Extended view" );
-  m_stack->addWidget( m_View, EXTENDED );
+{ 
+  // just to make sure but clean it up better FIXME
+  delete m_View;
+  m_View = 0;
+  delete m_boxToolbar;
+  delete m_homeButton;
+  delete m_docButton;
+  delete m_location;
+  delete m_up;
+  delete m_pseudo;
+  delete m_pseudoLayout;
+  m_boxToolbar = 0;
+  m_homeButton = 0;
+  m_docButton = 0;
+  m_location = 0;
+  m_up = 0;
+  m_pseudo = 0;
+  m_pseudoLayout = 0;
+  // time for the toolbar 
+  m_pseudo = new QWidget(m_stack, "Pseudo Widget");
+  m_pseudoLayout = new QVBoxLayout(m_pseudo );
+  if(m_shTool ){
+    m_boxToolbar = new QHBoxLayout( );
+    m_boxToolbar->setAutoAdd( true );
+    m_location = new QComboBox(m_pseudo );
+
+    m_up = new QPushButton(Resource::loadIconSet("up"),"", m_pseudo,"cdUpButton");
+    m_up->setMinimumSize( QSize( 20, 20 ) );
+    m_up->setMaximumSize( QSize( 20, 20 ) );
+    connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP()  ) );
+    m_up->setFlat(TRUE);
+
+    m_homeButton = new QPushButton(Resource::loadIconSet("home") , "", m_pseudo);
+    m_homeButton->setMinimumSize( QSize( 20, 20 ) );
+    m_homeButton->setMaximumSize( QSize( 20, 20 ) );
+    connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) );
+    m_homeButton->setFlat(TRUE);
+
+    m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", m_pseudo,"docsButton");
+    m_docButton->setMinimumSize( QSize( 20, 20 ) );
+    m_docButton->setMaximumSize( QSize( 20, 20 ) );
+    connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) );
+    m_docButton->setFlat(TRUE);
+
+    m_boxToolbar->addWidget(m_location );
+    m_boxToolbar->addWidget(m_up );
+    m_boxToolbar->addWidget(m_homeButton );
+    m_boxToolbar->addWidget(m_docButton );
+    m_pseudoLayout->addLayout(m_boxToolbar );
+    // lets fill the combobox
+    StorageInfo storage;
+    const QList<FileSystem> &fs = storage.fileSystems();
+    QListIterator<FileSystem> it ( fs );
+    for( ; it.current(); ++it ){
+      const QString disk = (*it)->name();
+      const QString path = (*it)->path();
+      m_location->insertItem(path+ "<-"+disk );
+    }
+  };
+  m_View = new QListView(m_pseudo, "Extended view" );
+  m_stack->addWidget( m_pseudo, EXTENDED );
   m_stack->raiseWidget( EXTENDED );
+  m_pseudoLayout->addWidget(m_View );
   QPEApplication::setStylusOperation( m_View->viewport(),QPEApplication::RightOnHold);
   // set up the stuff
@@ -636,4 +773,6 @@ void OFileSelector::initializeListView()
   connect(m_View, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )), 
           this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int  ) ) );
+
+ 
 };
 /* If a item is locked  depends on the mode
@@ -798,4 +937,7 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
 void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int )
 {
+  if (item == 0 )
+    return;
+
   if( button != Qt::RightButton )
     return; 
@@ -806,8 +948,17 @@ void OFileSelector::slotContextMenu(QListViewItem *item)
 {
   qWarning("context menu" );
+  if( item ==0 || !m_showPopup )
+    return;
+ 
   if( m_custom !=0){
     m_custom->exec();
   }else{
     QPopupMenu menu;
+    QAction up;
+    up.setText("cd up");
+    up.addTo( &menu );
+    connect(&up, SIGNAL(activated() ),
+            this, SLOT(cdUP()  ) );
+
     QAction act;
     OFileSelectorItem *sel = (OFileSelectorItem*)item;
@@ -826,5 +977,5 @@ void OFileSelector::slotContextMenu(QListViewItem *item)
     rescan.setText( tr("Rescan")  );
     rescan.addTo( &menu );
-    connect(&act, SIGNAL(activated() ),
+    connect(&rescan, SIGNAL(activated() ),
             this, SLOT(slotRescan() ) );
 
@@ -832,5 +983,5 @@ void OFileSelector::slotContextMenu(QListViewItem *item)
     rename.setText( tr("Rename") );
     rename.addTo( &menu );
-    connect(&act, SIGNAL(activated() ),
+    connect(&rename, SIGNAL(activated() ),
             this, SLOT(slotRename() ) );
 
@@ -839,5 +990,5 @@ void OFileSelector::slotContextMenu(QListViewItem *item)
     delItem.setText( tr("Delete")  );
     delItem.addTo(&menu );
-    connect(&act, SIGNAL(activated() ),
+    connect(&delItem, SIGNAL(activated() ),
             this, SLOT(slotDelete() ) );
 
@@ -896,5 +1047,13 @@ void OFileSelector::slotDelete()
 }
 
-
+void OFileSelector::cdUP()
+{
+  QDir dir( m_currentDir );
+  dir.cdUp();
+  if(dir.exists() ){
+    m_currentDir = dir.absPath();
+    reparse();
+  }
+}
 
 
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 458e552..b91c0ea 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -156,5 +156,6 @@ class OFileSelector : public QWidget {
   void setSelector( int );
   
-
+  bool showPopup()const { return m_showPopup; };
+  void setShowPopup( bool pop ) { m_showPopup = pop; };
   void setPopupMenu( QPopupMenu * );
 
@@ -196,5 +197,5 @@ class OFileSelector : public QWidget {
 
  private:
-int m_mode, m_selector;
+  int m_mode, m_selector;
   QComboBox *m_location, *m_mimeCheck, *m_viewCheck;
   QPushButton *m_homeButton, *m_docButton, *m_hideButton, *m_ok, *m_cancel;
@@ -202,4 +203,6 @@ int m_mode, m_selector;
   QListView *m_View;
   QCheckBox *m_checkPerm;
+  QWidget *m_pseudo;
+  QVBoxLayout *m_pseudoLayout;
 
   QString m_currentDir;
@@ -231,4 +234,5 @@ int m_mode, m_selector;
   bool m_dir:1;
   bool m_files:1;
+  bool m_showPopup:1;
 
   // implementation todo
@@ -263,4 +267,5 @@ private slots:
    virtual void slotRename();
    virtual void slotDelete();
+   virtual void cdUP();
 
 };