some fixes to prev patch

[lyx.git] / src / frontends / Dialogs.h

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index cf1891294484264d3f5e33144600c29cdecbbae9..df2715107f5b7bae593e86bfc51850db08347e98 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -21,32 +21,35 @@
 #include <vector>
 #include <sigc++/signal_system.h>
 
-using std::vector;
-
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-using SigC::Signal1;
-#endif
-
 #include "LString.h"
+#include "support/utility.hpp"
 
 class DialogBase;
 
 // Maybe this should be a UIFunc modelled on LyXFunc
 class LyXView;
 
-class InsetInclude;
-class InsetIndex;
+class InsetGraphics;
 class InsetBibKey;
-class InsetCitation;
 class InsetBibtex;
+class InsetInclude;
+class InsetIndex;
 class InsetInfo;
+class InsetTabular;
+class InsetCommand;
+
+using std::vector;
+
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Signal0;
+using SigC::Signal1;
+#endif
 
 /** Container of all dialogs and signals a LyXView needs or uses to access them
     The list of dialog signals isn't comprehensive but should be a good guide
     for any future additions.  Remember don't go overboard -- think minimal.
  */
-class Dialogs
+class Dialogs : public noncopyable
 {
 public:
        /**@name Constructors and Deconstructors */
@@ -76,11 +79,13 @@ public:
        ///
        Signal0<void> showLogFile;
        ///
-       Signal0<void> showTable;
+       Signal1<void, InsetTabular *> showTabular;
+       ///
+       Signal1<void, InsetTabular *> updateTabular;
        ///
-       Signal0<void> updateTable; // needed for InsetTabular-Update
+       Signal1<void, InsetTabular *> hideTabular;
        ///
-       Signal0<void> showTableNew;
+       Signal0<void> showTabularCreate;
        ///
        Signal0<void> showCharacter;
        ///
@@ -100,23 +105,31 @@ public:
        ///
        Signal0<void> showPreferences;
        ///
+       Signal1<void, InsetGraphics *> showGraphics;
+       ///
        Signal1<void, InsetInclude *> showInclude;
        ///
        Signal1<void, InsetIndex *> showIndex;
        ///
        Signal1<void, InsetBibKey *> showBibkey;
        ///
-       Signal1<void, InsetCitation *> showCitation;
+       Signal1<void, InsetCommand *> showCitation;
+       ///
+       Signal1<void, string const &> createCitation;
+       ///
+       Signal1<void, InsetCommand *> showTOC;
+       ///
+       Signal1<void, string const &> createTOC;
+       ///
+       Signal1<void, InsetCommand *> showUrl;
+       ///
+       Signal1<void, string const &> createUrl;
        ///
        Signal1<void, InsetBibtex *> showBibtex;
        ///
        Signal1<void, InsetInfo *> showInfo;
        //@}
 private:
-       /// Disallow default constructor
-       Dialogs() {}
-       /// Disallow copy constructor
-       Dialogs(Dialogs &) {}
        ///
        vector<DialogBase *> dialogs_;
 };