remove all trace of editMessage

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30585 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 86a6040ddd73a1ecf99238ead1c440133b1a0935..9afae918a616956b44f6ec1e76abb63800c1118f 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -377,12 +377,6 @@ bool Inset::autoDelete() const
 }
 
 
-docstring Inset::editMessage() const
-{
-       return _("Opened inset");
-}
-
-
 void Inset::cursorPos(BufferView const & /*bv*/, CursorSlice const &,
                bool, int & x, int & y) const
 {

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index f932c0aee36027d5cb79c0c9b01e7ca24ce04aca..ddbb5ac3f0bb9ebebce460515e9470b145194098 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -299,8 +299,6 @@ public:
        /// the string that is passed to the TOC
        virtual void tocString(odocstream &) const {}
 
-       /// what appears in the minibuffer when opening
-       virtual docstring editMessage() const;
        /// can the contents of the inset be edited on screen ?
        // true for InsetCollapsables (not ButtonOnly) (not InsetInfo), InsetText
        virtual bool editable() const;

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index ecf9f4fb94e4423686d2d76fa5bff81d7b7bafc3..5ad4aeda5e3b9ce5d2057a9b9ba2fd56055b5dd8 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -107,12 +107,6 @@ InsetBox::~InsetBox()
 }
 
 
-docstring InsetBox::editMessage() const
-{
-       return _("Opened Box Inset");
-}
-
-
 docstring InsetBox::name() const 
 {
        // FIXME: UNICODE

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index df61656c45c0b56edb20331b1b67b2427d121f4b..183f54ebcb28dec89cc397d31020c358171c1c30 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -87,8 +87,6 @@ private:
        ///
        friend class InsetBoxParams;
        ///
-       docstring editMessage() const;
-       ///
        InsetCode lyxCode() const { return BOX_CODE; }
        ///
        docstring name() const;

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 17960a2344dbf7382babff9d58d156dacfe1d7f1..12ae7fdcffb97df7e8ae47b54f6a69b2c03234ea 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -51,12 +51,6 @@ InsetBranch::~InsetBranch()
 }
 
 
-docstring InsetBranch::editMessage() const
-{
-       return _("Opened Branch Inset");
-}
-
-
 void InsetBranch::write(ostream & os) const
 {
        params_.write(os);

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 9acbb8de9bf979b4a72ad1ffcf5cb7d17c2688ea..cf791a3cd01bcd65ce3d5ff0321ab2957d68a4f7 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -57,8 +57,6 @@ public:
        void rename(docstring const & newname) { params_.branch = newname; }
 
 private:
-       ///
-       docstring editMessage() const;
        ///
        InsetCode lyxCode() const { return BRANCH_CODE; }
        ///

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index f3dbc5808a9ac55b0a1f53c6fb357313860ce689..87888c0fdf8f89d8fbb2d504b6305cf7ce0cfb5f 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -76,12 +76,6 @@ void InsetCaption::read(Lexer & lex)
 }
 
 
-docstring InsetCaption::editMessage() const
-{
-       return _("Opened Caption Inset");
-}
-
-
 void InsetCaption::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
 {

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 5379b171bc0d1f3b680615070cb610dfd633dba5..acbd7c9ea91ef6265ee74854ea7cae65162ca132 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -44,8 +44,6 @@ private:
        ///
        InsetCode lyxCode() const { return CAPTION_CODE; }
        ///
-       docstring editMessage() const;
-       ///
        void cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const;
        ///

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 5a2e9b67dd58c7f651b024ff23fdf77de08f0582..5a253c8d9d1553c3ef32ea92ed5d1195f4ea5299 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -49,6 +49,29 @@ using namespace std;
 
 namespace lyx {
 
+InsetCollapsable::InsetCollapsable(Buffer const & buf, InsetText::UsePlain ltype)
+       : InsetText(buf, ltype), status_(Inset::Open),
+         openinlined_(false), mouse_hover_(false)
+{
+       setAutoBreakRows(true);
+       setDrawFrame(true);
+       setFrameColor(Color_collapsableframe);
+}
+
+
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
+       : InsetText(rhs),
+         status_(rhs.status_),
+         labelstring_(rhs.labelstring_),
+         button_dim(rhs.button_dim),
+         openinlined_(rhs.openinlined_),
+         auto_open_(rhs.auto_open_),
+         // the sole purpose of this copy constructor
+         mouse_hover_(false)
+{
+}
+
+
 InsetCollapsable::CollapseStatus InsetCollapsable::status(BufferView const & bv) const
 {
        if (decoration() == InsetLayout::CONGLOMERATE)
@@ -105,29 +128,6 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 }
 
 
-InsetCollapsable::InsetCollapsable(Buffer const & buf, InsetText::UsePlain ltype)
-       : InsetText(buf, ltype), status_(Inset::Open),
-         openinlined_(false), mouse_hover_(false)
-{
-       setAutoBreakRows(true);
-       setDrawFrame(true);
-       setFrameColor(Color_collapsableframe);
-}
-
-
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
-       : InsetText(rhs),
-         status_(rhs.status_),
-         labelstring_(rhs.labelstring_),
-         button_dim(rhs.button_dim),
-         openinlined_(rhs.openinlined_),
-         auto_open_(rhs.auto_open_),
-         // the sole purpose of this copy constructor
-         mouse_hover_(false)
-{
-}
-
-
 docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 {
        Dimension dim = dimensionCollapsed(bv);

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 90c595191b7dec6f030153e407e8d389867dd492..4c396a1b9d964192df985a14a77840dc0c68e82d 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -63,12 +63,6 @@ void InsetERT::write(ostream & os) const
 }
 
 
-docstring InsetERT::editMessage() const
-{
-       return _("Opened ERT Inset");
-}
-
-
 int InsetERT::plaintext(odocstream &, OutputParams const &) const
 {
        return 0; // do not output TeX code

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 494f53e929b1216290b4d29fb45ef39a6092f81a..f6df3da8b9042332438fd86681be6f1d6f5c2fe6 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -47,8 +47,6 @@ private:
        ///
        void write(std::ostream & os) const;
        ///
-       docstring editMessage() const;
-       ///
        bool insetAllowed(InsetCode code) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index be730417410f3ccdabd49580de057f2bf7e52c29..76b338004d3e7115b8e433de1e7f41ec07389286 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -46,12 +46,6 @@ InsetLayout::InsetDecoration InsetFlex::decoration() const
 }
 
 
-docstring InsetFlex::editMessage() const
-{
-       return _("Opened Flex Inset");
-}
-
-
 void InsetFlex::write(ostream & os) const
 {
        os << "Flex " <<

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index 9e2ed16f741608a8f106a97b9db99654fc980b02..ee52e4729c111c1f31c26cb4daf790e347a9c890 100644 (file)
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -27,8 +27,6 @@ public:
        ///
        docstring name() const { return from_utf8(name_); }
        ///
-       docstring editMessage() const;
-       ///
        InsetCode lyxCode() const { return FLEX_CODE; }
        /// Default looks
        InsetLayout::InsetDecoration decoration() const;

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index d70d356e7f30af7e2892ff7d558a4ad7c9051e18..5d27f29bea24e94b4243eb31977180da2e57c064 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -274,12 +274,6 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetFloat::editMessage() const
-{
-       return _("Opened Float Inset");
-}
-
-
 docstring InsetFloat::xhtml(odocstream & os, OutputParams const & rp) const
 {
        FloatList const & floats = buffer().params().documentClass().floats();

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 9ef3dcd9a98c64d25dd7a37eb90e9010bbb5fd59..2abc5654fde06c6e09f89eec4d6b941e4049abbb 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -91,8 +91,6 @@ private:
        ///
        docstring xhtml(odocstream &, OutputParams const &) const;
        ///
-       docstring editMessage() const;
-       ///
        bool insetAllowed(InsetCode) const;
        /** returns true if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index d0d432b5fdbbf7f4af0341d86d80cad3cb091bcd..c5ecf4879b232f442181a48235b35e4c6c38e9ea 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -39,12 +39,6 @@ InsetFoot::InsetFoot(Buffer const & buf)
 {}
 
 
-docstring InsetFoot::editMessage() const
-{
-       return _("Opened Footnote Inset");
-}
-
-
 void InsetFoot::updateLabels(ParIterator const & it)
 {
        BufferParams const & bp = buffer().masterBuffer()->params();

diff --git a/src/insets/InsetFoot.h b/src/insets/InsetFoot.h
index a2c1b7421c9aa73aafbb09359c5a07cf90791f8f..bba24100673490b3542eab06d465380f970c16e1 100644 (file)
--- a/src/insets/InsetFoot.h
+++ b/src/insets/InsetFoot.h
@@ -37,8 +37,6 @@ private:
        int plaintext(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
-       ///
-       docstring editMessage() const;
        /// Update the counters of this inset and of its contents
        void updateLabels(ParIterator const &);
        ///

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 42f02825b800244a9403f87d7df126689bae31a0..8c2898d354bc9818adc3ed840e0b8c0dfd2bb9df 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -123,12 +123,6 @@ void InsetListings::read(Lexer & lex)
 }
 
 
-docstring InsetListings::editMessage() const
-{
-       return _("Opened Listing Inset");
-}
-
-
 int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
 {
        string param_string = params().params();

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index 51a3f7022c364eb472bbeaaef14642b27156190e..fcf16726ea68054c7dcb3c343742f1926d456582 100644 (file)
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -53,8 +53,6 @@ private:
        ///
        void read(Lexer & lex);
        ///
-       docstring editMessage() const;
-       ///
        int latex(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(odocstream &, OutputParams const &) const;

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 2dbd9e33831c5b95cd1a994dc62d3e6b8a2c64a9..b4e6e8b39e2a3e53c564d3ed18e68c7b4bda940b 100644 (file)
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -29,12 +29,6 @@ InsetMarginal::InsetMarginal(Buffer const & buf)
 {}
 
 
-docstring InsetMarginal::editMessage() const
-{
-       return _("Opened Marginal Note Inset");
-}
-
-
 int InsetMarginal::plaintext(odocstream & os,
                             OutputParams const & runparams) const
 {

diff --git a/src/insets/InsetMarginal.h b/src/insets/InsetMarginal.h
index 249f083afaa9df820e17040b06c3be27624020ed..8c64fed8557d9b89fcefe280754b519429463524 100644 (file)
--- a/src/insets/InsetMarginal.h
+++ b/src/insets/InsetMarginal.h
@@ -35,8 +35,6 @@ public:
        ///
        int docbook(odocstream &, OutputParams const & runparams) const;
        ///
-       docstring editMessage() const;
-       ///
        void addToToc(DocIterator const &);
 private:
        ///

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 4cbe6172bc9238b72591ea9ad469f4c84c61fba1..862f77f88e69608617a5836a26c5067cf8ed72f9 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -128,12 +128,6 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::editMessage() const
-{
-       return _("Opened Note Inset");
-}
-
-
 docstring InsetNote::name() const 
 {
        return from_ascii("Note:" + notetranslator().find(params_.type));

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index dd4cddaacaa9aaf1c8e4475155f97ff8fdd1ec66..98238496cb36f6f765081c3f57ce193a530c3816 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -57,8 +57,6 @@ public:
        ///
        InsetNoteParams const & params() const { return params_; }
 private:
-       ///
-       docstring editMessage() const;
        ///
        InsetCode lyxCode() const { return NOTE_CODE; }
        ///

diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index 392c915cd21579104249ff8e82b3dff0429f5c58..17e40dccb429ee22cd2ac9463dbbf61cd2de7efc 100644 (file)
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -26,12 +26,6 @@ InsetOptArg::InsetOptArg(Buffer const & buf)
 {}
 
 
-docstring InsetOptArg::editMessage() const
-{
-       return _("Opened Optional Argument Inset");
-}
-
-
 void InsetOptArg::write(ostream & os) const
 {
        os << "OptArg" << "\n";

diff --git a/src/insets/InsetOptArg.h b/src/insets/InsetOptArg.h
index c5aa1115b6cfaf8174fb08054d9b644ecf5da291..1cdc090ea8016cf062024bd91680e0d576bfe8bc 100644 (file)
--- a/src/insets/InsetOptArg.h
+++ b/src/insets/InsetOptArg.h
@@ -39,8 +39,6 @@ private:
        InsetCode lyxCode() const { return OPTARG_CODE; }
        ///
        docstring name() const { return from_ascii("OptArg"); }
-       /// return an message upon editing
-       docstring editMessage() const;
        /// Standard LaTeX output -- short-circuited
        int latex(odocstream &, OutputParams const &) const;
        /// Standard plain text output -- short-circuited

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index 2f5daf07e33feb7ea9b8c1fbf61165869cbf3c63..b058a72e26ab580df5028abe41587f45bc56a142 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -126,12 +126,6 @@ InsetPhantom::~InsetPhantom()
 }
 
 
-docstring InsetPhantom::editMessage() const
-{
-       return _("Opened Phantom Inset");
-}
-
-
 docstring InsetPhantom::name() const 
 {
        return from_ascii("Phantom:" + phantomtranslator().find(params_.type));

diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h
index 41fba8fb42868c64aa5de5d8a5da2f726995502f..5290c8f606a485d4252137ccf5d7e628f12ebc26 100644 (file)
--- a/src/insets/InsetPhantom.h
+++ b/src/insets/InsetPhantom.h
@@ -57,8 +57,6 @@ public:
        ///
        InsetPhantomParams const & params() const { return params_; }
 private:
-       ///
-       docstring editMessage() const;
        ///
        InsetCode lyxCode() const { return PHANTOM_CODE; }
        ///

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 614d479eebbd8a9a49193cf64126afddd976c819..8ebfeb8110be19b35bf231ed363890daf9f7fcec 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3295,12 +3295,6 @@ void InsetTabular::drawCellLines(Painter & pain, int x, int y,
 }
 
 
-docstring InsetTabular::editMessage() const
-{
-       return _("Opened table");
-}
-
-
 void InsetTabular::edit(Cursor & cur, bool front, EntryDirection)
 {
        //lyxerr << "InsetTabular::edit: " << this << endl;

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 4470d02dece2ac3fa3dfd65ef5c3581f91a3c144..9ac05fa489cbaac663ff102dad1779e5f54516b3 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -751,8 +751,6 @@ public:
        ///
        void drawSelection(PainterInfo & pi, int x, int y) const;
        ///
-       docstring editMessage() const;
-       ///
        bool editable() const { return true; }
        ///
        bool hasSettings() const { return true; }

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index eb01cfb23c1cfd36330fb5e131a08c5fedb79e9b..ed386caa18b79634359da811c799c84a846f849f 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -238,12 +238,6 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetText::editMessage() const
-{
-       return _("Opened Text Inset");
-}
-
-
 void InsetText::edit(Cursor & cur, bool front, EntryDirection entry_from)
 {
        pit_type const pit = front ? 0 : paragraphs().size() - 1;

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index c0efea092ec8e6d7fbb152cb9ed272c912bdb4ca..b0897ea394a9af465687b7f6b68cee3a4953151b 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -62,8 +62,6 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       docstring editMessage() const;
-       ///
        bool editable() const { return true; }
        ///
        bool canTrackChanges() const { return true; }

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 2d289556447ee48817ef83247f7d8909c5205746..21e06cf5ff944e5bd58978834700e32b1d455dc2 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -173,12 +173,6 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetWrap::editMessage() const
-{
-       return _("Opened Wrap Inset");
-}
-
-
 int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams(runparams_in);

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index e7c316c42a762fcce32fdd61e0c179022b2cb615..2b6c8b7a03949829c408175a8d4b87bbd3d4a390 100644 (file)
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -73,8 +73,6 @@ private:
        ///
        docstring xhtml(odocstream &, OutputParams const &) const;
        ///
-       docstring editMessage() const;
-       ///
        bool insetAllowed(InsetCode) const;
        ///
        bool showInsetDialog(BufferView *) const;

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 70c28fd52825f5abcbb0d57d63df40c9c705bb10..c00a6819bb186824d89baa6ced2a603e96c6b534 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -1554,12 +1554,6 @@ void InsetMathHull::edit(Cursor & cur, bool front, EntryDirection entry_from)
 }
 
 
-docstring InsetMathHull::editMessage() const
-{
-       return _("Math editor mode");
-}
-
-
 void InsetMathHull::revealCodes(Cursor & cur) const
 {
        if (!cur.inMathed())

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index d5fc0f69df5d5792476c76e2cdf317d2a860b7c9..14c1f0a3967deeca86206f363abd3cdb3f7b725e 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -205,8 +205,6 @@ private:
 // Incorporate me
 //
 public:
-       /// what appears in the minibuffer when opening
-       docstring editMessage() const;
        ///
        virtual void mutateToText();
        ///