From: Jean-Marc Lasgouttes Date: Tue, 14 Jul 2009 18:56:13 +0000 (+0000) Subject: remove all trace of editMessage X-Git-Tag: 2.0.0~6017 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=78c45693ef3f99a7671443238b448f4a69fd7717;p=features.git 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 86a6040ddd..9afae918a6 100644 --- 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 f932c0aee3..ddbb5ac3f0 100644 --- 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 ecf9f4fb94..5ad4aeda5e 100644 --- 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 df61656c45..183f54ebcb 100644 --- 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 17960a2344..12ae7fdcff 100644 --- 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 9acbb8de9b..cf791a3cd0 100644 --- 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 f3dbc5808a..87888c0fdf 100644 --- 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 5379b171bc..acbd7c9ea9 100644 --- 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 5a2e9b67dd..5a253c8d9d 100644 --- 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 90c595191b..4c396a1b9d 100644 --- 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 494f53e929..f6df3da8b9 100644 --- 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 be73041741..76b338004d 100644 --- 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 9e2ed16f74..ee52e4729c 100644 --- 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 d70d356e7f..5d27f29bea 100644 --- 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 9ef3dcd9a9..2abc5654fd 100644 --- 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 d0d432b5fd..c5ecf4879b 100644 --- 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 a2c1b7421c..bba2410067 100644 --- 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 42f02825b8..8c2898d354 100644 --- 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 51a3f7022c..fcf16726ea 100644 --- 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 2dbd9e3383..b4e6e8b39e 100644 --- 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 249f083afa..8c64fed855 100644 --- 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 4cbe6172bc..862f77f88e 100644 --- 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 dd4cddaaca..98238496cb 100644 --- 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 392c915cd2..17e40dccb4 100644 --- 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 c5aa1115b6..1cdc090ea8 100644 --- 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 2f5daf07e3..b058a72e26 100644 --- 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 41fba8fb42..5290c8f606 100644 --- 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 614d479eeb..8ebfeb8110 100644 --- 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 4470d02dec..9ac05fa489 100644 --- 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 eb01cfb23c..ed386caa18 100644 --- 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 c0efea092e..b0897ea394 100644 --- 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 2d28955644..21e06cf5ff 100644 --- 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 e7c316c42a..2b6c8b7a03 100644 --- 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 70c28fd528..c00a6819bb 100644 --- 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 d5fc0f69df..14c1f0a396 100644 --- 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(); ///