merge controllers/Makefile.am and controllers/tests/Makefile.am

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

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 1c6372d3063114d487a8f0509550cd46edff9874..f179ec56d71e0b3fddc5dc7689e3c52a9bc8fd4b 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -3,7 +3,9 @@
  * \file Dialogs.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
+ *
  * \author Allan Rae
+ * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,34 +13,33 @@
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
+#include <boost/signal.hpp>
 #include <boost/utility.hpp>
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/signal1.hpp>
 
-class Dialog;
-class InsetBase;
+#include <map>
+
+namespace lyx {
+
+class Inset;
 class LyXView;
 
-/** 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.
+namespace frontend { class Dialog; }
+
+/** Container of all dialogs.
  */
-class Dialogs : boost::noncopyable
-{
+class Dialogs : boost::noncopyable {
 public:
        ///
        Dialogs(LyXView &);
 
-       /** Redraw all visible dialogs because, for example, the GUI colours
-        *  have been re-mapped.
+       /** Check the status of all visible dialogs and disable or reenable
+        *  them as appropriate.
         *
-        *  Note that static boost signals break some compilers, so we return a
-        *  reference to some hidden magic ;-)
+        *  Disabling is needed for example when a dialog is open and the
+        *  cursor moves to a position where the corresponding inset is not
+        *  allowed.
         */
-       static boost::signal0<void> & redrawGUI();
-
-       /// Toggle tooltips on/off in all dialogs.
-       static void toggleTooltips();
+       void checkStatus();
 
        /// Are the tooltips on or off?
        static bool tooltipsEnabled();
@@ -72,46 +73,52 @@ public:
            dialog on 'Apply'; should it be used to create a new inset at
            the current cursor position or modify an existing, 'open' inset?
        */
-       void show(std::string const & name, std::string const & data, InsetBase * inset);
+       void show(std::string const & name, std::string const & data, Inset * inset);
 
        /** \param name == "citation", "bibtex" etc; an identifier used
-           to update the contents of a particular dialog with \param data .
+           to update the contents of a particular dialog with \param data.
            See the comments to 'show', above.
        */
        void update(std::string const & name, std::string const & data);
 
-       /// is the dialog currently visible?
+       /// Is the dialog currently visible?
        bool visible(std::string const & name) const;
 
        /** All Dialogs of the given \param name will be closed if they are
            connected to the given \param inset.
        */
-       static void hide(std::string const & name, InsetBase * inset);
+       void hide(std::string const & name, Inset * inset);
        ///
        void disconnect(std::string const & name);
        ///
-       InsetBase * getOpenInset(std::string const & name) const;
+       Inset * getOpenInset(std::string const & name) const;
 private:
-       ///
-       void hideSlot(std::string const & name, InsetBase * inset);
        ///
        void redraw() const;
        ///
        bool isValidName(std::string const & name) const;
        ///
-       Dialog * find_or_build(std::string const & name);
+       frontend::Dialog * find_or_build(std::string const & name);
        ///
-       typedef boost::shared_ptr<Dialog> DialogPtr;
+       typedef boost::shared_ptr<frontend::Dialog> DialogPtr;
        ///
        DialogPtr build(std::string const & name);
 
        ///
        LyXView & lyxview_;
        ///
-       std::map<std::string, InsetBase *> open_insets_;
+       std::map<std::string, Inset *> open_insets_;
 
        ///
        std::map<std::string, DialogPtr> dialogs_;
+
+       /// flag against a race condition due to multiclicks in Qt frontend, see bug #1119
+       bool in_show_;
+
+       ///
+       boost::signals::connection connection_;
 };
 
+} // namespace lyx
+
 #endif