fix bug 1350 (already fixed in HEAD)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@8367 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt2/ChangeLog

@@ -1,3 +1,9 @@
+2004-01-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* QLPopupMenu.C (getLabel): fix bug #1350. The menu entry did not
+	get a binding shown, because it did not have an accelerator
+	(example was 'Save Bookmark 2')
+
 2004-01-15  Ronald Florence  <ron@18james.com>
 
 	* qfont_loader.C, lyx_gui.C, Menubar_pimpl.C: changed Q_WS_MAC

src/frontends/qt2/QLPopupMenu.C

@@ -40,13 +40,11 @@ string const getLabel(MenuItem const & mi)
 	string const shortcut = mi.shortcut();
 	string label = subst(mi.label(), "&", "&&");
 
-	if (shortcut.empty())
-		return label;
-
-	string::size_type pos = label.find(shortcut);
-	if (pos == string::npos)
-		return label;
-	label.insert(pos, 1, '&');
+	if (!shortcut.empty()) {
+		string::size_type pos = label.find(shortcut);
+		if (pos != string::npos)
+			label.insert(pos, 1, '&');
+	}
 
 	if (mi.kind() == MenuItem::Command) {
 		// FIXME: backend should do this

status.13x

@@ -61,10 +61,13 @@ What's new
 - enable the file dialog to open files with non-latin filenames [Qt only]
 
 - allow to use some paper sizes (A3, B3, B4, and custom) without
-  custom margins [Qt problem only]. 
+  custom margins [Qt problem only]
 
 - fix bug where changing the height unit in the graphics dialog did not
-  activate the ok/apply buttons [bug #1469, Qt only].
+  activate the ok/apply buttons [bug #1469, Qt only]
+
+- fix bug where some menu entries did not show the corresponding
+  keyboard binding [bug #1350, Qt only]
 
 - fix the language of the russian table of contents of the documentation