plasma-globalmenu/globalmenu.diff

   1 --- a/globalmenu.cpp    2010-08-16 19:20:11.180114454 +0300
   2 +++ b/globalmenu.cpp    2010-08-16 19:17:19.000000000 +0300
   3 @@ -94,7 +94,7 @@
   4      rootNode = doc.firstChild();
   5      for (QDomElement elem = rootNode.firstChildElement(); !elem.isNull(); elem = elem.nextSiblingElement()) {
   6          if (elem.attribute("visible") != "0") {
   7 -            result << elem.attribute("label").replace("(_","(&");
   8 +            result << elem.attribute("label").replace("(_","(&").replace("_","&");
   9          }
  10      }
  11      return result;
  12 @@ -275,7 +275,7 @@
  13          }
  14
  15          if (!itemElem.firstChildElement("menu").isNull()) {
  16 -            KMenu *childMenu = new KMenu(itemElem.attribute("label").replace("(_","(&"),topMenu);
  17 +            KMenu *childMenu = new KMenu(itemElem.attribute("label").replace("(_","(&").replace("_","&"),topMenu);
  18              buildChildMenu(childMenu,itemElem.firstChildElement("menu"),
  19                      QString("%1/%2").arg(prefix).arg(itemElem.attribute("id")));
  20              topMenu->addMenu(childMenu);
  21 @@ -283,7 +283,7 @@
  22          }
  23
  24          if (itemElem.attribute("type") == "i") {
  25 -            action = new KAction(itemElem.attribute("label").replace("(_","(&"),0);
  26 +            action = new KAction(itemElem.attribute("label").replace("(_","(&").replace("_","&"),0);
  27              mMapper->setMapping(action,QString("%1/%2").arg(prefix).arg(itemElem.attribute("id")));
  28              connect(action,SIGNAL(triggered()),mMapper,SLOT(map()));
  29              if (itemElem.attribute("sensible") == "0") {
  30 @@ -292,7 +292,7 @@
  31              topMenu->addAction(action);
  32          }
  33          if (itemElem.attribute("type") == "c") {
  34 -            action = new KAction(itemElem.attribute("label").replace("(_","(&"),0);
  35 +            action = new KAction(itemElem.attribute("label").replace("(_","(&").replace("_","&"),0);
  36              mMapper->setMapping(action,QString("%1/%2").arg(prefix).arg(itemElem.attribute("id")));
  37              connect(action,SIGNAL(triggered()),mMapper,SLOT(map()));
  38              action->setCheckable(true);
  39 @@ -303,7 +303,7 @@
  40              topMenu->addAction(action);
  41          }
  42          if (itemElem.attribute("type") == "r") {
  43 -            action = new KSelectAction(itemElem.attribute("label").replace("(_","(&"),0);
  44 +            action = new KSelectAction(itemElem.attribute("label").replace("(_","(&").replace("_","&"),0);
  45              mMapper->setMapping(action,QString("%1/%2").arg(prefix).arg(itemElem.attribute("id")));
  46              connect(action,SIGNAL(triggered()),mMapper,SLOT(map()));
  47              action->setCheckable(true);