fly/flightgear
1
0
Fork 0
Code Activity

Support localized menu on Mac/CocoaMenuBar.

Browse source
This commit is contained in:
ThorstenB 2012-05-05 09:30:52 +02:00
parent 0f462d4a6e
commit c5ce8e29ca
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/GUI/FGCocoaMenuBar.mm
View file

@ -172,16 +172,9 @@ void FGCocoaMenuBar::CocoaMenuBarPrivate::menuFromProps(NSMenu* menu, SGProperty
n->setBoolValue("enabled", true); n->setBoolValue("enabled", true);
} }
string shortcut; string l = getLocalizedLabel(n);
string l = n->getStringValue("label");
string::size_type pos = l.find("(");
if (pos != string::npos) {
string full(l);
l = full.substr(0, pos);
shortcut = full.substr(pos + 1, full.size() - (pos + 2));
}
NSString* label = stdStringToCocoa(strutils::simplify(l)); NSString* label = stdStringToCocoa(strutils::simplify(l));
string shortcut = n->getStringValue("key");
NSMenuItem* item; NSMenuItem* item;
if (index >= [menu numberOfItems]) { if (index >= [menu numberOfItems]) {
@ -258,7 +251,7 @@ void FGCocoaMenuBar::init()
} }
BOOST_FOREACH(SGPropertyNode_ptr n, props->getChildren("menu")) { BOOST_FOREACH(SGPropertyNode_ptr n, props->getChildren("menu")) {
NSString* label = stdStringToCocoa(n->getStringValue("label")); NSString* label = stdStringToCocoa(getLocalizedLabel(n));
NSMenuItem* item = [mainBar itemWithTitle:label]; NSMenuItem* item = [mainBar itemWithTitle:label];
NSMenu* menu; NSMenu* menu;