Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn...

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

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 8566129b3a0172ce77bd4909ae09bfd3a956581e..1c0312f5a3107be6ef4e3bc1c1755a316ff3926e 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -255,6 +255,12 @@ docstring Inset::toolTip(BufferView const &, int, int) const
 
 
 docstring Inset::contextMenu(BufferView const &, int, int) const
+{
+       return contextMenuName();
+}
+
+
+docstring Inset::contextMenuName() const
 {
        return docstring();
 }

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index b39c59cc86df00de3d51f3c4f5dc3ac04897733c..85a1360c2c30fc1b7540a7779afa7a0eb1d850c8 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -400,9 +400,14 @@ public:
        /// This default implementation returns an empty string.
        virtual docstring toolTip(BufferView const & bv, int x, int y) const;
        
+       /// \return Context menu identifier. This function determines
+       /// whose Inset's menu should be shown for the given position.
+       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+
        /// \return Context menu identifier for this inset.
        /// This default implementation returns an empty string.
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       virtual docstring contextMenuName() const;
+
 
        // FIXME This should really disappear in favor of 
        //      docstring name() const { return from_ascii(insetName(lyxCode()))); }

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 539345100d44086b33ddd4f999cc0af2a088769e..8f1af04f50967d120906c6d9cf8b33c58ddb8f3c 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -987,7 +987,7 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-docstring InsetBibtex::contextMenu(BufferView const &, int, int) const
+docstring InsetBibtex::contextMenuName() const
 {
        return from_ascii("context-bibtex");
 }

diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h
index 75d010aa7c39b20dcbab7cddfa82df8c23b22a7e..5ede7aaa45081bf99996b5e6f6fb11f2633a8867 100644 (file)
--- a/src/insets/InsetBibtex.h
+++ b/src/insets/InsetBibtex.h
@@ -58,7 +58,7 @@ public:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 86121163af4df86188d8bb4b02117d1d1e81ebff..6b409200bf19f3309f00943c48963675e3092263 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -529,7 +529,7 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenu(BufferView const &, int, int) const
+docstring InsetBox::contextMenuName() const
 {
        return from_ascii("context-box");
 }

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index b0692484f5cb00eca7f28e36fc08ab574ed3a80d..8c7303246ee366e38f00fd687ee2df0945c7f96d 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -131,7 +131,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
 
        ///
        InsetBoxParams params_;

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 978b0408dcd81a9a3011ee5707b7f312f092514c..c11a013cb187fa74399339a67926a49e9b19700f 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -249,7 +249,7 @@ void InsetBranch::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBranch::contextMenu(BufferView const &, int, int) const
+docstring InsetBranch::contextMenuName() const
 {
        return from_ascii("context-branch");
 }

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 4100a631ccd6261180113112280f8687f0829f1d..f852ee2defb0f166df932448010686fe5f4a953e 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -77,7 +77,7 @@ private:
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        ///
        void addToToc(DocIterator const &);
        ///

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index c9a012623d2a85a005ece26fa733f2939218938a..5d8d8c9a203c90aacfb9b18ba6a217314b8f198d 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -599,7 +599,7 @@ void InsetCitation::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetCitation::contextMenu(BufferView const &, int, int) const
+docstring InsetCitation::contextMenuName() const
 {
        return from_ascii("context-citation");
 }

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index aedbd2e43b33a0c9d358795b0137a3283d31b1e1..831da30dac859c5ec4f1fb38532491d22eb14bf7 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -59,7 +59,7 @@ public:
        ///
        void addToToc(DocIterator const &);
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 4fb0b2cc8ca20165c0be29389583d123491e5ef9..72cd73b5b21fcab70d2b314773f8df2d1637bfab 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -622,16 +622,25 @@ docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
        int y) const
 {
        if (decoration() == InsetLayout::CONGLOMERATE)
-               return from_ascii("context-conglomerate");
+               return contextMenuName();
 
        if (geometry(bv) == NoButton)
-               return from_ascii("context-collapsable");
+               return contextMenuName();
 
        Dimension dim = dimensionCollapsed(bv);
        if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
-               return from_ascii("context-collapsable");
+               return contextMenuName();
+
+       return InsetText::contextMenuName();
+}
 
-       return InsetText::contextMenu(bv, x, y);
+
+docstring InsetCollapsable::contextMenuName() const
+{
+       if (decoration() == InsetLayout::CONGLOMERATE)
+               return from_ascii("context-conglomerate");
+       else
+               return from_ascii("context-collapsable");
 }
 
 } // namespace lyx

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index fda6f84e3c4d2397ca5b2b05c9ad905c69e8c462..4008cee7425662bd7daab785f914de998c5d13ef 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -141,7 +141,9 @@ public:
        ///
        virtual bool usePlainLayout() const { return true; }
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       ///
+       docstring contextMenuName() const;
        ///
        docstring floatName(std::string const & type) const;
 protected:

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index a429e27435fb1d4fbfe2af73d71568792e047fe9..4da3f19b2bb5bdf515e9489256e0c9d04b4b680b 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -208,7 +208,7 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetCommand::contextMenu(BufferView const &, int, int) const
+docstring InsetCommand::contextMenuName() const
 {
        return from_ascii("context-") + from_ascii(insetName(p_.code()));
 }

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 2d1d678a222878b0a1e731b44df70d1daea13ee5..a70f3d2065d202af537362d41548b86ddc7ada1a 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -91,7 +91,7 @@ protected:
        /// \name Methods relaying to the InsetCommandParams p_
        //@{
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        bool showInsetDialog(BufferView * bv) const;
        ///

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 139834c21aec6f2ff178ca17238505d04fb1cfa0..416dffbf31c17688fffc038958df41e399acc021 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -38,7 +38,7 @@ public:
        ///
        static std::string params2string(CollapseStatus);
 
-       docstring contextMenu(BufferView const &, int, int) const
+       docstring contextMenuName() const
                { return from_ascii("context-ert"); }
 private:
        ///

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index f224d540684fe7d4d465e434202efe2c370c0ee3..f8b8a9bd65b1a33b8c2725945a66e53d628777f8 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -789,7 +789,7 @@ void InsetExternal::addPreview(DocIterator const & /*inset_pos*/,
 }
 
 
-docstring InsetExternal::contextMenu(BufferView const &, int, int) const
+docstring InsetExternal::contextMenuName() const
 {
        return from_ascii("context-external");
 }

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index 58377daee72a8f83f88e0c66359ab4852ee7255e..a5c1c2c58ffe9196da4a2fa4f109808d0ecbc144 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -111,7 +111,7 @@ public:
        /// \returns the number of rows (\n's) of generated code.
        int latex(odocstream &, OutputParams const &) const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover);
        ///

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index e28a986b73e47e0d67ed06b7768f6a372d878b44..25abe040d6f9f166d24a1f06b278139ff4becc7f 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -1040,7 +1040,7 @@ void InsetGraphics::addToToc(DocIterator const & cpit)
 }
 
 
-docstring InsetGraphics::contextMenu(BufferView const &, int, int) const
+docstring InsetGraphics::contextMenuName() const
 {
        return from_ascii("context-graphics");
 }

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 1846c4a4e62ab655494cbef343951a608d24ae3e..34391f5437324fa3ce635e1e3658050a54bacd9a 100644 (file)
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -98,7 +98,7 @@ private:
        ///
        void addToToc(DocIterator const &);
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        /// Force inset into LTR environment if surroundings are RTL
        bool forceLTR() const { return true; }
        ///

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 29ce2ddca75585bc141c6eb11fa8c8bfcef0e9a1..7a293ff8a4a32e173988dc99d032b199cea05f0a 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -264,7 +264,7 @@ void InsetHyperlink::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetHyperlink::contextMenu(BufferView const &, int, int) const
+docstring InsetHyperlink::contextMenuName() const
 {
        return from_ascii("context-hyperlink");
 }

diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h
index acecd16d2a0595a71e4a0546996005cb4ed528b7..ddf35af8533e4631c71a94def965960656c70f3b 100644 (file)
--- a/src/insets/InsetHyperlink.h
+++ b/src/insets/InsetHyperlink.h
@@ -40,7 +40,7 @@ public:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index fa2c83554560fc7026e1ff756e479317cb6f9cb7..9464012614ab1c20e2aec8485c7d733799e38345 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -898,7 +898,7 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetInclude::contextMenu(BufferView const &, int, int) const
+docstring InsetInclude::contextMenuName() const
 {
        return from_ascii("context-include");
 }

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index b66a21b829ff578eec61ff8a02d1c7c4e557553b..7860ac6510da29e44d6dc265aa3c43e858d9fcb7 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -103,7 +103,7 @@ public:
        ///
        void updateBuffer(ParIterator const &, UpdateType);
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 86da890e02dab8654dad6a399eb7f88f1239cb87..455f683c647e3ea43c4c0276da947b3c8552056a 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -376,7 +376,7 @@ void InsetIndex::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetIndex::contextMenuName() const
 {
        return from_ascii("context-index");
 }
@@ -576,7 +576,7 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetPrintIndex::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintIndex::contextMenuName() const
 {
        return buffer().masterBuffer()->params().use_indices ?
                from_ascii("context-indexprint") : docstring();

diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h
index b6a0669ee614fd29e899ece2ebc1c5e248531bdd..26d4fc5e32b15dcb74efa5d1b1a3c7e8ba50dc15 100644 (file)
--- a/src/insets/InsetIndex.h
+++ b/src/insets/InsetIndex.h
@@ -79,7 +79,7 @@ private:
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        Inset * clone() const { return new InsetIndex(*this); }
 
@@ -108,7 +108,7 @@ public:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 88a27d61be5395af6a96fcf457b2759baffa7ada..4dbee710aee6b839b43d6d05c2fe5ef3e9699336 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -452,7 +452,7 @@ void InsetInfo::updateInfo()
 }
 
 
-docstring InsetInfo::contextMenu(BufferView const &, int, int) const
+docstring InsetInfo::contextMenuName() const
 {
        return from_ascii("context-info");
 }

diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h
index 25f40e241faae254f2453e6c63ea26925f093f8b..bb2144db03c25896a6aa3f835d32998b1175d8a4 100644 (file)
--- a/src/insets/InsetInfo.h
+++ b/src/insets/InsetInfo.h
@@ -126,7 +126,7 @@ public:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        /// should paragraph indendation be ommitted in any case?
        bool neverIndent() const { return true; }
 

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index dc5728de74d1931cd7c7459d08400670d8550713..f03cace45f55e1a12cfb8e3e1e1abab58f1a9473 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -309,7 +309,7 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 }
 
 
-docstring InsetListings::contextMenu(BufferView const &, int, int) const
+docstring InsetListings::contextMenuName() const
 {
        return from_ascii("context-listings");
 }

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index d307126fe7fecbdd3c8098385ee3bb28a6cfdc73..7ce6575638c2e55b3140ad2ea8d77b3b53bf9332 100644 (file)
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -67,7 +67,7 @@ private:
        ///
        InsetListingsParams & params() { return params_; }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index c775170d90f60f7df65d182d4e3dd34ef855a784..88c77c00f734415ed621a23352abb0f3644731f4 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -261,7 +261,7 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetNewline::contextMenu(BufferView const &, int, int) const
+docstring InsetNewline::contextMenuName() const
 {
        return from_ascii("context-newline");
 }

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index 31ab4451a9db6d9c8b06909b82e54f5a9c3927f7..85bf1275ba688166c5430633ed3fa36ba0301ca8 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -77,7 +77,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 0f718c2979a1b357bd5935171e6d826eed03c351..b405cd2cfdf34e6c9537370389bc2467687815cc 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -257,7 +257,7 @@ docstring InsetNewpage::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-docstring InsetNewpage::contextMenu(BufferView const &, int, int) const
+docstring InsetNewpage::contextMenuName() const
 {
        return from_ascii("context-newpage");
 }

diff --git a/src/insets/InsetNewpage.h b/src/insets/InsetNewpage.h
index fead3f37e788d86a48bfb517c3f8912f45eea200..30c064cf28e7389dbc71cc0d90cfcbe29bfa8fc6 100644 (file)
--- a/src/insets/InsetNewpage.h
+++ b/src/insets/InsetNewpage.h
@@ -81,7 +81,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewpage(*this); }
        ///

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index b70a2a73b73b62b4695a32bc6122cd84c08dc7be..1a44ccd5f826dc455044e42a94291874e64073ba 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -333,7 +333,7 @@ InsetCode InsetPrintNomencl::lyxCode() const
 }
 
 
-docstring InsetPrintNomencl::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintNomencl::contextMenuName() const
 {
        return from_ascii("context-nomenclprint");
 }

diff --git a/src/insets/InsetNomencl.h b/src/insets/InsetNomencl.h
index ef5b452b36a5b75c718e9b5eec8090cb465a5344..b50f72279e408df49604b3570339de995f76e1bc 100644 (file)
--- a/src/insets/InsetNomencl.h
+++ b/src/insets/InsetNomencl.h
@@ -98,7 +98,7 @@ public:
        ///
        int latex(odocstream &, OutputParams const &) const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index d3c1b1e2b49938e7bf4fc4dab8d526502e1e07a2..5198524da64218c07af50a6603993f9e04b223a1 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -350,7 +350,7 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetNote::contextMenu(BufferView const &, int, int) const
+docstring InsetNote::contextMenuName() const
 {
        return from_ascii("context-note");
 }

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index dde3a48cb230008257bdd666b309888eabb746e7..4f9ecff3e5a98d56401c47f2ce29eb76f4ad5c28 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -105,7 +105,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        friend class InsetNoteParams;
 

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index f275e1c9c7711b40d80e914f5958b7b037df25b7..9ec662fef14729cb149669dee07db263a902ce46 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -358,7 +358,7 @@ docstring InsetPhantom::xhtml(XHTMLStream &, OutputParams const &) const
        return docstring();
 }
 
-docstring InsetPhantom::contextMenu(BufferView const &, int, int) const
+docstring InsetPhantom::contextMenuName() const
 {
        return from_ascii("context-phantom");
 }

diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h
index d27721f098f2e06581db25b6316e2bffbaa08e92..c5a805b64d8863df03354805a45ddf04de5f6090 100644 (file)
--- a/src/insets/InsetPhantom.h
+++ b/src/insets/InsetPhantom.h
@@ -94,7 +94,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        friend class InsetPhantomParams;
 

diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index b398c89b8f1a52c4b8dbb1d11ed45b34c1987075..439740a4f734bf3fe5ccc08ba45cddf78e9322d4 100644 (file)
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -49,7 +49,7 @@ public:
        
        bool descendable(BufferView const & /*bv*/) const { return true; }
 
-       docstring contextMenu(BufferView const &, int, int) const
+       docstring contextMenuName() const
                { return from_ascii("context-preview"); }
 
        void metrics(MetricsInfo & mi, Dimension & dim) const;

diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp
index 76f5757c38f147766530059380d4f43b2607a537..9e729d5790eda42cf5b8a87f8a5fb4835c53a431 100644 (file)
--- a/src/insets/InsetScript.cpp
+++ b/src/insets/InsetScript.cpp
@@ -423,7 +423,7 @@ docstring InsetScript::xhtml(XHTMLStream & xs, OutputParams const & runparams) c
 }
 
 
-docstring InsetScript::contextMenu(BufferView const &, int, int) const
+docstring InsetScript::contextMenuName() const
 {
        return from_ascii("context-script");
 }

diff --git a/src/insets/InsetScript.h b/src/insets/InsetScript.h
index 92be0918851c882615af7cf631bffecee2b6e07f..eb3b55632adaf5950a7b374467ca65b05e02e5d9 100644 (file)
--- a/src/insets/InsetScript.h
+++ b/src/insets/InsetScript.h
@@ -109,7 +109,7 @@ public:
        ///
        Inset * clone() const { return new InsetScript(*this); }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        //@}
 
        /// \name Public functions inherited from InsetText class

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index b7c15d6eef7b6a420a0f93b4b8b3ae24e7685165..cccde17fc88d0d35559b38201a1b18b16affdde2 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -753,7 +753,7 @@ bool InsetSpace::isStretchableSpace() const
 }
 
 
-docstring InsetSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetSpace::contextMenuName() const
 {
        return from_ascii("context-space");
 }

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 5ecaea0a2bae60ebf55649b95047030f39542bca..089b5664e95a1261b28ffaed9cb809648f27aef2 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -146,7 +146,7 @@ public:
        // a line separator)?
        bool isSpace() const { return true; }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        bool clickable(int /* x */, int /* y */) const { return true; }
 protected:

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 428228da94125272890de4f6d4578db1421a939b..b1706be00e885c837607bd5bb4c0989f704d87d7 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3327,7 +3327,7 @@ void InsetTabular::write(ostream & os) const
 }
 
 
-docstring InsetTabular::contextMenu(BufferView const &, int, int) const
+docstring InsetTabular::contextMenuName() const
 {
        // FIXME: depending on the selection state, we could offer a different menu.
        return from_ascii("context-tabular");

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 0b192b83bd2a8445eeed2863e06c76204476ab44..6b34e6caf37be6a4910f5b6961b2aba86bd0a45c 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -813,7 +813,7 @@ public:
        ///
        InsetCode lyxCode() const { return TABULAR_CODE; }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        /// get offset of this cursor slice relative to our upper left corner
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 429a1510d6a912a9b75f914b0f98cb209cadd615..68220af5d671852129a9c154001347742edf02d8 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -813,7 +813,7 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+docstring InsetText::contextMenuName() const
 {
        return from_ascii("context-edit");
 }

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 3c242fd4f9a75f2e51d1ae7aadb7007f98a8aad9..ebb11a29f1c165fe1ab55d3a767d72ff1beb5763 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -196,7 +196,7 @@ public:
        docstring toolTipText(docstring prefix = empty_docstring()) const;
 
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected:

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index e8fad01615a21dc07c4f5f699d044d7658401b9e..e73db774d5376dcb8b3d34a7c3512b794bded685 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -233,7 +233,7 @@ docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
 }
 
 
-docstring InsetVSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetVSpace::contextMenuName() const
 {
        return from_ascii("context-vspace");
 }

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 4eb279dad2353f23cc31f75afe67f7376782b0ce..e065462ced23ba8cf5ec92564c3cbd8854dc20c6 100644 (file)
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -32,7 +32,7 @@ public:
        ///
        bool hasSettings() const { return true; }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        static void string2params(std::string const &, VSpace &);
        ///

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index ec9d299f84ece7d869c04d482a1d6908dc60d941..8ff7b230d444cd832e1791972572c0cd0e6d7726 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -1968,7 +1968,7 @@ void InsetMathHull::tocString(odocstream & os) const
 }
 
 
-docstring InsetMathHull::contextMenu(BufferView const &, int, int) const
+docstring InsetMathHull::contextMenuName() const
 {
        return from_ascii("context-math");
 }

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 7f161f22357ca1365efbab44d09ac2fc5495ad7b..dd4255f0d92b00a9e2e64b3e8e8ef0ddf380db32 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -154,7 +154,7 @@ public:
        void recordLocation(DocIterator const & di);
 
        ///
-       virtual docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        ///
        InsetCode lyxCode() const { return MATH_HULL_CODE; }
 

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index 9cf184fa7a7ec38e159885ae47bf26e61c908eef..cede32a7865a5860e24ba97dab56072e68fd50a6 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -268,7 +268,7 @@ InsetSpaceParams InsetMathSpace::params() const
 }
 
 
-docstring InsetMathSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetMathSpace::contextMenuName() const
 {
        return from_ascii("context-mathspace");
 }

diff --git a/src/mathed/InsetMathSpace.h b/src/mathed/InsetMathSpace.h
index 8f633fffa837aae31ec5a9d0ab0261b05a2cac98..fa5c8aee2ffd4447b41d1ea4e00d10651d0544f0 100644 (file)
--- a/src/mathed/InsetMathSpace.h
+++ b/src/mathed/InsetMathSpace.h
@@ -61,7 +61,7 @@ public:
        ///
        bool hasSettings() const { return true; }
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 3eadf6d2ef2242e04a6700b7808b7f611fa946b7..f6421c6c48df5218f2499c5ea330f8769a3cafec 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -1353,7 +1353,7 @@ void MathMacroTemplate::infoize(odocstream & os) const
 }
 
 
-docstring MathMacroTemplate::contextMenu(BufferView const &, int, int) const
+docstring MathMacroTemplate::contextMenuName() const
 {
        return from_ascii("context-math-macro-definition");
 }

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index e93ceb46d0dfe0c4a85c79ebf17016485312e62a..be3b7ee5f2e17bd1943c019979d9b8c9051faf5b 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -104,7 +104,7 @@ public:
        ///
        void infoize(odocstream & os) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       docstring contextMenuName() const;
 protected:
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);