1 files changed, 8 insertions, 32 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index c3a3514..7451c1b 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -18,243 +18,244 @@
 ++=   -.     .`     .:       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.
 
 */
 
 #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 <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++ ){
       qWarning("str T%sT  boxT%sT", str.latin1(), box->text(i).latin1() );
       if( str == box->text(i ) ){
 	  index= i;
 	  break;
       }
     }
     return index;
   }
 
 };
 
 
 OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString &dirName,
 			     const QString &fileName, const QStringList &mimetypes ) : QWidget( wid )
 {
-
-  resize(wid->width(),wid->height());
+  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;
 
   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;
 
   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
     initPics();
 
   m_lay = new QVBoxLayout(this);
   init();
   m_edit->setText( fileName );
 }
 void OFileSelector::initPics()
 {
   qWarning("init pics" );
   m_pixmaps = new QMap<QString,QPixmap>;
   QPixmap pm  = Resource::loadPixmap( "folder"  );
   QPixmap lnk = Resource::loadPixmap( "symlink"  );
   QPainter painter( &pm );
   painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
   pm.setMask( pm.createHeuristicMask( FALSE ) );
   m_pixmaps->insert("dirsymlink", pm );
 
   QPixmap pm2 = Resource::loadPixmap( "lockedfolder" );
   QPainter pen(&pm2 );
   pen.drawPixmap(pm2.width()-lnk.width(), pm2.height()-lnk.height(), lnk );
   pm2.setMask( pm2.createHeuristicMask( FALSE ) );
   m_pixmaps->insert("symlinkedlocked", pm2 );
 
 };
 // let's initialize the gui
 /**
    --------------------
    | cmbBox   Button  |
    --------------------
    | FileSlector      |
    |       or         |
    | OSelector        |
    |                  |
    |                  |
    ____________________
    | LineEdit         |
    ____________________
    | Permission Bar   |
    ____________________
    | ViewChoose       |
    ____________________
    | Save       Cancel|
    ____________________
  */
 void OFileSelector::delItems()
 {
   QLayoutIterator it = m_lay->iterator();
   while ( it.current() != 0 ){
     it.deleteCurrent();
   }
 }
 void OFileSelector::init()
 {
 
   m_stack = new QWidgetStack(this, "wstack" );
   if( m_selector == NORMAL ){
     QString currMime;
     if( m_mimeCheck != 0 )
       currMime = m_mimeCheck->currentText();
 
     updateMimes();
     m_select = new FileSelector( currMime == "All" ? QString::null : currMime , m_stack, "fileselector", FALSE, FALSE );
     m_stack->addWidget(m_select, NORMAL );
     m_lay->addWidget(m_stack );
     m_stack->raiseWidget(NORMAL );
     connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) );
+    m_pseudoLayout = 0l;
   }else {
     initializeListView();
   }
 
   if(m_shLne ){ 
     initializeName();
   }
 
   if(m_shPerm ){
     m_checkPerm = new QCheckBox(tr("Set Permission"), this, "Permission" );
     m_checkPerm->setChecked( false );
     m_lay->addWidget(m_checkPerm ); 
   }
 
   if( m_shChooser )
     initializeChooser();
 
   if(m_shYesNo )
     initializeYes();
  
   
 };
 
 void OFileSelector::setYesCancelVisible( bool show )
 {
   if ( show == m_shYesNo )
     return;
   m_shYesNo = show;
   if( !show ){
     delete m_ok;
     delete m_cancel; 
     m_ok = 0;
     m_cancel = 0;
     // delete m_boxOk; all ready deleted in delItems
   }
   updateLay(); // recreate it and save the other states
 }
 
 void OFileSelector::setToolbarVisible( bool show )
 {
   if ( m_shTool == show )
     return;
   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
 }
 
 void OFileSelector::setPermissionBarVisible( bool show )
 {
   if( show == m_shPerm )
     return;
 
   m_shPerm = show;
 
@@ -534,235 +535,210 @@ void OFileSelector::initializeYes()
   m_boxOk->insertSpacing(1, 8 );
   m_boxOk->addWidget( m_cancel, Qt::AlignHCenter);
   m_lay->addLayout(m_boxOk );
   connect(m_ok, SIGNAL(clicked() ),
 	  this, SLOT(slotOk() )  );
   connect(m_cancel, SIGNAL(clicked() ),
 	  this, SLOT(slotCancel() )  );
 
 }
 void OFileSelector::initializeChooser()
 {
   m_boxView = new QHBoxLayout(this );
 
   m_mimeCheck = new QComboBox(this, "mime check");
   m_viewCheck = new QComboBox(this, "view check");
   m_boxView->addWidget(m_viewCheck, 0 );
   m_boxView->insertSpacing(1, 8 );
   m_boxView->addWidget(m_mimeCheck, 0 );
   m_lay->addLayout(m_boxView );
 
   m_viewCheck->insertItem(tr("Documents") );
   m_viewCheck->insertItem(tr("Files") );
   m_viewCheck->insertItem(tr("All Files") );
 
   if(!m_autoMime )
     m_mimeCheck->insertItem(m_mimetypes.join("," ) );
   else{ // check
     updateMimes();
     m_mimeCheck->insertStringList( m_mimetypes );
   }
 
   connect( m_viewCheck, SIGNAL(activated(const QString &) ),
 	   this, SLOT(slotViewCheck(const QString & ) ) );
 
   connect( m_mimeCheck, SIGNAL(activated(const QString &) ),
 	   this, SLOT(slotMimeCheck(const QString & ) ) );
 }
 void OFileSelector::slotMimeCheck(const QString &view ){
   if(m_selector == NORMAL ){
     delete m_select;
     m_select = new FileSelector(view == "All" ? QString::null : view 
 				, m_stack, "fileselector", FALSE, FALSE );
     m_stack->addWidget( m_select, NORMAL );
     m_stack->raiseWidget( NORMAL );
   }else{
     reparse();
   }
 }
 
 void OFileSelector::slotViewCheck(const QString &view ){
   qWarning("changed: show %s", view.latin1() );
   // if the current view is the one
   QString currMime = m_mimeCheck->currentText();
   if( view == QString::fromLatin1("Documents") ){
     // 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 :( 
       delete m_View;
       delete m_boxToolbar;
       delete m_homeButton;
       delete m_docButton;
       delete m_location;
       delete m_up;
       delete m_pseudo;
-      delete m_pseudoLayout;
+      if(m_pseudoLayout!=0 )
+	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,
 				 m_stack,"fileselector", FALSE, FALSE );
     m_stack->addWidget( m_select, NORMAL );
     m_mimeCheck->clear();
     m_selector = NORMAL;
     updateMimes();
     m_mimeCheck->insertStringList( m_mimetypes );
     m_stack->raiseWidget( NORMAL );
     connect(m_select, SIGNAL(fileSelected( const DocLnk &) ), this, SLOT(slotFileBridgeSelected(const DocLnk &) ) );    
 
   }else if(view == QString::fromLatin1("Files") ){
     // remove from the stack
     delete m_select;
     m_select = 0;
     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
     initializeListView();
 
     reparse();
   }else if(view == QString::fromLatin1("All Files") ) {
     // remove from the stack
     delete m_select;
     m_select = 0;
     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();
     reparse();
   };
 };
 
 
 void OFileSelector::updateMimes() // lets check which mode is active
   // check the current dir for items then
 {
   m_mimetypes.clear();
   m_mimetypes.append("All" );
   if( m_selector == NORMAL ){
     DocLnkSet set;
     Global::findDocuments(&set, QString::null );
     QListIterator<DocLnk> dit( set.children() );
     for ( ; dit.current(); ++dit ) {
       if( !m_mimetypes.contains((*dit)->type()  ) )
       m_mimetypes.append( (*dit)->type() );
     }
   }else{
     // should be allreday updatet
     ;
   }
 };
 void OFileSelector::initializeListView()
 { 
   // 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;
+  if(m_pseudoLayout!=0 ) // why did you overload malloc
+    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 );
     }
     int count = m_location->count();
     m_location->insertItem(m_currentDir );
     m_location->setCurrentItem( count );
   };
   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
   // Pixmap Name Date Size mime
   //(m_View->header() )->hide();
   //m_View->setRootIsDecorated(false);
   m_View->addColumn(" ");
   m_View->addColumn(tr("Name") );
   m_View->addColumn(tr("Size") );
   m_View->addColumn(tr("Date"), 60 );