Toolbar status - Translation Problem

[Michael Gerz]

Hi,

this patch fixes a problem with an untranslated toolbar name.

OK?

Michael

Index: src/LyXFunc.cpp
===================================================================
--- src/LyXFunc.cpp	(Revision 18805)
+++ src/LyXFunc.cpp	(Arbeitskopie)
@@ -1758,20 +1758,19 @@
 		case LFUN_TOOLBAR_TOGGLE: {
 			BOOST_ASSERT(lyx_view_);
 			string const name = cmd.getArg(0);
-			bool const allowauto = cmd.getArg(1) == "allowauto";
+			bool const allowauto = (cmd.getArg(1) == "allowauto");
 			lyx_view_->toggleToolbarState(name, allowauto);
-			ToolbarInfo::Flags const flags = 
-				lyx_view_->getToolbarState(name);
+			ToolbarInfo const & tbi = lyx_view_->getToolbarInfo(name);
 			docstring state;
-			if (flags & ToolbarInfo::ON)
+			if (tbi.flags & ToolbarInfo::ON)
 				state = _("on");
-			else if (flags & ToolbarInfo::OFF)
+			else if (tbi.flags & ToolbarInfo::OFF)
 				state = _("off");
-			else if (flags & ToolbarInfo::AUTO)
+			else if (tbi.flags & ToolbarInfo::AUTO)
 				state = _("auto");
 
 			setMessage(bformat(_("Toolbar \"%1$s\" state set to %2$s"), 
-						   from_ascii(name), state));
+			                   _(tbi.gui_name), state));
 			break;
 		}
 
Index: src/frontends/Toolbars.cpp
===================================================================
--- src/frontends/Toolbars.cpp	(Revision 18805)
+++ src/frontends/Toolbars.cpp	(Arbeitskopie)
@@ -169,21 +169,22 @@
 }
 
 
-ToolbarInfo::Flags Toolbars::getToolbarState(string const & name)
+ToolbarInfo const & Toolbars::getToolbarInfo(string const & name)
 {
 	ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
 	ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
 
 	for (; cit != end; ++cit) {
 		if (cit->name == name)
-			return cit->flags;
+			return *cit;
 	}
 
 	LYXERR(Debug::GUI) << "Toolbar::display: no toolbar named "
 		<< name << endl;
 
 	// return dummy for msvc
-	return ToolbarInfo::OFF;
+	static ToolbarInfo dummy;
+	return dummy;
 }
 
 
Index: src/frontends/Toolbars.h
===================================================================
--- src/frontends/Toolbars.h	(Revision 18805)
+++ src/frontends/Toolbars.h	(Arbeitskopie)
@@ -91,7 +91,7 @@
 	void display(std::string const & name, bool show);
 
 	/// get toolbar state (on/off/auto)
-	ToolbarInfo::Flags getToolbarState(std::string const & name);
+	ToolbarInfo const & getToolbarInfo(std::string const & name);
 
 	/** toggle the state of toolbars (on/off/auto). Skip "auto"
 	 * when allowauto is false.
Index: src/frontends/LyXView.cpp
===================================================================
--- src/frontends/LyXView.cpp	(Revision 18805)
+++ src/frontends/LyXView.cpp	(Arbeitskopie)
@@ -347,9 +347,9 @@
 }
 
 
-ToolbarInfo::Flags LyXView::getToolbarState(string const & name)
+ToolbarInfo const & LyXView::getToolbarInfo(string const & name)
 {
-	return toolbars_->getToolbarState(name);
+	return toolbars_->getToolbarInfo(name);
 }
 
 
Index: src/frontends/LyXView.h
===================================================================
--- src/frontends/LyXView.h	(Revision 18805)
+++ src/frontends/LyXView.h	(Arbeitskopie)
@@ -153,8 +153,8 @@
 
 	/// update the toolbar
 	void updateToolbars();
-	/// get toolbar state
-	ToolbarInfo::Flags getToolbarState(std::string const & name);
+	/// get toolbar info
+	ToolbarInfo const & getToolbarInfo(std::string const & name);
 	/// toggle toolbar state
 	void toggleToolbarState(std::string const & name, bool allowauto);
 	/// update the menubar