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
@@ -60,12 +60,13 @@ class QLineEdit;
 class QLabel;
 class QWidgetStack;
 class QHBoxLayout;
 class QVBoxLayout;
 class QPopupMenu;
 class QFileInfo;
+class QHBox;
 // 
 
 
 class OFileSelector : public QWidget {
   Q_OBJECT
  public:
@@ -78,23 +79,23 @@ class OFileSelector : public QWidget {
 		const QString &fileName = QString::null,
 		const QStringList &mimetypes = QStringList() );
 
 
   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();
   // end deprecated
 
   bool isToolbarVisible() const { return m_shTool;  };
   bool isPermissionBarVisible() const {  return m_shPerm; };
@@ -131,13 +132,13 @@ class OFileSelector : public QWidget {
   void setSelector( int );
   
   bool showPopup()const { return m_showPopup; };
   void setShowPopup( bool pop ) { m_showPopup = pop; };
   void setPopupMenu( QPopupMenu * );
 
-  void updateLay();
+  //  void updateLay();
 
   void reparse(); // re reads the dir
 
   QString selectedName( )const;
   QStringList selectedNames()const;
 
@@ -156,50 +157,53 @@ class OFileSelector : public QWidget {
   void fileSelected( const DocLnk & );
   void fileSelected( const QString & );
   void dirSelected(const QString &dir );
   void closeMe();
   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();
   
  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;
+  QPushButton  *m_reread, *m_up, *m_new, *m_close;
   QListView *m_View;
   QCheckBox *m_checkPerm;
   QWidget *m_pseudo;
   QVBoxLayout *m_pseudoLayout;
 
   QString m_currentDir;
   QString m_name;
-  QStringList m_mimetypes, requestedMimeTypesList;
+  QStringList m_mimetypes;
 
   FileSelector *m_select;
   QWidgetStack *m_stack;
   QVBoxLayout *m_lay;
   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;
 
   QLineEdit *m_edit;
   QLabel *m_fnLabel;
 
@@ -214,21 +218,22 @@ class OFileSelector : public QWidget {
   bool m_autoMime    : 1;
   bool m_case        : 1;
   bool m_dir         : 1;
   bool m_files       : 1;
   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 );
   virtual void addSymlink(const QString &, QFileInfo *, bool = FALSE ){};
   void delItems();
   void initializeName();
   void initializeYes();
   void initializeChooser();
   void initializeListView();
+  void initializePerm();
   void initPics();
   bool compliesMime(const QString &path, const QString &mime);
 
   class OFileSelectorPrivate;
   OFileSelectorPrivate *d;
   static QMap<QString,QPixmap> *m_pixmaps;