]> git.lyx.org Git - lyx.git/blobdiff - src/MenuBackend.C
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LFUN_UNICODE_INSERT - unicode-insert
[lyx.git] / src / MenuBackend.C
diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index c099129f156357341997245deb88fb3843b228ed..9ce8efccb3ef219f909bd182a561321835010df1 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -45,13 +45,14 @@
 
 #include <algorithm>
 
-using lyx::char_type;
-using lyx::docstring;
-using lyx::support::compare_no_case;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::makeDisplayPath;
-using lyx::support::token;
+
+namespace lyx {
+
+using support::compare_no_case;
+using support::compare_ascii_no_case;
+using support::contains;
+using support::makeDisplayPath;
+using support::token;
 
 using boost::bind;
 
@@ -65,8 +66,6 @@ using std::string;
 using std::vector;
 
 
-extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
-
 namespace {
 
 class MenuNamesEqual : public std::unary_function<Menu, bool> {
@@ -139,15 +138,15 @@ docstring const MenuItem::binding() const
 
        // Get the keys bound to this action, but keep only the
        // first one later
-       kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_);
+       kb_keymap::Bindings bindings = theTopLevelKeymap().findbindings(func_);
 
        if (bindings.size()) {
-               return lyx::from_utf8(bindings.begin()->print());
+               return from_utf8(bindings.begin()->print());
        } else {
                lyxerr[Debug::KBMAP]
                        << "No binding for "
                        << lyxaction.getActionName(func_.action)
-                       << '(' << lyx::to_utf8(func_.argument()) << ')' << endl;
+                       << '(' << to_utf8(func_.argument()) << ')' << endl;
                return docstring();
        }
 
@@ -166,10 +165,8 @@ Menu & Menu::addWithStatusCheck(MenuItem const & i)
        switch (i.kind()) {
 
        case MenuItem::Command: {
-               FuncStatus status =
-                       lyx::getStatus(i.func());
-               if (status.unknown()
-                   || (!status.enabled() && i.optional()))
+               FuncStatus status = lyx::getStatus(i.func());
+               if (status.unknown() || (!status.enabled() && i.optional()))
                        break;
                items_.push_back(i);
                items_.back().status(status);
@@ -339,7 +336,7 @@ Menu & Menu::read(LyXLex & lex)
                        lex.next(true);
                        docstring const mlabel = _(lex.getString());
                        lex.next(true);
-                       docstring const mname = lyx::from_utf8(lex.getString());
+                       docstring const mname = from_utf8(lex.getString());
                        add(MenuItem(MenuItem::Submenu, mlabel, mname,
                                     optional));
                        optional = false;
@@ -385,14 +382,14 @@ void Menu::checkShortcuts() const
                        continue;
                if (!contains(it1->label(), shortcut))
                        lyxerr << "Menu warning: menu entry \""
-                              << lyx::to_utf8(it1->label())
+                              << to_utf8(it1->label())
                               << "\" does not contain shortcut `"
-                              << lyx::to_utf8(shortcut) << "'." << endl;
+                              << to_utf8(shortcut) << "'." << endl;
                for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
                        if (!compare_no_case(it2->shortcut(), shortcut)) {
                                lyxerr << "Menu warning: menu entries "
-                                      << '"' << lyx::to_utf8(it1->fulllabel())
-                                      << "\" and \"" << lyx::to_utf8(it2->fulllabel())
+                                      << '"' << to_utf8(it1->fulllabel())
+                                      << "\" and \"" << to_utf8(it2->fulllabel())
                                       << "\" share the same shortcut."
                                       << endl;
                        }
@@ -417,9 +414,9 @@ public:
        }
 };
 
-string const limit_string_length(string const & str)
+docstring const limit_string_length(docstring const & str)
 {
-       string::size_type const max_item_length = 45;
+       docstring::size_type const max_item_length = 45;
 
        if (str.size() > max_item_length)
                return str.substr(0, max_item_length - 3) + "...";
@@ -436,7 +433,7 @@ void expandLastfiles(Menu & tomenu)
        int ii = 1;
 
        for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) {
-               docstring const label = convert<docstring>(ii) + lyx::from_ascii(". ")
+               docstring const label = convert<docstring>(ii) + ". "
                        + makeDisplayPath((*lfit), 30)
                        + char_type('|') + convert<docstring>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))));
@@ -461,7 +458,7 @@ void expandDocuments(Menu & tomenu)
        for (; docit != end; ++docit, ++ii) {
                docstring label = makeDisplayPath(*docit, 20);
                if (ii < 10)
-                       label = convert<docstring>(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert<docstring>(ii);
+                       label = convert<docstring>(ii) + ". " + label + char_type('|') + convert<docstring>(ii);
                tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)));
        }
 }
@@ -504,7 +501,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
        for (; fit != end ; ++fit) {
                if ((*fit)->dummy())
                        continue;
-               docstring label = lyx::from_utf8((*fit)->prettyname());
+               docstring label = from_utf8((*fit)->prettyname());
 
                switch (kind) {
                case MenuItem::ImportFormats:
@@ -512,7 +509,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
                                label = _("Plain Text as Lines");
                        else if ((*fit)->name() == "textparagraph")
                                label = _("Plain Text as Paragraphs");
-                       label += lyx::from_ascii("...");
+                       label += "...";
                        break;
                case MenuItem::ViewFormats:
                case MenuItem::ExportFormats:
@@ -525,7 +522,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
                        break;
                }
                if (!(*fit)->shortcut().empty())
-                       label += char_type('|') + lyx::from_utf8((*fit)->shortcut());
+                       label += char_type('|') + from_utf8((*fit)->shortcut());
 
                if (buf)
                        tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
@@ -595,7 +592,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf)
        CharStyles::iterator cit = charstyles.begin();
        CharStyles::iterator end = charstyles.end();
        for (; cit != end; ++cit) {
-               docstring const label = lyx::from_utf8(cit->name);
+               docstring const label = from_utf8(cit->name);
                tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
                                    FuncRequest(LFUN_CHARSTYLE_INSERT,
                                                cit->name)));
@@ -623,7 +620,7 @@ void expandToc2(Menu & tomenu,
        if (to - from <= max_number_of_items) {
                for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
                        docstring label(4 * max(0, toc_list[i].depth() - depth), char_type(' '));
-                       label += lyx::from_utf8(limit_string_length(toc_list[i].str()));
+                       label += limit_string_length(toc_list[i].str());
                        if (toc_list[i].depth() == depth
                            && shortcut_count < 9) {
                                if (label.find(convert<docstring>(shortcut_count + 1)) != docstring::npos)
@@ -641,12 +638,12 @@ void expandToc2(Menu & tomenu,
                                ++new_pos;
 
                        docstring label(4 * max(0, toc_list[pos].depth() - depth), ' ');
-                       label += lyx::from_utf8(limit_string_length(toc_list[pos].str()));
+                       label += limit_string_length(toc_list[pos].str());
                        if (toc_list[pos].depth() == depth &&
                            shortcut_count < 9) {
                                if (label.find(convert<docstring>(shortcut_count + 1)) != docstring::npos)
                                        label += char_type('|') + convert<docstring>(++shortcut_count);
-                               }
+                       }
                        if (new_pos == pos + 1) {
                                tomenu.add(MenuItem(MenuItem::Command,
                                                    label, FuncRequest(toc_list[pos].action())));
@@ -691,7 +688,7 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                lyx::toc::Toc::const_iterator ccit = cit->second.begin();
                lyx::toc::Toc::const_iterator eend = cit->second.end();
                for (; ccit != eend; ++ccit) {
-                       docstring const label = lyx::from_utf8(limit_string_length(ccit->str()));
+                       docstring const label = limit_string_length(ccit->str());
                        menu->add(MenuItem(MenuItem::Command,
                                           label,
                                           FuncRequest(ccit->action())));
@@ -719,14 +716,14 @@ void expandPasteRecent(Menu & tomenu, Buffer const * buf)
        if (!buf)
                return;
 
-       vector<string> const sel =
-               lyx::cap::availableSelections(*buf);
+       vector<docstring> const sel =
+               cap::availableSelections(*buf);
 
-       vector<string>::const_iterator cit = sel.begin();
-       vector<string>::const_iterator end = sel.end();
+       vector<docstring>::const_iterator cit = sel.begin();
+       vector<docstring>::const_iterator end = sel.end();
 
        for (unsigned int index = 0; cit != end; ++cit, ++index) {
-               tomenu.add(MenuItem(MenuItem::Command, lyx::from_utf8(*cit),
+               tomenu.add(MenuItem(MenuItem::Command, *cit,
                                    FuncRequest(LFUN_PASTE, convert<string>(index))));
        }
 }
@@ -743,9 +740,9 @@ void expandBranches(Menu & tomenu, Buffer const * buf)
        BranchList::const_iterator end = params.branchlist().end();
 
        for (int ii = 1; cit != end; ++cit, ++ii) {
-               docstring label = lyx::from_utf8(cit->getBranch());
+               docstring label = from_utf8(cit->getBranch());
                if (ii < 10)
-                       label = convert<docstring>(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert<docstring>(ii);
+                       label = convert<docstring>(ii) + ". " + label + char_type('|') + convert<docstring>(ii);
                tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
                                    FuncRequest(LFUN_BRANCH_INSERT,
                                                cit->getBranch())));
@@ -868,7 +865,7 @@ void MenuBackend::read(LyXLex & lex)
                        break;
                case md_menu: {
                        lex.next(true);
-                       docstring const name = lyx::from_utf8(lex.getString());
+                       docstring const name = from_utf8(lex.getString());
                        if (hasMenu(name)) {
                                getMenu(name).read(lex);
                        } else {
@@ -907,7 +904,7 @@ Menu const & MenuBackend::getMenu(docstring const & name) const
 {
        const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
        if (cit == end())
-               lyxerr << "No submenu named " << lyx::to_utf8(name) << endl;
+               lyxerr << "No submenu named " << to_utf8(name) << endl;
        BOOST_ASSERT(cit != end());
        return (*cit);
 }
@@ -917,7 +914,7 @@ Menu & MenuBackend::getMenu(docstring const & name)
 {
        iterator it = find_if(begin(), end(), MenuNamesEqual(name));
        if (it == end())
-               lyxerr << "No submenu named " << lyx::to_utf8(name) << endl;
+               lyxerr << "No submenu named " << to_utf8(name) << endl;
        BOOST_ASSERT(it != end());
        return (*it);
 }
@@ -927,3 +924,6 @@ Menu const & MenuBackend::getMenubar() const
 {
        return menubar_;
 }
+
+
+} // namespace lyx
The LyX Source Repository