From 83fc419099df47bc0d14dcf6a27eb2ad8a0566ec Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 27 Aug 2014 13:20:33 +0400 Subject: [PATCH] 0022628: [CEA 1202] The default icon disposition is not correct in french and in japanese --- src/genericgui/GenericGui.cxx | 2 +- src/salomegui/resources/SalomeApp.xml.in | 4 ++-- src/salomewrap/SalomeWrap_Module.cxx | 4 ++-- src/salomewrap/SalomeWrap_Module.hxx | 3 ++- src/salomewrap/SuitWrapper.cxx | 4 ++-- src/salomewrap/SuitWrapper.hxx | 3 ++- tmp_dump.py | 19 +++++++++++++++++++ 7 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 tmp_dump.py diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx index e6086cef7..16d08646d 100644 --- a/src/genericgui/GenericGui.cxx +++ b/src/genericgui/GenericGui.cxx @@ -678,7 +678,7 @@ void GenericGui::createMenus() void GenericGui::createTools() { - int aToolId = _wrapper->createTool ( tr( "YACS Toolbar" ) ); + int aToolId = _wrapper->createTool ( tr( "YACS Toolbar" ), QString( "YACSToolbar" ) ); _wrapper->createTool( _newSchemaAct, aToolId ); _wrapper->createTool( _importSchemaAct, aToolId ); _wrapper->createTool( _wrapper->separator(), aToolId ); diff --git a/src/salomegui/resources/SalomeApp.xml.in b/src/salomegui/resources/SalomeApp.xml.in index 028c8ad8c..66b175c07 100644 --- a/src/salomegui/resources/SalomeApp.xml.in +++ b/src/salomegui/resources/SalomeApp.xml.in @@ -131,9 +131,9 @@
- +
- +
diff --git a/src/salomewrap/SalomeWrap_Module.cxx b/src/salomewrap/SalomeWrap_Module.cxx index ecf25ea14..70a9e5af6 100644 --- a/src/salomewrap/SalomeWrap_Module.cxx +++ b/src/salomewrap/SalomeWrap_Module.cxx @@ -169,9 +169,9 @@ int SalomeWrap_Module::wCreateMenu(QAction* action, return createMenu(action, menu, actionId, groupId, index); } -int SalomeWrap_Module::wCreateTool(const QString& name) +int SalomeWrap_Module::wCreateTool(const QString& title, const QString& name) { - return createTool(name); + return createTool(title, name); } int SalomeWrap_Module::wCreateTool(const int actionId, diff --git a/src/salomewrap/SalomeWrap_Module.hxx b/src/salomewrap/SalomeWrap_Module.hxx index 66ffcbb3b..1dab9272b 100644 --- a/src/salomewrap/SalomeWrap_Module.hxx +++ b/src/salomewrap/SalomeWrap_Module.hxx @@ -97,7 +97,8 @@ public: const int groupId = -1, const int index = -1); - int wCreateTool(const QString& name); + int wCreateTool(const QString& title, + const QString& name = QString()); int wCreateTool(const int actionId, const int toolbarId, diff --git a/src/salomewrap/SuitWrapper.cxx b/src/salomewrap/SuitWrapper.cxx index 0ef735cfb..15f87eaa6 100644 --- a/src/salomewrap/SuitWrapper.cxx +++ b/src/salomewrap/SuitWrapper.cxx @@ -201,10 +201,10 @@ int SuitWrapper::createMenu(QAction* action, return module->wCreateMenu(action, menu, actionId, groupId, index); } -int SuitWrapper::createTool(const QString& name) +int SuitWrapper::createTool(const QString& title, const QString& name) { SalomeWrap_Module* module = dynamic_cast(_wrapped); - return module->wCreateTool(name); + return module->wCreateTool(title, name); } int SuitWrapper::createTool(const int actionId, diff --git a/src/salomewrap/SuitWrapper.hxx b/src/salomewrap/SuitWrapper.hxx index 6f405657a..e74af95ec 100644 --- a/src/salomewrap/SuitWrapper.hxx +++ b/src/salomewrap/SuitWrapper.hxx @@ -96,7 +96,8 @@ namespace YACS const int groupId = -1, const int index = -1); - int createTool(const QString& name); + int createTool(const QString& title, + const QString& name = QString()); int createTool(const int actionId, const int toolbarId, diff --git a/tmp_dump.py b/tmp_dump.py new file mode 100644 index 000000000..eb42c9573 --- /dev/null +++ b/tmp_dump.py @@ -0,0 +1,19 @@ + +# Dump generated by HEXABLOCK at 2014/08/12 17:27:07 + +import hexablock + +doc = hexablock.addDocument ('default') +rep001 = doc.countVertex () +rep002 = doc.countVertex () +rep003 = doc.countEdge () +rep004 = doc.countQuad () +rep005 = doc.countHexa () +rep006 = doc.countVertex () +law0 = doc.getLaw (0) +rep007 = doc.countVertex () +rep008 = doc.countVertex () +rep009 = doc.countEdge () +rep010 = doc.countQuad () +rep011 = doc.countHexa () +rep012 = doc.countVertex () -- 2.30.2