replace "Listings" by "Listing" (plural => singular)

[lyx.git] / src / frontends / Toolbars.cpp

diff --git a/src/frontends/Toolbars.cpp b/src/frontends/Toolbars.cpp
index fb8b42b023fb8ec1985f67201062abb3a35bdf66..099cdafbfc57d8a7e373175561a5b26a856c19f0 100644 (file)
--- a/src/frontends/Toolbars.cpp
+++ b/src/frontends/Toolbars.cpp
@@ -46,7 +46,7 @@ void Toolbars::initFlags(ToolbarInfo & tbinfo)
 
        unsigned int flags = static_cast<unsigned int>(tbinfo.flags);
 
-       // Remove default.ui positions. Only when a valid postion is stored 
+       // Remove default.ui positions. Only when a valid postion is stored
        // in the session file the default.ui value will be overwritten
        unsigned int save = flags;
        TurnOffFlag(TOP);
@@ -86,16 +86,16 @@ void Toolbars::initFlags(ToolbarInfo & tbinfo)
        }
        /*
        std::cout << "State " << info.state << " FLAGS: " << flags
-               << " ON:" << (flags & ToolbarBackend::ON) 
+               << " ON:" << (flags & ToolbarBackend::ON)
                << " OFF:" << (flags & ToolbarBackend::OFF)
-               << " L:" << (flags & ToolbarBackend::LEFT) 
-               << " R:" << (flags & ToolbarBackend::RIGHT) 
-               << " T:" << (flags & ToolbarBackend::TOP) 
-               << " B:" << (flags & ToolbarBackend::BOTTOM) 
-               << " MA:" << (flags & ToolbarBackend::MATH) 
-               << " RE:" << (flags & ToolbarBackend::REVIEW) 
-               << " TB:" << (flags & ToolbarBackend::TABLE) 
-               << " AU:" << (flags & ToolbarBackend::AUTO) 
+               << " L:" << (flags & ToolbarBackend::LEFT)
+               << " R:" << (flags & ToolbarBackend::RIGHT)
+               << " T:" << (flags & ToolbarBackend::TOP)
+               << " B:" << (flags & ToolbarBackend::BOTTOM)
+               << " MA:" << (flags & ToolbarBackend::MATH)
+               << " RE:" << (flags & ToolbarBackend::REVIEW)
+               << " TB:" << (flags & ToolbarBackend::TABLE)
+               << " AU:" << (flags & ToolbarBackend::AUTO)
                << std::endl;
        */
        // now set the flags
@@ -151,14 +151,13 @@ void Toolbars::display(string const & name, bool show)
        for (; cit != end; ++cit) {
                if (cit->name == name) {
                        unsigned int flags = cit->flags;
+                       TurnOffFlag(ON);
+                       TurnOffFlag(OFF);
                        TurnOffFlag(AUTO);
-                       if (show) {
+                       if (show)
                                TurnOnFlag(ON);
+                       else
                                TurnOnFlag(OFF);
-                       } else {
-                               TurnOnFlag(OFF);
-                               TurnOnFlag(ON);
-                       }
                        cit->flags = static_cast<lyx::ToolbarInfo::Flags>(flags);
                        displayToolbar(*cit, show);
                        return;
@@ -171,7 +170,7 @@ void Toolbars::display(string const & name, bool show)
 
 
 ToolbarInfo::Flags Toolbars::getToolbarState(string const & name)
-{      
+{
        ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
        ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
 
@@ -248,6 +247,16 @@ void Toolbars::update(bool in_math, bool in_table, bool review)
 }
 
 
+bool Toolbars::visible(string const & name) const
+{
+       std::map<string, ToolbarPtr>::const_iterator it =
+               toolbars_.find(name);
+       if (it == toolbars_.end())
+               return false;
+       return it->second.get()->isVisible();
+}
+
+
 void Toolbars::saveToolbarInfo()
 {
        ToolbarSection & tb = LyX::ref().session().toolbars();