suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ proper encoding of custom toolbar names

Browse Source
This commit is contained in:
wmayer 2014-01-26 16:02:22 +01:00
parent d39afd36c2
commit 30768c9519
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Gui/ToolBarManager.cpp
View File

@ -190,8 +190,9 @@ void ToolBarManager::setup(ToolBarItem* toolBarItems)
QList<QToolBar*> toolbars = toolBars(); QList<QToolBar*> toolbars = toolBars();
for (QList<ToolBarItem*>::ConstIterator it = items.begin(); it != items.end(); ++it) { for (QList<ToolBarItem*>::ConstIterator it = items.begin(); it != items.end(); ++it) {
// search for the toolbar // search for the toolbar
this->toolbarNames << QString::fromUtf8((*it)->command().c_str()); QString name = QString::fromUtf8((*it)->command().c_str());
QToolBar* toolbar = findToolBar(toolbars, QString::fromAscii((*it)->command().c_str())); this->toolbarNames << name;
QToolBar* toolbar = findToolBar(toolbars, name);
std::string toolbarName = (*it)->command(); std::string toolbarName = (*it)->command();
bool visible = hPref->GetBool(toolbarName.c_str(), true); bool visible = hPref->GetBool(toolbarName.c_str(), true);
bool toolbar_added = false; bool toolbar_added = false;
@ -201,7 +202,7 @@ void ToolBarManager::setup(ToolBarItem* toolBarItems)
QApplication::translate("Workbench", QApplication::translate("Workbench",
toolbarName.c_str(), toolbarName.c_str(),
0, QApplication::UnicodeUTF8)); // i18n 0, QApplication::UnicodeUTF8)); // i18n
toolbar->setObjectName(QString::fromAscii((*it)->command().c_str())); toolbar->setObjectName(name);
toolbar->setVisible(visible); toolbar->setVisible(visible);
toolbar_added = true; toolbar_added = true;
} }