X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=5419f6d8b718fb8ffa923724cd6e2073d18e3481;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=c2e107f22455c1924a9e824cb3c71fd930d8366b;hpb=ed99f752f9b4ce52cf55cac2a94658fb087c7383;p=lyx.git

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index c2e107f224..5419f6d8b7 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -134,7 +134,7 @@ docstring const MenuItem::shortcut() const
 }
 
 
-docstring const MenuItem::binding() const
+docstring const MenuItem::binding(bool forgui) const
 {
 	if (kind_ != Command)
 		return docstring();
@@ -144,7 +144,7 @@ docstring const MenuItem::binding() const
 	kb_keymap::Bindings bindings = theTopLevelKeymap().findbindings(func_);
 
 	if (bindings.size()) {
-		return from_utf8(bindings.begin()->print());
+		return bindings.begin()->print(forgui);
 	} else {
 		lyxerr[Debug::KBMAP]
 			<< "No binding for "
@@ -413,10 +413,9 @@ void Menu::checkShortcuts() const
 }
 
 
-void MenuBackend::specialMenu(docstring const &name)
+void MenuBackend::specialMenu(Menu const & menu)
 {
-	if (hasMenu(name))
-		specialmenu_ = &getMenu(name);
+	specialmenu_ = menu;
 }
 
 
@@ -537,10 +536,12 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 
 		switch (kind) {
 		case MenuItem::ImportFormats:
+			// FIXME: This is a hack, we should rather solve
+			// FIXME: bug 2488 instead.
 			if ((*fit)->name() == "text")
-				label = _("Plain Text as Lines");
+				label = _("Plain Text");
 			else if ((*fit)->name() == "textparagraph")
-				label = _("Plain Text as Paragraphs");
+				label = _("Plain Text, Join Lines");
 			label += "...";
 			break;
 		case MenuItem::ViewFormats:
@@ -627,7 +628,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf)
 		docstring const label = from_utf8(cit->name);
 		tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label,
 				    FuncRequest(LFUN_CHARSTYLE_INSERT,
-						cit->name)));
+						label)));
 	}
 }
 
@@ -890,8 +891,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 			break;
 
 		case MenuItem::Command:
-			if (!specialmenu_
-			    || !specialmenu_->hasFunc(cit->func()))
+			if (!specialmenu_.hasFunc(cit->func()))
 				tomenu.addWithStatusCheck(*cit);
 		}
 	}