Yet more dialog tweaking from Rob.

[lyx.git] / src / frontends / xforms / FormFiledialog.h

diff --git a/src/frontends/xforms/FormFiledialog.h b/src/frontends/xforms/FormFiledialog.h
index 8ba1464a2434fb2820cee67336e3a56b597e8ef3..6e613d745d14540a2cffe208e7a4c78b6f9ee5b8 100644 (file)
--- a/src/frontends/xforms/FormFiledialog.h
+++ b/src/frontends/xforms/FormFiledialog.h
@@ -1,51 +1,61 @@
 // -*- C++ -*-
 /**
  * \file FormFiledialog.h
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author unknown
  * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef FORMFILEDIALOG_H
 #define FORMFILEDIALOG_H
 
-#include <vector>
-#include <sigc++/signal_system.h>
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include <config.h>
-
 #include "LString.h"
-#include FORMS_H_LOCATION
-#include "form_filedialog.h"
+
+#include "forms_fwd.h"
 
 #include "frontends/FileDialog.h"
 
+#include <boost/signals/connection.hpp>
+#include <boost/signals/trackable.hpp>
+
+#include <vector>
+
+class Dialogs;
+
 /// DirEntry internal structure definition
 class DirEntry {
 public:
        ///
-       string pszName;
+       string name_;
        ///
-       string pszDisplayed;
+       string displayed_;
        ///
-       string pszLsEntry;
+       string ls_entry_;
 };
 
-extern "C" void C_LyXFileDlg_FileDlgCB(FL_OBJECT * ob, long data);
-extern "C" void C_LyXFileDlg_DoubleClickCB(FL_OBJECT * ob, long data);
-extern "C" int C_LyXFileDlg_CancelCB(FL_FORM *fl, void *xev);
 
-class FileDialog::Private : public SigC::Object
-{
+//extern "C" {
+//     void C_LyXFileDlg_FileDlgCB(FL_OBJECT * ob, long data);
+//     void C_LyXFileDlg_DoubleClickCB(FL_OBJECT * ob, long data);
+//     int C_LyXFileDlg_CancelCB(FL_FORM *fl, void *xev);
+//}
+
+
+class FD_filedialog;
+
+class FileDialog::Private : public boost::signals::trackable {
 public:
        ///
-       Private();
+       Private(Dialogs &);
        ///
        ~Private();
 
@@ -68,38 +78,35 @@ public:
 
 private:
        /// data
-       static FD_form_filedialog * pFileDlgForm;
+       static FD_filedialog * file_dlg_form_;
        ///
-       static FileDialog::Private * pCurrentDlg;
+       static FileDialog::Private * current_dlg_;
        ///
-       string pszUserPath1;
+       string user_path1_;
        ///
-       string pszUserPath2;
+       string user_path2_;
        ///
-       string pszDirectory;
+       string directory_;
        ///
-       string pszMask;
+       string mask_;
        ///
-       string pszFileName;
+       string file_name_;
        ///
-       int iDepth;
+       int depth_;
        ///
-       int iLastSel;
+       int last_sel_;
        ///
-       long lLastTime;
+       long last_time_;
        ///
-       string pszInfoLine;
+       string info_line_;
        ///
        typedef std::vector<DirEntry> DirEntries;
        ///
-       DirEntries direntries;
+       DirEntries dir_entries_;
        ///
-       bool force_cancel;
+       bool force_cancel_;
        ///
-       bool force_ok;
-
-       /// build the dialog
-       FD_form_filedialog * build_filedialog();
+       bool force_ok_;
 
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xform colors have been re-mapped).
@@ -124,7 +131,7 @@ private:
        /// Simulates a click on OK/Cancel
        void Force(bool);
        /// Redraw connection.
-       SigC::Connection r_;
+       boost::signals::connection r_;
 };
 
 #endif // FORMFILEDIALOG_H