1 files changed, 22 insertions, 17 deletions

diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index 5c38ac4..47697b9 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -64,4 +64,5 @@ class QVBoxLayout;
 class QPopupMenu;
 class QFileInfo;
+class QHBox;
 // 
 
@@ -82,15 +83,15 @@ class OFileSelector : public QWidget {
   OFileSelector(const QString &mimeFilter, QWidget *parent,
                 const char *name, bool newVisible = TRUE,
-                bool closeVisible = FALSE ) { };
+                bool closeVisible = FALSE );
 
-  ~OFileSelector() {};
+  ~OFileSelector();
 
   // currently only for the FILESELECTOR Mode
-  void setNewVisible( bool /*b*/ ) { };
-  void setCloseVisible(bool /*b*/ ) { };
+  void setNewVisible( bool /*b*/ );
+  void setCloseVisible(bool /*b*/ );
 
   // end file selector mode
   // deprecated
-  void reread() { reparse(); };
+  void reread();
   // make sure not to leak please
   const DocLnk *selected();
@@ -135,5 +136,5 @@ class OFileSelector : public QWidget {
   void setPopupMenu( QPopupMenu * );
 
-  void updateLay();
+  //  void updateLay();
 
   void reparse(); // re reads the dir
@@ -160,14 +161,17 @@ class OFileSelector : public QWidget {
   void ok();
   void cancel();
+  void contextMenu();
 
- protected slots:
+ private slots:
+   void slotTest() { qWarning("slotTest" ); setLineEditVisible(false );  };
   void slotOk();
   void slotCancel();
   void slotViewCheck(const QString & );
   void slotMimeCheck(const QString & );
-  void locationComboActivated(const QString & );
-  void insertLocationPath(const QString &, int);
+  void slotLocationActivated(const QString & );
+  void slotInsertLocationPath(const QString &, int);
   void locationComboChanged();
- protected:
+
+ private:
   void init();
   void updateMimes();
@@ -179,5 +183,5 @@ class OFileSelector : public QWidget {
   QComboBox *m_location, *m_mimeCheck, *m_viewCheck;
   QPushButton *m_homeButton, *m_docButton, *m_hideButton, *m_ok, *m_cancel;
-  QPushButton  *m_reread, *m_up;
+  QPushButton  *m_reread, *m_up, *m_new, *m_close;
   QListView *m_View;
   QCheckBox *m_checkPerm;
@@ -187,5 +191,5 @@ class OFileSelector : public QWidget {
   QString m_currentDir;
   QString m_name;
-  QStringList m_mimetypes, requestedMimeTypesList;
+  QStringList m_mimetypes;
 
   FileSelector *m_select;
@@ -194,8 +198,8 @@ class OFileSelector : public QWidget {
   QGridLayout *m_Oselector;
 
-  QHBoxLayout *m_boxToolbar;
-  QHBoxLayout *m_boxOk;
-  QHBoxLayout *m_boxName;
-  QHBoxLayout *m_boxView;
+  QHBox *m_boxToolbar;
+  QHBox *m_boxOk; // (no layout anymore) wait
+  QHBox *m_boxName; // (no Layout anymore) wait
+  QHBox *m_boxView;
 
   QPopupMenu *m_custom;
@@ -218,5 +222,5 @@ class OFileSelector : public QWidget {
   bool m_showPopup   : 1;
 
-  // implementation todo
+  void initVars();
   virtual void addFile(const QString &mime, QFileInfo *info, bool symlink = FALSE );
   virtual void addDir( const QString &mime, QFileInfo *info , bool symlink = FALSE );
@@ -227,4 +231,5 @@ class OFileSelector : public QWidget {
   void initializeChooser();
   void initializeListView();
+  void initializePerm();
   void initPics();
   bool compliesMime(const QString &path, const QString &mime);