more functionality

3 files changed, 233 insertions, 12 deletions

diff --git a/libopie/TODO b/libopie/TODO
new file mode 100644
index 0000000..c1bf6d1
--- a/dev/null
+++ b/libopie/TODO
@@ -0,0 +1,17 @@
+- xmltree done
+
+- tododb
+   - set Alarms
+   - multiple categories
+   - Attendees
+   
+- OFileSelector
+   - DocLnk when not in Document Mode
+   - TreeView have a own OFileSelectorItem for this
+   - IconView add a QIconView to the widgetstack
+   - Move OFileSelectorItem to it's own files
+   - add functions to access the member variables
+   - debug
+   
+- Clickable labels?
+   Harlekin you wanted them in the libs?
\ No newline at end of file
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 128292f..b583125 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -34,24 +34,31 @@
 #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 <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;
@@ -106,16 +113,17 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString
 
   m_fnLabel = 0;
   m_checkPerm = 0;
   m_mimeCheck = 0;
   m_viewCheck = 0;
 
   m_dir = true;
   m_files = true;
+  m_custom = 0;
 
   if(m_pixmaps == 0 ) // init the pixmaps
     initPics();
 
   m_lay = new QVBoxLayout(this);
   init();
   m_edit->setText( fileName );
 }
@@ -173,16 +181,17 @@ void OFileSelector::init()
     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 &) ) );
   }else {
     initializeListView();
   }
 
   if(m_shLne ){ 
     initializeName();
   }
 
@@ -272,20 +281,20 @@ void OFileSelector::setCaseSensetive( bool caSe )
 {
   m_case = caSe;
   reparse();
 }
 void OFileSelector::setShowFiles(bool files ){
   m_files = files;
   reparse();
 }
-void OFileSelector::setPopupMenu(const QPopupMenu * )
+void OFileSelector::setPopupMenu(QPopupMenu *pop )
 {
   //delete oldpopup;
-
+  m_custom = pop;
 }
 bool OFileSelector::setPermission( ) const
 {
   if( m_checkPerm == 0 )
     return false;
   else
     return m_checkPerm->isChecked(); 
 }
@@ -552,17 +561,17 @@ void OFileSelector::slotViewCheck(const QString &view ){
     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;
     m_selector = EXTENDED;
@@ -614,16 +623,23 @@ void OFileSelector::initializeListView()
   m_View->addColumn(" ");
   m_View->addColumn(tr("Name") );
   m_View->addColumn(tr("Size") );
   m_View->addColumn(tr("Date"), 60 );
   m_View->addColumn(tr("Mime Type") );
   QHeader *header = m_View->header();
   header->hide();
   m_View->setSorting(1 );
+  // connect now
+  connect(m_View, SIGNAL(selectionChanged() ), this, SLOT(slotSelectionChanged() ) );
+  connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), this, SLOT(slotCurrentChanged(QListViewItem * ) ) );
+  connect(m_View, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ), 
+          this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) );
+  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
    if we're in OPEN !isReadable is locked
    if we're in SAVE !isWriteable is locked
 
 
  */
 
@@ -671,17 +687,17 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink )
                          dir, locked ); 
 }
 void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink  )
 {
   if(!m_dir )
     return;
   //if( showDirs )
   {
-    bool locked;
+    bool locked=false;
     QString name;
     QPixmap pix;
     if( ( m_mode == OPEN && !info->isReadable() ) || ( m_mode == SAVE && !info->isWritable()  ) ){
       locked = true;
       if( symlink ){
         pix = (*m_pixmaps)["symlinkedlocked"];
       }else{
         pix = Resource::loadPixmap("lockedfolder"  );
@@ -708,10 +724,177 @@ void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink  )
   }
 }
 void OFileSelector::setShowDirs(bool dir )
 {
   m_dir = dir;
   reparse();
 }
 
+void OFileSelector::slotFileSelected(const QString &string )
+{
+  if(m_shLne )
+    m_edit->setText( string );
+
+  emit fileSelected( string );
+  // do AppLnk stuff
+} 
+void OFileSelector::slotFileBridgeSelected( const DocLnk &lnk )
+{
+  slotFileSelected(lnk.name() );
+  emit fileSelected( lnk );
+}
+void OFileSelector::slotSelectionChanged() // get the current items
+  // fixme
+{
+  qWarning("selection changed" );
+}
+void OFileSelector::slotCurrentChanged(QListViewItem *item )
+{
+  qWarning("current changed" );
+  if( item == 0 )
+    return;
+
+  if( m_selector == EXTENDED || m_selector == EXTENDED_ALL ){
+    OFileSelectorItem *sel = (OFileSelectorItem*)item;
+    if(!sel->isDir() ){
+      qWarning("is not dir" );
+      if(m_shLne ){
+        m_edit->setText(sel->text(1) );
+        qWarning("setTexy" );
+      }
+    }
+  }else {
+    qWarning("mode not extended" );
+  }
+}
+// either select or change dir
+void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &point, int )
+{
+  if( item == 0 )
+    return;
+
+  if( button != Qt::LeftButton )
+    return; 
+
+ qWarning("clicked" );
+  if(m_selector == EXTENDED || m_selector == EXTENDED_ALL ){
+    qWarning("inside" );
+    OFileSelectorItem *sel = (OFileSelectorItem*)item;
+    if(!sel->isLocked() ){ // not locked either changedir or open
+      QStringList str = QStringList::split("->", sel->text(1) );
+      if(sel->isDir() ){
+        cd( sel->directory() + "/" + str[0] );     
+      }else{
+        qWarning("file" );
+        if(m_shLne )
+          m_edit->setText(str[0] );
+        emit fileSelected(str[0] );
+        // emit DocLnk need to do it
+      }
+    }else{
+      qWarning( "locked" );
+    }
+  };
+}
+void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int )
+{
+  if( button != Qt::RightButton )
+    return; 
+  qWarning("right button" );
+  slotContextMenu(item);
+}
+void OFileSelector::slotContextMenu(QListViewItem *item)
+{
+  qWarning("context menu" );
+  if( m_custom !=0){
+    m_custom->exec();
+  }else{
+    QPopupMenu menu;
+    QAction act;
+    OFileSelectorItem *sel = (OFileSelectorItem*)item;
+    if(sel->isDir() ){
+      act.setText( tr("Change Directory") );
+      act.addTo(&menu );
+      connect(&act, SIGNAL(activated() ),
+              this, SLOT(slotChangedDir() ) );
+    }else{
+      act.setText( tr("Open file" )  );
+      act.addTo( &menu );
+      connect(&act, SIGNAL(activated() ),
+              this, SLOT(slotOpen() ) );
+    }
+    QAction rescan;
+    rescan.setText( tr("Rescan")  );
+    rescan.addTo( &menu );
+    connect(&act, SIGNAL(activated() ),
+            this, SLOT(slotRescan() ) );
+
+    QAction rename;
+    rename.setText( tr("Rename") );
+    rename.addTo( &menu );
+    connect(&act, SIGNAL(activated() ),
+            this, SLOT(slotRename() ) );
+
+    menu.insertSeparator();
+    QAction delItem;
+    delItem.setText( tr("Delete")  );
+    delItem.addTo(&menu );
+    connect(&act, SIGNAL(activated() ),
+            this, SLOT(slotDelete() ) );
+
+    menu.exec(QCursor::pos() );
+  }
+}
+bool OFileSelector::cd(const QString &str )
+{
+  qWarning(" dir %s", str.latin1() );
+  QDir dir( str);
+  if(dir.exists() ){
+    m_currentDir = str;
+    reparse();
+    return true;
+  }
+  return false;
+}
+
+void OFileSelector::slotChangedDir()
+{
+  OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
+  if(sel->isDir() ){
+    QStringList str = QStringList::split("->", sel->text(1) );
+    cd( sel->directory() + "/" + str[0] );
+  }
+}
+void OFileSelector::slotOpen()
+{
+  OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
+  if(!sel->isDir() ){
+    QStringList str = QStringList::split("->", sel->text(1) );
+    slotFileSelected( str[0] );
+  }
+}
+void OFileSelector::slotRescan()
+{
+  reparse();
+}
+void OFileSelector::slotRename()
+{
+  // rename inline
+}
+void OFileSelector::slotDelete()
+{
+  qWarning("delete slot" );
+  OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
+  QStringList list = QStringList::split("->", sel->text(1) );
+  if( sel->isDir() ){
+    QString str = QString::fromLatin1("rm -rf ") + list[0];
+    ::system(str.utf8().data() );
+  }else{
+    QFile::remove( list[0] );
+  }
+  m_View->takeItem( sel );
+  delete sel;
+}
+
+
 
 
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 6936773..458e552 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -73,17 +73,17 @@ class OFileSelectorItem : public QListViewItem {
     setText(1, path );
     setText(2, size );
     setText(3, date );
     //setText(4, mDir );
     m_dir = mDir;
     dir = isDir;
     mLocked = isLocked;
   }
-  bool locked() const{
+  bool isLocked() const{
     return mLocked;
   }
   QString directory()const{
     return m_dir;
   }
   bool isDir()const{
     return dir;
   }
@@ -143,25 +143,25 @@ class OFileSelector : public QWidget {
 
   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 );
   
 
-  void setPopupMenu( const QPopupMenu * );
+  void setPopupMenu( QPopupMenu * );
 
   void updateLay();
 
   void reparse(); // re reads the dir
 
   QString selectedName( )const;
   QStringList selectedNames()const;
 
@@ -186,17 +186,21 @@ class OFileSelector : public QWidget {
  protected slots:
   void slotOk();
   void slotCancel();
   void slotViewCheck(const QString & );
   void slotMimeCheck(const QString & );
  protected:
   void init();
   void updateMimes();
-  int m_mode, m_selector;
+  
+ protected:
+
+ private:
+int m_mode, m_selector;
   QComboBox *m_location, *m_mimeCheck, *m_viewCheck;
   QPushButton *m_homeButton, *m_docButton, *m_hideButton, *m_ok, *m_cancel;
   QPushButton  *m_reread, *m_up;
   QListView *m_View;
   QCheckBox *m_checkPerm;
 
   QString m_currentDir;
   QString m_name;
@@ -207,43 +211,60 @@ class OFileSelector : public QWidget {
   QVBoxLayout *m_lay;
   QGridLayout *m_Oselector;
 
   QHBoxLayout *m_boxToolbar;
   QHBoxLayout *m_boxOk;
   QHBoxLayout *m_boxName;
   QHBoxLayout *m_boxView;
 
+  QPopupMenu *m_custom;
+
   QLineEdit *m_edit;
   QLabel *m_fnLabel;
   bool m_shTool:1;
   bool m_shPerm:1;
   bool m_shLne:1;
   bool m_shChooser:1;
   bool m_shYesNo:1;
   bool m_boCheckPerm:1;
   bool m_autoMime:1;
   bool m_case:1;
   bool m_dir:1;
   bool m_files:1;
 
- protected:
-
- private:
   // implementation todo
   virtual void addFile(const QString &mime, QFileInfo *info, bool symlink = FALSE );
   virtual void addDir( const QString &mime, QFileInfo *info , bool symlink = FALSE );
-  virtual void addSymlink(const QString &mime, QFileInfo *info, bool broken = FALSE ){};
+  virtual void addSymlink(const QString &, QFileInfo *, bool = FALSE ){};
   void delItems();
   void initializeName();
   void initializeYes();
   void initializeChooser();
   void initializeListView();
   void initPics();
   bool compliesMime(const QString &path, const QString &mime);
 
   class OFileSelectorPrivate;
   OFileSelectorPrivate *d;
   static QMap<QString,QPixmap> *m_pixmaps;
+ 
+private slots:
+   void slotFileSelected(const QString & ); // not really meant to be a slot
+   void slotFileBridgeSelected( const DocLnk & );
+   virtual void slotSelectionChanged();
+   virtual void slotCurrentChanged(QListViewItem* );
+   virtual void slotClicked( int, QListViewItem *item, const QPoint &, int);
+   virtual void slotRightButton(int, QListViewItem *, const QPoint &, int );
+   virtual void slotContextMenu( QListViewItem *item);
+   // listview crap see above
+   // PopupMenu crap
+   virtual void slotChangedDir();
+   virtual void slotOpen();
+   virtual void slotRescan();
+   virtual void slotRename();
+   virtual void slotDelete();
+
 };
 
 
 #endif
+