Cleanup mouse/selection/context-menu interactions.

[lyx.git] / src / insets / InsetInfo.cpp

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index d14a6889d04d199176da4ed69b450376b38abc74..442928b7c469bfa69e6a5097a7043564a01cf867 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -11,39 +11,39 @@
 
 #include "InsetInfo.h"
 
-#include <sstream>
-#include <stack>
-
+#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "InsetSpecialChar.h"
 #include "KeyMap.h"
 #include "LaTeXFeatures.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "Lexer.h"
-#include "MenuBackend.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
-#include "TextClassList.h"
 
+#include "frontends/Application.h"
+
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/ExceptionMessage.h"
 
+#include <sstream>
+
 using namespace std;
 using namespace lyx::support;
 
 namespace lyx {
 
 
-InsetInfo::InsetInfo(BufferParams const & bp, string const & name) 
-       : InsetText(bp), type_(UNKNOWN_INFO), name_(),
+InsetInfo::InsetInfo(Buffer const & buf, string const & name) 
+       : InsetText(buf), type_(UNKNOWN_INFO), name_(),
          mouse_hover_(false)
 {
        setAutoBreakRows(true);
@@ -65,7 +65,7 @@ void InsetInfo::draw(PainterInfo & pi, int x, int y) const
                odocstringstream os;
                os << _("Information regarding ")
                   <<_(nameTranslator().find(type_))
-                  << _(" ") << from_utf8(name_);
+                  << " " << from_utf8(name_);
                pi.base.bv->message(os.str());
        }
 }
@@ -75,7 +75,8 @@ namespace {
 
 Translator<InsetInfo::info_type, string> const initTranslator()
 {      
-       Translator<InsetInfo::info_type, string> translator(InsetInfo::UNKNOWN_INFO, "unknown");
+       Translator<InsetInfo::info_type, string> 
+               translator(InsetInfo::UNKNOWN_INFO, "unknown");
 
        translator.addPair(InsetInfo::SHORTCUT_INFO, "shortcut");
        translator.addPair(InsetInfo::LYXRC_INFO, "lyxrc");
@@ -89,16 +90,16 @@ Translator<InsetInfo::info_type, string> const initTranslator()
 
 } // namespace anon
 
-Translator<InsetInfo::info_type, string> const & InsetInfo::nameTranslator() const
+Translator<InsetInfo::info_type, string> 
+       const & InsetInfo::nameTranslator() const
 {
-       static Translator<info_type, string> const translator =
-               initTranslator();
+       static Translator<info_type, string> const translator = initTranslator();
        return translator;
 }
 
        
 
-void InsetInfo::read(Buffer const & buf, Lexer & lex)
+void InsetInfo::read(Lexer & lex)
 {
        string token;
        while (lex.isOK()) {
@@ -120,14 +121,13 @@ void InsetInfo::read(Buffer const & buf, Lexer & lex)
                        _("Missing \\end_inset at this point."),
                        from_utf8(token));
        }
-       updateInfo(buf);
+       updateInfo();
 }
 
 
-void InsetInfo::write(Buffer const &, ostream & os) const
+void InsetInfo::write(ostream & os) const
 {
-       os << "Info\ntype  \""
-          << nameTranslator().find(type_)
+       os << "Info\ntype  \"" << nameTranslator().find(type_)
           << "\"\narg   \"" << name_ << '\"';
 }
 
@@ -163,11 +163,11 @@ void InsetInfo::setInfo(string const & name)
 }
 
 
-void InsetInfo::updateInfo(Buffer const & buf)
+void InsetInfo::updateInfo()
 {
        InsetText::clear();
 
-       BufferParams const & bp = buf.params(); 
+       BufferParams const & bp = buffer().params();    
 
        switch (type_) {
        case UNKNOWN_INFO:
@@ -200,22 +200,19 @@ void InsetInfo::updateInfo(Buffer const & buf)
                break;
        case TEXTCLASS_INFO: {
                // name_ is the class name
-               pair<bool, lyx::textclass_type> pp =
-                       textclasslist.numberOfClass(name_);
-               setText(pp.first ? _("yes") : _("no"),
-                       bp.getFont(), false);
+               setText(LayoutFileList::get().haveClass(name_) ? _("yes") : _("no"),
+               bp.getFont(), false);
                break;
        }
        case MENU_INFO: {
-               stack<docstring> names;
+               vector<docstring> names;
                FuncRequest func = lyxaction.lookupFunc(name_);
                if (func.action == LFUN_UNKNOWN_ACTION) {
                        setText(_("No menu entry for "), bp.getFont(), false);
                        break;
                }
                // iterate through the menubackend to find it
-               Menu menu = menubackend.getMenubar();
-               if (!menu.searchFunc(func, names)) {
+               if (!theApp()->searchMenu(func, names)) {
                        setText(_("No menu entry for "), bp.getFont(), false);
                        break;
                }
@@ -228,19 +225,20 @@ void InsetInfo::updateInfo(Buffer const & buf)
                        if (i != 0)
                                info.insertInset(0, new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR),
                                        Change(Change::UNCHANGED));
-                       for (i = 0; i < names.top().length(); ++i)
-                               info.insertChar(i, names.top()[i], bp.getFont(), false);
-                       names.pop();
+                       for (i = 0; i != names.back().length(); ++i)
+                               info.insertChar(i, names.back()[i], bp.getFont(), false);
+                       names.pop_back();
                }
                break;
        }
        case BUFFER_INFO: {
                if (name_ == "name")
-                       setText(from_utf8(buf.fileName().onlyFileName()), bp.getFont(), false);
+                       setText(from_utf8(buffer().fileName().onlyFileName()),
+                               bp.getFont(), false);
                else if (name_ == "path")
-                       setText(from_utf8(buf.filePath()), bp.getFont(), false);
+                       setText(from_utf8(buffer().filePath()), bp.getFont(), false);
                else if (name_ == "class")
-                       setText(from_utf8(bp.getTextClass().name()), bp.getFont(), false);
+                       setText(from_utf8(bp.documentClass().name()), bp.getFont(), false);
                else
                        setText(_("Unknown buffer info"), bp.getFont(), false);
                break;