Update my email and status.

[lyx.git] / src / insets / InsetBox.h

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 4f207c28a832dbcb370ab9bc3afb1f932081285c..cf0f689ed135b5f3ad294ea3f08d7e589dd7c2d5 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -15,12 +15,12 @@
 
 #include "InsetCollapsable.h"
 #include "Length.h"
-#include "MailInset.h"
 
 
 namespace lyx {
 
-class InsetBoxParams {
+class InsetBoxParams
+{
 public:
        ///
        InsetBoxParams(std::string const &);
@@ -28,16 +28,19 @@ public:
        void write(std::ostream & os) const;
        ///
        void read(Lexer & lex);
+
        ///
        std::string type;
-       /// Use a parbox (true) or minipage (false)
+       /// Is there a parbox?
        bool use_parbox;
+       /// Is there a makebox?
+       bool use_makebox;
        /// Do we have an inner parbox or minipage to format paragraphs to
        /// columnwidth?
        bool inner_box;
        ///
        Length width;
-       /// "special" widths, see usrguide.dvi §3.5
+       /// "special" widths, see usrguide.dvi §3.5
        std::string special;
        ///
        char pos;
@@ -52,10 +55,16 @@ public:
 };
 
 
-/** The fbox/fancybox inset
 
-*/
-class InsetBox : public InsetCollapsable {
+///////////////////////////////////////////////////////////////////////
+//
+// The fbox/fancybox inset
+//
+///////////////////////////////////////////////////////////////////////
+
+
+class InsetBox : public InsetCollapsable
+{
 public:
        ///
        enum BoxType {
@@ -69,89 +78,81 @@ public:
                Doublebox
        };
        ///
-       InsetBox(Buffer const &, std::string const &);
+       InsetBox(Buffer *, std::string const &);
+
        ///
-       ~InsetBox();
-private:
+       static std::string params2string(InsetBoxParams const &);
        ///
-       friend class InsetBoxParams;
-       friend class InsetBoxMailer;
+       static void string2params(std::string const &, InsetBoxParams &);
        ///
-       docstring editMessage() const;
+       InsetBoxParams const & params() const { return params_; }
+
+       /// \name Public functions inherited from Inset class
+       //@{
        ///
        InsetCode lyxCode() const { return BOX_CODE; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        void write(std::ostream &) const;
        ///
        void read(Lexer & lex);
        ///
-       void setButtonLabel();
-       ///
        void metrics(MetricsInfo &, Dimension &) const;
-       /// show the Box dialog
-       bool showInsetDialog(BufferView * bv) const;
        ///
        DisplayType display() const { return Inline; }
        ///
-       virtual bool allowParagraphCustomization(idx_type = 0)
-               { return forceEmptyLayout(); }
+       ColorCode backgroundColor(PainterInfo const &) const;
+       ///
+       bool allowParagraphCustomization(idx_type = 0) const { return !forcePlainLayout(); }
        ///
-       virtual bool forceEmptyLayout(idx_type = 0) const;
+       bool forcePlainLayout(idx_type = 0) const;
        ///
        bool neverIndent() const { return true; }
        ///
-       bool noFontChange() const { return true; }
+       bool inheritFont() const { return false; }
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       void validate(LaTeXFeatures &) const;
-       ///
-       InsetBoxParams const & params() const { return params_; }
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+       void validate(LaTeXFeatures &) const;
        ///
-       void doDispatch(Cursor & cur, FuncRequest & cmd);
-       /// Is the width forced to some value?
        bool hasFixedWidth() const;
        ///
-       Inset * clone() const { return new InsetBox(*this); }
-       /// used by the constructors
-       void init();
+       std::string contextMenuName() const;
+       //@}
 
+       /// \name Public functions inherited from InsetCollapsable class
+       //@{
        ///
-       InsetBoxParams params_;
-};
-
+       void setButtonLabel();
+       //@}
 
-class InsetBoxMailer : public MailInset {
-public:
-       ///
-       InsetBoxMailer(InsetBox & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
+protected:
+       /// \name Protected functions inherited from Inset class
+       //@{
        ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       static std::string const params2string(InsetBoxParams const &);
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       static void string2params(std::string const &, InsetBoxParams &);
+       Inset * clone() const { return new InsetBox(*this); }
+       //@}
 
 private:
+       /// used by the constructors
+       void init();
+
        ///
-       static std::string const name_;
-       ///
-       InsetBox & inset_;
+       friend class InsetBoxParams;
+       InsetBoxParams params_;
 };
 
-
 } // namespace lyx
 
-#endif // INSET_BOX_H
+#endif // INSETBOX_H