anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change MenuBackend and the other menuclasses to store a docstring. Do the required updates to lstrings/convert.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14955 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2006-09-09 22:27:22 +00:00
parent b5fccd53ac
commit 0dc81f2463
20 changed files with 235 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/MenuBackend.C
View File

@ -47,6 +47,9 @@
#include <algorithm> #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::compare_ascii_no_case;
using lyx::support::contains; using lyx::support::contains;
using lyx::support::makeDisplayPath; using lyx::support::makeDisplayPath;
@ -71,14 +74,14 @@ namespace {
class MenuNamesEqual : public std::unary_function<Menu, bool> { class MenuNamesEqual : public std::unary_function<Menu, bool> {
public: public:
MenuNamesEqual(string const & name) MenuNamesEqual(docstring const & name)
: name_(name) {} : name_(name) {}
bool operator()(Menu const & menu) const bool operator()(Menu const & menu) const
{ {
return menu.name() == name_; return menu.name() == name_;
} }
private: private:
string name_; docstring name_;
}; };
} // namespace anon } // namespace anon
@ -93,8 +96,8 @@ MenuItem::MenuItem(Kind kind)
{} {}
MenuItem::MenuItem(Kind kind, string const & label, MenuItem::MenuItem(Kind kind, docstring const & label,
string const & submenu, bool optional) docstring const & submenu, bool optional)
: kind_(kind), label_(label), : kind_(kind), label_(label),
submenuname_(submenu), optional_(optional) submenuname_(submenu), optional_(optional)
{ {
@ -102,7 +105,7 @@ MenuItem::MenuItem(Kind kind, string const & label,
} }
MenuItem::MenuItem(Kind kind, string const & label, MenuItem::MenuItem(Kind kind, docstring const & label,
FuncRequest const & func, bool optional) FuncRequest const & func, bool optional)
: kind_(kind), label_(label), func_(func), optional_(optional) : kind_(kind), label_(label), func_(func), optional_(optional)
{ {
@ -120,35 +123,35 @@ void MenuItem::submenu(Menu * menu)
} }
string const MenuItem::label() const docstring const MenuItem::label() const
{ {
return token(label_, '|', 0); return token(label_, char_type('|'), 0);
} }
string const MenuItem::shortcut() const docstring const MenuItem::shortcut() const
{ {
return token(label_, '|', 1); return token(label_, char_type('|'), 1);
} }
string const MenuItem::binding() const docstring const MenuItem::binding() const
{ {
if (kind_ != Command) if (kind_ != Command)
return string(); return docstring();
// Get the keys bound to this action, but keep only the // Get the keys bound to this action, but keep only the
// first one later // first one later
kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_); kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_);
if (bindings.size()) { if (bindings.size()) {
return bindings.begin()->print(); return lyx::from_utf8(bindings.begin()->print());
} else { } else {
lyxerr[Debug::KBMAP] lyxerr[Debug::KBMAP]
<< "No binding for " << "No binding for "
<< lyxaction.getActionName(func_.action) << lyxaction.getActionName(func_.action)
<< '(' << lyx::to_utf8(func_.argument()) << ')' << endl; << '(' << lyx::to_utf8(func_.argument()) << ')' << endl;
return string(); return docstring();
} }
} }
@ -269,7 +272,7 @@ Menu & Menu::read(LyXLex & lex)
// fallback to md_item // fallback to md_item
case md_item: { case md_item: {
lex.next(true); lex.next(true);
string const name = lyx::to_utf8(_(lex.getString())); docstring const name = _(lex.getString());
lex.next(true); lex.next(true);
string const command = lex.getString(); string const command = lex.getString();
FuncRequest func = lyxaction.lookupFunc(command); FuncRequest func = lyxaction.lookupFunc(command);
@ -335,9 +338,9 @@ Menu & Menu::read(LyXLex & lex)
// fallback to md_submenu // fallback to md_submenu
case md_submenu: { case md_submenu: {
lex.next(true); lex.next(true);
string const mlabel = lyx::to_utf8(_(lex.getString())); docstring const mlabel = _(lex.getString());
lex.next(true); lex.next(true);
string const mname = lex.getString(); docstring const mname = lyx::from_utf8(lex.getString());
add(MenuItem(MenuItem::Submenu, mlabel, mname, add(MenuItem(MenuItem::Submenu, mlabel, mname,
optional)); optional));
optional = false; optional = false;
@ -378,19 +381,19 @@ void Menu::checkShortcuts() const
// This is a quadratic algorithm, but we do not care because // This is a quadratic algorithm, but we do not care because
// menus are short enough // menus are short enough
for (const_iterator it1 = begin(); it1 != end(); ++it1) { for (const_iterator it1 = begin(); it1 != end(); ++it1) {
string shortcut = it1->shortcut(); docstring shortcut = it1->shortcut();
if (shortcut.empty()) if (shortcut.empty())
continue; continue;
if (!contains(it1->label(), shortcut)) if (!contains(it1->label(), shortcut))
lyxerr << "Menu warning: menu entry \"" lyxerr << "Menu warning: menu entry \""
<< it1->label() << lyx::to_utf8(it1->label())
<< "\" does not contain shortcut `" << "\" does not contain shortcut `"
<< shortcut << "'." << endl; << lyx::to_utf8(shortcut) << "'." << endl;
for (const_iterator it2 = begin(); it2 != it1 ; ++it2) { for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
if (!compare_ascii_no_case(it2->shortcut(), shortcut)) { if (!compare_no_case(it2->shortcut(), shortcut)) {
lyxerr << "Menu warning: menu entries " lyxerr << "Menu warning: menu entries "
<< '"' << it1->fulllabel() << '"' << lyx::to_utf8(it1->fulllabel())
<< "\" and \"" << it2->fulllabel() << "\" and \"" << lyx::to_utf8(it2->fulllabel())
<< "\" share the same shortcut." << "\" share the same shortcut."
<< endl; << endl;
} }
@ -399,7 +402,7 @@ void Menu::checkShortcuts() const
} }
void MenuBackend::specialMenu(string const &name) void MenuBackend::specialMenu(docstring const &name)
{ {
if (hasMenu(name)) if (hasMenu(name))
specialmenu_ = &getMenu(name); specialmenu_ = &getMenu(name);
@ -434,9 +437,9 @@ void expandLastfiles(Menu & tomenu, LyXView const * view)
int ii = 1; int ii = 1;
for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) {
string const label = convert<string>(ii) + ". " docstring const label = convert<docstring>(ii) + lyx::from_ascii(". ")
+ makeDisplayPath((*lfit), 30) + lyx::from_utf8(makeDisplayPath((*lfit), 30))
+ '|' + convert<string>(ii); + char_type('|') + convert<docstring>(ii);
tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view);
} }
} }
@ -448,7 +451,7 @@ void expandDocuments(Menu & tomenu, LyXView const * view)
Strings const names = bufferlist.getFileNames(); Strings const names = bufferlist.getFileNames();
if (names.empty()) { if (names.empty()) {
tomenu.add(MenuItem(MenuItem::Command, lyx::to_utf8(_("No Documents Open!")), tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), view); FuncRequest(LFUN_NOACTION)), view);
return; return;
} }
@ -457,9 +460,9 @@ void expandDocuments(Menu & tomenu, LyXView const * view)
Strings::const_iterator docit = names.begin(); Strings::const_iterator docit = names.begin();
Strings::const_iterator end = names.end(); Strings::const_iterator end = names.end();
for (; docit != end; ++docit, ++ii) { for (; docit != end; ++docit, ++ii) {
string label = makeDisplayPath(*docit, 20); docstring label = lyx::from_utf8(makeDisplayPath(*docit, 20));
if (ii < 10) if (ii < 10)
label = convert<string>(ii) + ". " + label + '|' + convert<string>(ii); label = convert<docstring>(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert<docstring>(ii);
tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)), view); tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)), view);
} }
} }
@ -469,7 +472,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
{ {
if (!view->buffer() && kind != MenuItem::ImportFormats) { if (!view->buffer() && kind != MenuItem::ImportFormats) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_("No Documents Open!")), _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), FuncRequest(LFUN_NOACTION)),
view); view);
return; return;
@ -503,15 +506,15 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
for (; fit != end ; ++fit) { for (; fit != end ; ++fit) {
if ((*fit)->dummy()) if ((*fit)->dummy())
continue; continue;
string label = (*fit)->prettyname(); docstring label = lyx::from_utf8((*fit)->prettyname());
switch (kind) { switch (kind) {
case MenuItem::ImportFormats: case MenuItem::ImportFormats:
if ((*fit)->name() == "text") if ((*fit)->name() == "text")
label = lyx::to_utf8(_("Plain Text as Lines")); label = _("Plain Text as Lines");
else if ((*fit)->name() == "textparagraph") else if ((*fit)->name() == "textparagraph")
label = lyx::to_utf8(_("Plain Text as Paragraphs")); label = _("Plain Text as Paragraphs");
label += "..."; label += lyx::from_ascii("...");
break; break;
case MenuItem::ViewFormats: case MenuItem::ViewFormats:
case MenuItem::ExportFormats: case MenuItem::ExportFormats:
@ -524,7 +527,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view)
break; break;
} }
if (!(*fit)->shortcut().empty()) if (!(*fit)->shortcut().empty())
label += '|' + (*fit)->shortcut(); label += char_type('|') + lyx::from_utf8((*fit)->shortcut());
tomenu.add(MenuItem(MenuItem::Command, label, tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(action, (*fit)->name())), FuncRequest(action, (*fit)->name())),
@ -537,7 +540,7 @@ void expandFloatListInsert(Menu & tomenu, LyXView const * view)
{ {
if (!view->buffer()) { if (!view->buffer()) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_("No Documents Open!")), _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), FuncRequest(LFUN_NOACTION)),
view); view);
return; return;
@ -549,7 +552,7 @@ void expandFloatListInsert(Menu & tomenu, LyXView const * view)
FloatList::const_iterator end = floats.end(); FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_(cit->second.listName())), _(cit->second.listName()),
FuncRequest(LFUN_FLOAT_LIST, FuncRequest(LFUN_FLOAT_LIST,
cit->second.type())), cit->second.type())),
view); view);
@ -561,7 +564,7 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view)
{ {
if (!view->buffer()) { if (!view->buffer()) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_("No Documents Open!")), _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), FuncRequest(LFUN_NOACTION)),
view); view);
return; return;
@ -573,7 +576,7 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view)
FloatList::const_iterator end = floats.end(); FloatList::const_iterator end = floats.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit) {
// normal float // normal float
string const label = lyx::to_utf8(_(cit->second.name())); docstring const label = _(cit->second.name());
tomenu.add(MenuItem(MenuItem::Command, label, tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_FLOAT_INSERT, FuncRequest(LFUN_FLOAT_INSERT,
cit->second.type())), cit->second.type())),
@ -586,7 +589,7 @@ void expandCharStyleInsert(Menu & tomenu, LyXView const * view)
{ {
if (!view->buffer()) { if (!view->buffer()) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_("No Documents Open!")), _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), FuncRequest(LFUN_NOACTION)),
view); view);
return; return;
@ -596,7 +599,7 @@ void expandCharStyleInsert(Menu & tomenu, LyXView const * view)
CharStyles::iterator cit = charstyles.begin(); CharStyles::iterator cit = charstyles.begin();
CharStyles::iterator end = charstyles.end(); CharStyles::iterator end = charstyles.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit) {
string const label = cit->name; docstring const label = lyx::from_utf8(cit->name);
tomenu.add(MenuItem(MenuItem::Command, label, tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_CHARSTYLE_INSERT, FuncRequest(LFUN_CHARSTYLE_INSERT,
cit->name)), view); cit->name)), view);
@ -623,12 +626,12 @@ void expandToc2(Menu & tomenu,
if (to - from <= max_number_of_items) { if (to - from <= max_number_of_items) {
for (lyx::toc::Toc::size_type i = from; i < to; ++i) { for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
string label(4 * max(0, toc_list[i].depth() - depth),' '); docstring label(4 * max(0, toc_list[i].depth() - depth), char_type(' '));
label += limit_string_length(toc_list[i].str()); label += lyx::from_utf8(limit_string_length(toc_list[i].str()));
if (toc_list[i].depth() == depth if (toc_list[i].depth() == depth
&& shortcut_count < 9) { && shortcut_count < 9) {
if (label.find(convert<string>(shortcut_count + 1)) != string::npos) if (label.find(convert<docstring>(shortcut_count + 1)) != docstring::npos)
label += '|' + convert<string>(++shortcut_count); label += char_type('|') + convert<docstring>(++shortcut_count);
} }
tomenu.add(MenuItem(MenuItem::Command, label, tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(toc_list[i].action()))); FuncRequest(toc_list[i].action())));
@ -641,12 +644,12 @@ void expandToc2(Menu & tomenu,
toc_list[new_pos].depth() > depth) toc_list[new_pos].depth() > depth)
++new_pos; ++new_pos;
string label(4 * max(0, toc_list[pos].depth() - depth), ' '); docstring label(4 * max(0, toc_list[pos].depth() - depth), ' ');
label += limit_string_length(toc_list[pos].str()); label += lyx::from_utf8(limit_string_length(toc_list[pos].str()));
if (toc_list[pos].depth() == depth && if (toc_list[pos].depth() == depth &&
shortcut_count < 9) { shortcut_count < 9) {
if (label.find(convert<string>(shortcut_count + 1)) != string::npos) if (label.find(convert<docstring>(shortcut_count + 1)) != docstring::npos)
label += '|' + convert<string>(++shortcut_count); label += char_type('|') + convert<docstring>(++shortcut_count);
} }
if (new_pos == pos + 1) { if (new_pos == pos + 1) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
@ -675,7 +678,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
Buffer const * buf = view->buffer(); Buffer const * buf = view->buffer();
if (!buf) { if (!buf) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_("No Documents Open!")), _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), FuncRequest(LFUN_NOACTION)),
view); view);
return; return;
@ -695,13 +698,13 @@ void expandToc(Menu & tomenu, LyXView const * view)
lyx::toc::Toc::const_iterator ccit = cit->second.begin(); lyx::toc::Toc::const_iterator ccit = cit->second.begin();
lyx::toc::Toc::const_iterator eend = cit->second.end(); lyx::toc::Toc::const_iterator eend = cit->second.end();
for (; ccit != eend; ++ccit) { for (; ccit != eend; ++ccit) {
string const label = limit_string_length(ccit->str()); docstring const label = lyx::from_utf8(limit_string_length(ccit->str()));
menu->add(MenuItem(MenuItem::Command, menu->add(MenuItem(MenuItem::Command,
label, label,
FuncRequest(ccit->action()))); FuncRequest(ccit->action())));
} }
string const & floatName = floatlist.getType(cit->first).listName(); string const & floatName = floatlist.getType(cit->first).listName();
MenuItem item(MenuItem::Submenu, lyx::to_utf8(_(floatName))); MenuItem item(MenuItem::Submenu, _(floatName));
item.submenu(menu.release()); item.submenu(menu.release());
tomenu.add(item); tomenu.add(item);
} }
@ -710,7 +713,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
cit = toc_list.find("TOC"); cit = toc_list.find("TOC");
if (cit == end) { if (cit == end) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
lyx::to_utf8(_("No Table of contents")), _("No Table of contents"),
FuncRequest()), FuncRequest()),
view); view);
} else { } else {
@ -731,7 +734,7 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view)
vector<string>::const_iterator end = sel.end(); vector<string>::const_iterator end = sel.end();
for (unsigned int index = 0; cit != end; ++cit, ++index) { for (unsigned int index = 0; cit != end; ++cit, ++index) {
tomenu.add(MenuItem(MenuItem::Command, *cit, tomenu.add(MenuItem(MenuItem::Command, lyx::from_utf8(*cit),
FuncRequest(LFUN_PASTE, convert<string>(index)))); FuncRequest(LFUN_PASTE, convert<string>(index))));
} }
} }
@ -748,9 +751,9 @@ void expandBranches(Menu & tomenu, LyXView const * view)
BranchList::const_iterator end = params.branchlist().end(); BranchList::const_iterator end = params.branchlist().end();
for (int ii = 1; cit != end; ++cit, ++ii) { for (int ii = 1; cit != end; ++cit, ++ii) {
string label = cit->getBranch(); docstring label = lyx::from_utf8(cit->getBranch());
if (ii < 10) if (ii < 10)
label = convert<string>(ii) + ". " + label + "|" + convert<string>(ii); label = convert<docstring>(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert<docstring>(ii);
tomenu.add(MenuItem(MenuItem::Command, label, tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_BRANCH_INSERT, FuncRequest(LFUN_BRANCH_INSERT,
cit->getBranch())), view); cit->getBranch())), view);
@ -873,7 +876,7 @@ void MenuBackend::read(LyXLex & lex)
break; break;
case md_menu: { case md_menu: {
lex.next(true); lex.next(true);
string const name = lex.getString(); docstring const name = lyx::from_utf8(lex.getString());
if (hasMenu(name)) { if (hasMenu(name)) {
getMenu(name).read(lex); getMenu(name).read(lex);
} else { } else {
@ -902,27 +905,27 @@ void MenuBackend::add(Menu const & menu)
} }
bool MenuBackend::hasMenu(string const & name) const bool MenuBackend::hasMenu(docstring const & name) const
{ {
return find_if(begin(), end(), MenuNamesEqual(name)) != end(); return find_if(begin(), end(), MenuNamesEqual(name)) != end();
} }
Menu const & MenuBackend::getMenu(string const & name) const Menu const & MenuBackend::getMenu(docstring const & name) const
{ {
const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name)); const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name));
if (cit == end()) if (cit == end())
lyxerr << "No submenu named " << name << endl; lyxerr << "No submenu named " << lyx::to_utf8(name) << endl;
BOOST_ASSERT(cit != end()); BOOST_ASSERT(cit != end());
return (*cit); return (*cit);
} }
Menu & MenuBackend::getMenu(string const & name) Menu & MenuBackend::getMenu(docstring const & name)
{ {
iterator it = find_if(begin(), end(), MenuNamesEqual(name)); iterator it = find_if(begin(), end(), MenuNamesEqual(name));
if (it == end()) if (it == end())
lyxerr << "No submenu named " << name << endl; lyxerr << "No submenu named " << lyx::to_utf8(name) << endl;
BOOST_ASSERT(it != end()); BOOST_ASSERT(it != end());
return (*it); return (*it);
} }

36
src/MenuBackend.h
View File

@ -74,23 +74,23 @@ public:
explicit MenuItem(Kind kind); explicit MenuItem(Kind kind);
MenuItem(Kind kind, MenuItem(Kind kind,
std::string const & label, lyx::docstring const & label,
std::string const & command = std::string(), lyx::docstring const & submenu = lyx::docstring(),
bool optional = false); bool optional = false);
MenuItem(Kind kind, MenuItem(Kind kind,
std::string const & label, lyx::docstring const & label,
FuncRequest const & func, FuncRequest const & func,
bool optional = false); bool optional = false);
/// This one is just to please boost::shared_ptr<> /// This one is just to please boost::shared_ptr<>
~MenuItem(); ~MenuItem();
/// The label of a given menuitem /// The label of a given menuitem
std::string const label() const; lyx::docstring const label() const;
/// The keyboard shortcut (usually underlined in the entry) /// The keyboard shortcut (usually underlined in the entry)
std::string const shortcut() const; lyx::docstring const shortcut() const;
/// The complete label, with label and shortcut separated by a '|' /// The complete label, with label and shortcut separated by a '|'
std::string const fulllabel() const { return label_;} lyx::docstring const fulllabel() const { return label_;}
/// The kind of entry /// The kind of entry
Kind kind() const { return kind_; } Kind kind() const { return kind_; }
/// the action (if relevant) /// the action (if relevant)
@ -104,11 +104,11 @@ public:
/// returns the status of the lfun associated with this entry /// returns the status of the lfun associated with this entry
void status(FuncStatus const & status) { status_ = status; } void status(FuncStatus const & status) { status_ = status; }
/// returns the binding associated to this action /// returns the binding associated to this action
std::string const binding() const; lyx::docstring const binding() const;
/// the description of the submenu (if relevant) /// the description of the submenu (if relevant)
std::string const & submenuname() const { return submenuname_; } lyx::docstring const & submenuname() const { return submenuname_; }
/// set the description of the submenu /// set the description of the submenu
void submenuname(std::string const & name) { submenuname_ = name; } void submenuname(lyx::docstring const & name) { submenuname_ = name; }
/// ///
Menu * submenu() const { return submenu_.get(); } Menu * submenu() const { return submenu_.get(); }
/// ///
@ -119,11 +119,11 @@ private:
/// ///
Kind kind_; Kind kind_;
/// ///
std::string label_; lyx::docstring label_;
/// ///
FuncRequest func_; FuncRequest func_;
/// ///
std::string submenuname_; lyx::docstring submenuname_;
/// ///
bool optional_; bool optional_;
/// ///
@ -143,14 +143,14 @@ public:
/// ///
typedef ItemList::size_type size_type; typedef ItemList::size_type size_type;
/// ///
explicit Menu(std::string const & name = std::string()) explicit Menu(lyx::docstring const & name = lyx::docstring())
: name_(name) {} : name_(name) {}
/// ///
Menu & add(MenuItem const &, LyXView const * view = 0); Menu & add(MenuItem const &, LyXView const * view = 0);
/// ///
Menu & read(LyXLex &); Menu & read(LyXLex &);
/// ///
std::string const & name() const { return name_; } lyx::docstring const & name() const { return name_; }
/// ///
bool empty() const { return items_.empty(); } bool empty() const { return items_.empty(); }
/// Clear the menu content. /// Clear the menu content.
@ -178,7 +178,7 @@ private:
/// ///
ItemList items_; ItemList items_;
/// ///
std::string name_; lyx::docstring name_;
}; };
@ -198,11 +198,11 @@ public:
/// ///
void add(Menu const &); void add(Menu const &);
/// ///
bool hasMenu(std::string const &) const; bool hasMenu(lyx::docstring const &) const;
/// ///
Menu & getMenu(std::string const &); Menu & getMenu(lyx::docstring const &);
/// ///
Menu const & getMenu(std::string const &) const; Menu const & getMenu(lyx::docstring const &) const;
/// ///
Menu const & getMenubar() const; Menu const & getMenubar() const;
/// ///
@ -211,7 +211,7 @@ public:
will be removed by expand() in other menus. This is used by will be removed by expand() in other menus. This is used by
the Qt/Mac code the Qt/Mac code
*/ */
void specialMenu(std::string const &); void specialMenu(lyx::docstring const &);
/// Expands some special entries of the menu /// Expands some special entries of the menu
/** The entries with the following kind are expanded to a /** The entries with the following kind are expanded to a
sequence of Command MenuItems: Lastfiles, Documents, sequence of Command MenuItems: Lastfiles, Documents,

4
src/frontends/Menubar.h
View File

@ -13,7 +13,7 @@
#ifndef MENUBAR_H #ifndef MENUBAR_H
#define MENUBAR_H #define MENUBAR_H
#include <string> #include "support/docstring.h"
/** /**
* The LyX GUI independent menubar class * The LyX GUI independent menubar class
@ -24,7 +24,7 @@ public:
/// ///
virtual ~Menubar() {} virtual ~Menubar() {}
/// Opens a top-level submenu given its name /// Opens a top-level submenu given its name
virtual void openByName(std::string const &) = 0; virtual void openByName(lyx::docstring const &) = 0;
/// update the state of the menuitems /// update the state of the menuitems
virtual void update() = 0; virtual void update() = 0;
}; };

35
src/frontends/gtk/GMenubar.C
View File

@ -27,8 +27,12 @@
#include "debug.h" #include "debug.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/docstring.h"
#include "lyxfunc.h" #include "lyxfunc.h"
using lyx::char_type;
using lyx::docstring;
using std::string; using std::string;
namespace lyx { namespace lyx {
@ -52,15 +56,17 @@ private:
}; };
// ENCODING: assume that the backend will give us a locale string Glib::ustring labelTrans(docstring const & label_src,
Glib::ustring labelTrans(string const & label_src, string const & shortcut) docstring const & shortcut)
{ {
string label = subst(label_src, "_", "__"); docstring label = subst(label_src,
string::size_type i = label.find(shortcut); lyx::from_ascii("_"),
if (i == string::npos) lyx::from_ascii("__"));
return Glib::locale_to_utf8 (label); docstring::size_type i = label.find(shortcut);
label.insert(i, "_"); if (i == docstring::npos)
return Glib::locale_to_utf8 (label); return lyx::to_utf8(label);
label.insert(i, lyx::from_ascii("_"));
return lyx::to_utf8(label);
} }
@ -104,7 +110,7 @@ GMenubar::GMenubar(LyXView * lyxView, MenuBackend const & /*menuBackend*/) :
menubar_.items().back().signal_activate().connect( menubar_.items().back().signal_activate().connect(
sigc::bind(sigc::mem_fun(*this, &GMenubar::onSubMenuActivate), &(*i), sigc::bind(sigc::mem_fun(*this, &GMenubar::onSubMenuActivate), &(*i),
&menubar_.items().back())); &menubar_.items().back()));
mainMenuNames_.push_back(i->submenuname()); mainMenuNames_.push_back(lyx::to_utf8(i->submenuname()));
} }
menubar_.show(); menubar_.show();
gview->getBox(GView::Top).children().push_back( gview->getBox(GView::Top).children().push_back(
@ -123,9 +129,9 @@ void GMenubar::update()
} }
void GMenubar::openByName(string const & name) void GMenubar::openByName(docstring const & name)
{ {
Glib::ustring uname = Glib::convert(name, "UTF-8", "ISO-8859-1"); Glib::ustring uname = lyx::to_utf8(name);
std::vector<Glib::ustring>::iterator it = std::vector<Glib::ustring>::iterator it =
std::find(mainMenuNames_.begin(), mainMenuNames_.end(), std::find(mainMenuNames_.begin(), mainMenuNames_.end(),
uname); uname);
@ -136,7 +142,7 @@ void GMenubar::openByName(string const & name)
return; return;
} }
lyxerr << "GMenubar::openByName: menu " lyxerr << "GMenubar::openByName: menu "
<< name << " not found" << std::endl; << lyx::to_utf8(name) << " not found" << std::endl;
} }
@ -228,8 +234,9 @@ void GMenubar::onSubMenuActivate(MenuItem const * item,
Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox); Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox);
Gtk::Label * label1 = Gtk::manage(new Gtk::Label( Gtk::Label * label1 = Gtk::manage(new Gtk::Label(
labelTrans(i->label(), i->shortcut()), true)); labelTrans(i->label(), i->shortcut()), true));
Gtk::Label * label2 = Gtk::manage(new Gtk::Label( Gtk::Label * label2 =
" " + i->binding(), false)); Gtk::manage(new Gtk::Label(
" " + lyx::to_utf8(i->binding()), false));
hbox->pack_start(*label1, false, false, 0); hbox->pack_start(*label1, false, false, 0);
hbox->pack_end(*label2, false, false, 0); hbox->pack_end(*label2, false, false, 0);
imgitem->add(*hbox); imgitem->add(*hbox);

2
src/frontends/gtk/GMenubar.h
View File

@ -29,7 +29,7 @@ public:
GMenubar(LyXView *, MenuBackend const &); GMenubar(LyXView *, MenuBackend const &);
~GMenubar(); ~GMenubar();
void update(); void update();
void openByName(std::string const &); void openByName(lyx::docstring const &);
private: private:
void onCommandActivate(MenuItem const * item, Gtk::MenuItem * gitem); void onCommandActivate(MenuItem const * item, Gtk::MenuItem * gitem);
void onSubMenuActivate(MenuItem const * item, Gtk::MenuItem * gitem); void onSubMenuActivate(MenuItem const * item, Gtk::MenuItem * gitem);

4
src/frontends/qt3/QLMenubar.C
View File

@ -22,6 +22,8 @@
#include <qmenubar.h> #include <qmenubar.h>
#include <qcursor.h> #include <qcursor.h>
using lyx::docstring;
using std::pair; using std::pair;
using std::string; using std::string;
@ -50,7 +52,7 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe)
#endif #endif
} }
void QLMenubar::openByName(string const & name) void QLMenubar::openByName(docstring const & name)
{ {
NameMap::const_iterator const cit = name_map_.find(name); NameMap::const_iterator const cit = name_map_.find(name);
if (cit == name_map_.end()) if (cit == name_map_.end())

4
src/frontends/qt3/QLMenubar.h
View File

@ -32,7 +32,7 @@ public:
QLMenubar(LyXView *, MenuBackend &); QLMenubar(LyXView *, MenuBackend &);
/// opens a top-level submenu given its name /// opens a top-level submenu given its name
void openByName(std::string const &); void openByName(lyx::docstring const &);
/// update the state of the menuitems - not needed /// update the state of the menuitems - not needed
void update(); void update();
@ -49,7 +49,7 @@ private:
/// menu controller /// menu controller
MenuBackend & menubackend_; MenuBackend & menubackend_;
typedef std::map<std::string, QLPopupMenu *> NameMap; typedef std::map<lyx::docstring, QLPopupMenu *> NameMap;
/// name to menu for openByName /// name to menu for openByName
NameMap name_map_; NameMap name_map_;

20
src/frontends/qt3/QLPopupMenu.C
View File

@ -45,15 +45,17 @@ namespace frontend {
namespace { namespace {
string const getLabel(MenuItem const & mi) docstring const getLabel(MenuItem const & mi)
{ {
string const shortcut = mi.shortcut(); docstring const shortcut = mi.shortcut();
string label = subst(mi.label(), "&", "&&"); docstring label = subst(mi.label(),
lyx::from_ascii("&"),
lyx::from_ascii("&&"));
if (!shortcut.empty()) { if (!shortcut.empty()) {
string::size_type pos = label.find(shortcut); docstring::size_type pos = label.find(shortcut);
if (pos != string::npos) if (pos != docstring::npos)
label.insert(pos, 1, '&'); label.insert(pos, 1, char_type('&'));
} }
return label; return label;
@ -78,7 +80,7 @@ createMenu(QMenuData * parent, MenuItem const * item, QLMenubar * owner,
QLPopupMenu::QLPopupMenu(QLMenubar * owner, QLPopupMenu::QLPopupMenu(QLMenubar * owner,
string const & name, bool toplevel) docstring const & name, bool toplevel)
: owner_(owner), name_(name) : owner_(owner), name_(name)
{ {
if (toplevel) if (toplevel)
@ -141,9 +143,9 @@ void QLPopupMenu::populate(Menu * menu)
label += '\t' + key->qprint(binding.second); label += '\t' + key->qprint(binding.second);
} }
#else #else
string const binding(m->binding()); docstring const binding(m->binding());
if (!binding.empty()) { if (!binding.empty()) {
label += '\t' + toqstr(binding); label += char_type('\t') + toqstr(binding);
} }
#endif #endif

4
src/frontends/qt3/QLPopupMenu.h
View File

@ -40,7 +40,7 @@ class QLPopupMenu : public QPopupMenu {
Q_OBJECT Q_OBJECT
public: public:
QLPopupMenu(QLMenubar * owner, QLPopupMenu(QLMenubar * owner,
std::string const & name, bool toplevel); lyx::docstring const & name, bool toplevel);
/// populate the menu /// populate the menu
void populate(Menu * menu); void populate(Menu * menu);
@ -54,7 +54,7 @@ private:
QLMenubar * owner_; QLMenubar * owner_;
/// the name of this menu /// the name of this menu
std::string name_; lyx::docstring name_;
/// ///
typedef std::vector<FuncRequest> Funcs; typedef std::vector<FuncRequest> Funcs;

2
src/frontends/qt3/qt_helpers.C
View File

@ -107,7 +107,7 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
QString const toqstr(char const * str) QString const toqstr(char const * str)
{ {
return QString::fromAscii(str); return QString::fromUtf8(str);
} }

16
src/frontends/qt4/QLMenubar.C
View File

@ -47,10 +47,10 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe)
{ {
macxMenuBarInit(); macxMenuBarInit();
lyxerr[Debug::GUI] << "populating menu bar" << menubackend_.getMenubar().name() << endl; lyxerr[Debug::GUI] << "populating menu bar" << lyx::to_utf8(menubackend_.getMenubar().name()) << endl;
if (menubackend_.getMenubar().size() == 0) { if (menubackend_.getMenubar().size() == 0) {
lyxerr[Debug::GUI] << "\tERROR: empty menu bar" << menubackend_.getMenubar().name() << endl; lyxerr[Debug::GUI] << "\tERROR: empty menu bar" << lyx::to_utf8(menubackend_.getMenubar().name()) << endl;
return; return;
// continue; // continue;
} }
@ -68,15 +68,15 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe)
for (; m != end; ++m) { for (; m != end; ++m) {
if (m->kind() != MenuItem::Submenu) { if (m->kind() != MenuItem::Submenu) {
lyxerr[Debug::GUI] << "\tERROR: not a submenu " << m->label() << endl; lyxerr[Debug::GUI] << "\tERROR: not a submenu " << lyx::to_utf8(m->label()) << endl;
continue; continue;
} }
lyxerr[Debug::GUI] << "menu bar item " << m->label() << " is a submenu named " << m->submenuname() << endl; lyxerr[Debug::GUI] << "menu bar item " << lyx::to_utf8(m->label()) << " is a submenu named " << lyx::to_utf8(m->submenuname()) << endl;
string name = m->submenuname(); docstring name = m->submenuname();
if (!menubackend_.hasMenu(name)) { if (!menubackend_.hasMenu(name)) {
lyxerr[Debug::GUI] << "\tERROR: " << name << " submenu has no menu!" << endl; lyxerr[Debug::GUI] << "\tERROR: " << lyx::to_utf8(name) << " submenu has no menu!" << endl;
continue; continue;
} }
@ -88,7 +88,7 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe)
pair<NameMap::iterator, bool> I = name_map_.insert(make_pair(name, qMenu)); pair<NameMap::iterator, bool> I = name_map_.insert(make_pair(name, qMenu));
if (!I.second) { if (!I.second) {
lyxerr[Debug::GUI] << "\tERROR: " << name << " submenu is already there!" << endl; lyxerr[Debug::GUI] << "\tERROR: " << lyx::to_utf8(name) << " submenu is already there!" << endl;
} }
/* /*
QObject::connect(qMenu, SIGNAL(aboutToShow()), this, SLOT(update())); QObject::connect(qMenu, SIGNAL(aboutToShow()), this, SLOT(update()));
@ -99,7 +99,7 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe)
//QObject::connect(owner_->menuBar(), SIGNAL(triggered()), this, SLOT(update())); //QObject::connect(owner_->menuBar(), SIGNAL(triggered()), this, SLOT(update()));
} }
void QLMenubar::openByName(string const & name) void QLMenubar::openByName(docstring const & name)
{ {
NameMap::const_iterator const cit = name_map_.find(name); NameMap::const_iterator const cit = name_map_.find(name);
if (cit == name_map_.end()) if (cit == name_map_.end())

4
src/frontends/qt4/QLMenubar.h
View File

@ -41,7 +41,7 @@ public:
QLMenubar(LyXView *, MenuBackend &); QLMenubar(LyXView *, MenuBackend &);
/// opens a top-level submenu given its name /// opens a top-level submenu given its name
void openByName(std::string const &); void openByName(lyx::docstring const &);
/// return the owning view /// return the owning view
GuiView * view(); GuiView * view();
@ -69,7 +69,7 @@ private:
/// menu controller /// menu controller
MenuBackend & menubackend_; MenuBackend & menubackend_;
typedef std::map<std::string, QLPopupMenu *> NameMap; typedef std::map<lyx::docstring, QLPopupMenu *> NameMap;
/// name to menu for openByName /// name to menu for openByName
NameMap name_map_; NameMap name_map_;

36
src/frontends/qt4/QLPopupMenu.C
View File

@ -67,7 +67,7 @@ QLPopupMenu::QLPopupMenu(QLMenubar * owner,
void QLPopupMenu::update() void QLPopupMenu::update()
{ {
lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION << endl; lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION << endl;
lyxerr[Debug::GUI] << "\tTriggered menu: " << name_ << endl; lyxerr[Debug::GUI] << "\tTriggered menu: " << lyx::to_utf8(name_) << endl;
clear(); clear();
@ -78,7 +78,7 @@ void QLPopupMenu::update()
owner_->backend().expand(fromLyxMenu, topLevelMenu_, owner_->view()); owner_->backend().expand(fromLyxMenu, topLevelMenu_, owner_->view());
if (!owner_->backend().hasMenu(topLevelMenu_.name())) { if (!owner_->backend().hasMenu(topLevelMenu_.name())) {
lyxerr[Debug::GUI] << "\tWARNING: menu seems empty" << topLevelMenu_.name() << endl; lyxerr[Debug::GUI] << "\tWARNING: menu seems empty" << lyx::to_utf8(topLevelMenu_.name()) << endl;
} }
populate(this, &topLevelMenu_); populate(this, &topLevelMenu_);
@ -87,9 +87,9 @@ void QLPopupMenu::update()
void QLPopupMenu::populate(QMenu* qMenu, Menu * menu) void QLPopupMenu::populate(QMenu* qMenu, Menu * menu)
{ {
lyxerr[Debug::GUI] << "populating menu " << menu->name() ; lyxerr[Debug::GUI] << "populating menu " << lyx::to_utf8(menu->name()) ;
if (menu->size() == 0) { if (menu->size() == 0) {
lyxerr[Debug::GUI] << "\tERROR: empty menu " << menu->name() << endl; lyxerr[Debug::GUI] << "\tERROR: empty menu " << lyx::to_utf8(menu->name()) << endl;
return; return;
} }
else { else {
@ -108,46 +108,48 @@ void QLPopupMenu::populate(QMenu* qMenu, Menu * menu)
} else if (m->kind() == MenuItem::Submenu) { } else if (m->kind() == MenuItem::Submenu) {
lyxerr[Debug::GUI] << "** creating New Sub-Menu " << getLabel(*m) << endl; lyxerr[Debug::GUI] << "** creating New Sub-Menu " << lyx::to_utf8(getLabel(*m)) << endl;
QMenu * subMenu = qMenu->addMenu(toqstr(getLabel(*m))); QMenu * subMenu = qMenu->addMenu(toqstr(getLabel(*m)));
populate(subMenu, m->submenu()); populate(subMenu, m->submenu());
} else { // we have a MenuItem::Command } else { // we have a MenuItem::Command
lyxerr[Debug::GUI] << "creating Menu Item " << m->label() << endl; lyxerr[Debug::GUI] << "creating Menu Item " << lyx::to_utf8(m->label()) << endl;
string label = getLabel(*m); docstring label = getLabel(*m);
addBinding(label, *m); addBinding(label, *m);
Action * action = new Action(*(owner_->view()), Action * action = new Action(*(owner_->view()),
label, m->func()); lyx::to_utf8(label), m->func());
qMenu->addAction(action); qMenu->addAction(action);
} }
} }
} }
string const QLPopupMenu::getLabel(MenuItem const & mi) docstring const QLPopupMenu::getLabel(MenuItem const & mi)
{ {
string const shortcut = mi.shortcut(); docstring const shortcut = mi.shortcut();
string label = support::subst(mi.label(), "&", "&&"); docstring label = support::subst(mi.label(),
lyx::from_ascii("&"),
lyx::from_ascii("&&"));
if (!shortcut.empty()) { if (!shortcut.empty()) {
string::size_type pos = label.find(shortcut); docstring::size_type pos = label.find(shortcut);
if (pos != string::npos) if (pos != docstring::npos)
label.insert(pos, 1, '&'); label.insert(pos, 1, char_type('&'));
} }
return label; return label;
} }
/// \todo Mac specific binding handling. /// \todo Mac specific binding handling.
void QLPopupMenu::addBinding(string & label, MenuItem const & mi) void QLPopupMenu::addBinding(docstring & label, MenuItem const & mi)
{ {
#ifndef Q_WS_MACX #ifndef Q_WS_MACX
string const binding(mi.binding()); docstring const binding(mi.binding());
if (!binding.empty()) { if (!binding.empty()) {
label += '\t' + binding; label += char_type('\t') + binding;
} }
#else #else

9
src/frontends/qt4/QLPopupMenu.h
View File

@ -17,9 +17,6 @@
#include "funcrequest.h" #include "funcrequest.h"
#include "MenuBackend.h" #include "MenuBackend.h"
#include <utility>
#include <string>
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {
@ -46,15 +43,15 @@ private:
QLMenubar * owner_; QLMenubar * owner_;
/// the name of this menu /// the name of this menu
std::string name_; lyx::docstring name_;
private: private:
/// Get a Menu item label from the menu backend /// Get a Menu item label from the menu backend
std::string const getLabel(MenuItem const & mi); lyx::docstring const getLabel(MenuItem const & mi);
/// add binding keys a the menu item label. /// add binding keys a the menu item label.
/// \todo Mac specific binding handling. /// \todo Mac specific binding handling.
void addBinding(std::string & label, MenuItem const & mi); void addBinding(lyx::docstring & label, MenuItem const & mi);
/// Top Level Menu /// Top Level Menu
Menu topLevelMenu_; Menu topLevelMenu_;

28
src/frontends/qt4/qt_helpers.C
View File

@ -48,7 +48,7 @@ string makeFontName(string const & family, string const & foundry)
} }
pair<string,string> parseFontName(string const & name) pair<string, string> parseFontName(string const & name)
{ {
string::size_type const idx = name.find('['); string::size_type const idx = name.find('[');
if (idx == string::npos || idx == 0) if (idx == string::npos || idx == 0)
@ -60,15 +60,15 @@ pair<string,string> parseFontName(string const & name)
string widgetsToLength(QLineEdit const * input, LengthCombo const * combo) string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
{ {
QString length = input->text(); QString const length = input->text();
if (length.isEmpty()) if (length.isEmpty())
return string(); return string();
// don't return unit-from-choice if the input(field) contains a unit // Don't return unit-from-choice if the input(field) contains a unit
if (isValidGlueLength(fromqstr(length))) if (isValidGlueLength(fromqstr(length)))
return fromqstr(length); return fromqstr(length);
LyXLength::UNIT unit = combo->currentLengthItem(); LyXLength::UNIT const unit = combo->currentLengthItem();
return LyXLength(length.toDouble(), unit).asString(); return LyXLength(length.toDouble(), unit).asString();
} }
@ -76,7 +76,7 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
LyXLength widgetsToLength(QLineEdit const * input, QComboBox const * combo) LyXLength widgetsToLength(QLineEdit const * input, QComboBox const * combo)
{ {
QString length = input->text(); QString const length = input->text();
if (length.isEmpty()) if (length.isEmpty())
return LyXLength(); return LyXLength();
@ -84,7 +84,7 @@ LyXLength widgetsToLength(QLineEdit const * input, QComboBox const * combo)
if (isValidGlueLength(fromqstr(length))) if (isValidGlueLength(fromqstr(length)))
return LyXLength(fromqstr(length)); return LyXLength(fromqstr(length));
LyXLength::UNIT unit = unitFromString(fromqstr(combo->currentText())); LyXLength::UNIT const unit = unitFromString(fromqstr(combo->currentText()));
return LyXLength(length.toDouble(), unit); return LyXLength(length.toDouble(), unit);
} }
@ -110,7 +110,7 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
QString const toqstr(char const * str) QString const toqstr(char const * str)
{ {
return QString::fromAscii(str); return QString::fromUtf8(str);
} }
@ -145,7 +145,7 @@ QString const toqstr(docstring const & ucs4)
docstring const qstring_to_ucs4(QString const & qstr) docstring const qstring_to_ucs4(QString const & qstr)
{ {
int ls = qstr.size(); int const ls = qstr.size();
docstring ucs4; docstring ucs4;
for (int i = 0; i < ls; ++i) for (int i = 0; i < ls; ++i)
ucs4 += static_cast<char_type>(qstr[i].unicode()); ucs4 += static_cast<char_type>(qstr[i].unicode());
@ -156,7 +156,7 @@ docstring const qstring_to_ucs4(QString const & qstr)
void qstring_to_ucs4(QString const & qstr, vector<char_type> & ucs4) void qstring_to_ucs4(QString const & qstr, vector<char_type> & ucs4)
{ {
int ls = qstr.size(); int const ls = qstr.size();
ucs4.clear(); ucs4.clear();
for (int i = 0; i < ls; ++i) for (int i = 0; i < ls; ++i)
ucs4.push_back(static_cast<boost::uint32_t>(qstr[i].unicode())); ucs4.push_back(static_cast<boost::uint32_t>(qstr[i].unicode()));
@ -177,13 +177,13 @@ QChar const ucs4_to_qchar(char_type const & ucs4)
QString const qt_(char const * str) QString const qt_(char const * str)
{ {
return toqstr(lyx::to_utf8(_(str))); return toqstr(_(str));
} }
QString const qt_(string const & str) QString const qt_(string const & str)
{ {
return toqstr(lyx::to_utf8(_(str))); return toqstr(_(str));
} }
@ -208,8 +208,10 @@ string const formatted(string const & text, int w)
string::size_type const nxtpos2 = text.find('\n', curpos); string::size_type const nxtpos2 = text.find('\n', curpos);
string::size_type const nxtpos = std::min(nxtpos1, nxtpos2); string::size_type const nxtpos = std::min(nxtpos1, nxtpos2);
string const word = nxtpos == string::npos ? string const word =
text.substr(curpos) : text.substr(curpos, nxtpos-curpos); nxtpos == string::npos ?
text.substr(curpos) :
text.substr(curpos, nxtpos - curpos);
bool const newline = (nxtpos2 != string::npos && bool const newline = (nxtpos2 != string::npos &&
nxtpos2 < nxtpos1); nxtpos2 < nxtpos1);

2
src/lyxfunc.C
View File

@ -1108,7 +1108,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
break; break;
case LFUN_MENU_OPEN: case LFUN_MENU_OPEN:
owner->getMenubar().openByName(argument); owner->getMenubar().openByName(lyx::from_utf8(argument));
break; break;
// --- lyxserver commands ---------------------------- // --- lyxserver commands ----------------------------

9
src/support/convert.C
View File

@ -13,10 +13,14 @@
#include "convert.h" #include "convert.h"
#include "support/docstring.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <string> #include <string>
using lyx::docstring;
using boost::lexical_cast; using boost::lexical_cast;
using std::string; using std::string;
@ -49,6 +53,11 @@ string convert<string>(int i)
return lexical_cast<string>(i); return lexical_cast<string>(i);
} }
template<>
docstring convert<docstring>(int i)
{
return lyx::from_ascii(lexical_cast<string>(i));
}
template<> template<>
string convert<string>(unsigned int ui) string convert<string>(unsigned int ui)

44
src/support/lstrings.C
View File

@ -68,6 +68,28 @@ int compare_no_case(string const & s, string const & s2)
} }
int compare_no_case(docstring const & s, docstring const & s2)
{
docstring::const_iterator p = s.begin();
docstring::const_iterator p2 = s2.begin();
while (p != s.end() && p2 != s2.end()) {
int const lc1 = tolower(*p);
int const lc2 = tolower(*p2);
if (lc1 != lc2)
return (lc1 < lc2) ? -1 : 1;
++p;
++p2;
}
if (s.size() == s2.size())
return 0;
if (s.size() < s2.size())
return -1;
return 1;
}
namespace { namespace {
int ascii_tolower(int c) { int ascii_tolower(int c) {
if (c >= 'A' && c <= 'Z') if (c >= 'A' && c <= 'Z')
@ -345,6 +367,28 @@ string const token(string const & a, char delim, int n)
} }
docstring const token(docstring const & a, char_type delim, int n)
{
if (a.empty()) return docstring();
string::size_type k = 0;
string::size_type i = 0;
// Find delimiter or end of string
for (; n--;)
if ((i = a.find(delim, i)) == docstring::npos)
break;
else
++i; // step delim
// i is now the n'th delim (or string::npos)
if (i == docstring::npos) return docstring();
k = a.find(delim, i);
// k is now the n'th + 1 delim (or string::npos)
return a.substr(i, k - i);
}
// this could probably be faster and/or cleaner, but it seems to work (JMarc) // this could probably be faster and/or cleaner, but it seems to work (JMarc)
// rewritten to use new string (Lgb) // rewritten to use new string (Lgb)
int tokenPos(string const & a, char delim, string const & tok) int tokenPos(string const & a, char delim, string const & tok)

3
src/support/lstrings.h
View File

@ -26,6 +26,7 @@ namespace support {
/// ///
int compare_no_case(std::string const & s, std::string const & s2); int compare_no_case(std::string const & s, std::string const & s2);
int compare_no_case(lyx::docstring const & s, lyx::docstring const & s2);
/// ///
int compare_ascii_no_case(std::string const & s, std::string const & s2); int compare_ascii_no_case(std::string const & s, std::string const & s2);
@ -120,6 +121,8 @@ bool containsOnly(std::string const &, std::string const &);
*/ */
std::string const token(std::string const & a, char delim, int n); std::string const token(std::string const & a, char delim, int n);
lyx::docstring const token(lyx::docstring const & a,
lyx::char_type delim, int n);
/** Search a token in this string using the delim. /** Search a token in this string using the delim.
Doesn't modify the original string. Returns -1 in case of Doesn't modify the original string. Returns -1 in case of