#include "BufferParams.h"
#include "Converter.h"
#include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
#include "Floating.h"
#include "FloatList.h"
#include "Format.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "KeyMap.h"
#include "Session.h"
#include "LyXAction.h"
#include "TocBackend.h"
#include "ToolbarBackend.h"
+#include "frontends/Application.h"
+
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/convert.h"
#include <boost/bind.hpp>
#include <algorithm>
+#include <ostream>
-
-namespace lyx {
-
-using support::compare_ascii_no_case;
-using support::contains;
-using support::makeDisplayPath;
-using support::token;
-
+using namespace std;
using boost::bind;
+using namespace lyx::support;
-using std::auto_ptr;
-using std::endl;
-using std::equal_to;
-using std::find_if;
-using std::max;
-using std::sort;
-using std::string;
-using std::vector;
-using std::stack;
+namespace lyx {
namespace {
-class MenuNamesEqual : public std::unary_function<Menu, bool> {
+class MenuNamesEqual : public unary_function<Menu, bool> {
public:
MenuNamesEqual(docstring const & name)
: name_(name) {}
} // namespace anon
-// This is the global menu definition
-MenuBackend menubackend;
-
-
MenuItem::MenuItem(Kind kind)
: kind_(kind), optional_(false)
{}
}
-docstring const MenuItem::binding(bool forgui) const
+docstring const MenuItem::binding() const
{
if (kind_ != Command)
return docstring();
bool Menu::hasFunc(FuncRequest const & func) const
{
return find_if(begin(), end(),
- bind(std::equal_to<FuncRequest>(),
+ bind(equal_to<FuncRequest>(),
bind(&MenuItem::func, _1),
func)) != end();
}
}
-bool Menu::searchFunc(FuncRequest & func, stack<docstring> & names)
+bool Menu::searchFunc(FuncRequest & func, stack<docstring> & names) const
{
const_iterator m = begin();
const_iterator m_end = end();
return true;
} else if (m->kind() == MenuItem::Submenu) {
names.push(m->label());
- Menu submenu = menubackend.getMenu(m->submenuname());
+ Menu submenu = theApp()->menuBackend().getMenu(m->submenuname());
if (submenu.searchFunc(func, names))
return true;
else
if ((*fit)->dummy())
continue;
docstring label = from_utf8((*fit)->prettyname());
+ docstring const shortcut = from_utf8((*fit)->shortcut());
switch (kind) {
case MenuItem::ImportFormats:
BOOST_ASSERT(false);
break;
}
- if (!(*fit)->shortcut().empty())
- label += char_type('|') + from_utf8((*fit)->shortcut());
+ // FIXME: if we had proper support for translating the
+ // format names defined in configure.py, there would
+ // not be a need to check whether the shortcut is
+ // correct. If we add it uncondiitonally, it would
+ // create useless warnings on bad shortcuts
+ if (!shortcut.empty() && contains(label, shortcut))
+ label += char_type('|') + shortcut;
if (buf)
tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
}
-void expandFlexInsert(Menu & tomenu, Buffer const * buf, std::string s)
+void expandFlexInsert(Menu & tomenu, Buffer const * buf, string s)
{
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command,
// check whether depth is smaller than the smallest depth in toc.
int min_depth = 1000;
for (Toc::size_type i = from; i < to; ++i)
- min_depth = std::min(min_depth, toc_list[i].depth());
+ min_depth = min(min_depth, toc_list[i].depth());
if (min_depth > depth)
depth = min_depth;