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 c10d619ee9434273044d87e00f8ff8f1125ded80..442928b7c469bfa69e6a5097a7043564a01cf867 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -11,9 +11,7 @@
 
 #include "InsetInfo.h"
 
-#include <sstream>
-#include <stack>
-
+#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -24,10 +22,8 @@
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "Lexer.h"
-#include "MenuBackend.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
-#include "BaseClassList.h"
 
 #include "frontends/Application.h"
 
@@ -38,14 +34,16 @@
 #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);
@@ -67,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());
        }
 }
@@ -202,21 +200,19 @@ void InsetInfo::updateInfo()
                break;
        case TEXTCLASS_INFO: {
                // name_ is the class name
-               pair<bool, lyx::BaseClassIndex> pp = baseclasslist.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 = theApp()->menuBackend().getMenubar();
-               if (!menu.searchFunc(func, names)) {
+               if (!theApp()->searchMenu(func, names)) {
                        setText(_("No menu entry for "), bp.getFont(), false);
                        break;
                }
@@ -229,9 +225,9 @@ void InsetInfo::updateInfo()
                        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;
        }
@@ -242,7 +238,7 @@ void InsetInfo::updateInfo()
                else if (name_ == "path")
                        setText(from_utf8(buffer().filePath()), bp.getFont(), false);
                else if (name_ == "class")
-                       setText(from_utf8(bp.textClass().name()), bp.getFont(), false);
+                       setText(from_utf8(bp.documentClass().name()), bp.getFont(), false);
                else
                        setText(_("Unknown buffer info"), bp.getFont(), false);
                break;