~osomon/unity-2d/escapeAmpersandsPartII

[launcher] Escape ampersands in place entry section names so that they are not considered as keyboard accelerators.

added added

removed removed

797

798

for (int i = 0; i < m_sections->rowCount(); ++i) {

799

QAction* section = new QAction(m_menu);

800

section->setText(m_sections->data(m_sections->index(i)).toString());

800

QString sectionName = m_sections->data(m_sections->index(i)).toString();

801

/* Escape ampersands so that they are not considered as keyboard accelerators. */

802

sectionName.replace("&", "&&");

803

section->setText(sectionName);

801

804

section->setProperty(SECTION_PROPERTY, QVariant(i));

802

805

m_menu->addAction(section);

803

806

QObject::connect(section, SIGNAL(triggered()), this, SLOT(onSectionTriggered()));