X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ToolBox.cpp;h=27197a7edeb54d3c5474c4a9d0fb1960d54eff74;hb=32bab2f2bbbfea250b7aeb2d5b2ce89a28f7072d;hp=d1b52ef89de0a8e267f7b1acfe0de975f232583c;hpb=e3e242c1272da9d39804739ef74a830414ee0ca9;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ToolBox.cpp b/src/ModuleBase/ModuleBase_ToolBox.cpp
index d1b52ef89..27197a7ed 100644
--- a/src/ModuleBase/ModuleBase_ToolBox.cpp
+++ b/src/ModuleBase/ModuleBase_ToolBox.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModuleBase_ToolBox.cpp
-// Created:     10 August 2015
-// Author:      Alexandre SOLOVYOV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <ModuleBase_ToolBox.h>
 #include <ModuleBase_ModelWidget.h>
@@ -13,50 +27,61 @@
 #include <QVBoxLayout>
 #include <QToolButton>
 
-ModuleBase_ToolBox::ModuleBase_ToolBox( QWidget* theParent )
-  : QFrame( theParent )
+#include <ModuleBase_PagedContainer.h>
+
+ModuleBase_ToolBox::ModuleBase_ToolBox(QWidget* theParent, const bool theUseFrameStyleBox)
+: QFrame(theParent)
 {
-  QVBoxLayout* aMainLayout = new QVBoxLayout( this );
+  QVBoxLayout* aMainLayout = new QVBoxLayout(this);
   aMainLayout->setMargin(0);
   aMainLayout->setSpacing(2);
 
-  myButtonsFrame = new QFrame( this );
+  if (theUseFrameStyleBox) {
+    setFrameStyle(QFrame::Box | QFrame::Raised);
+    aMainLayout->setMargin(2);
+  }
 
-  myStack = new QStackedWidget( this );
+  myButtonsFrame = new QFrame(this);
 
-  aMainLayout->addWidget( myButtonsFrame, 0 );
-  aMainLayout->addWidget( myStack, 1 );
+  myStack = new QStackedWidget(this);
+
+  aMainLayout->addWidget(myButtonsFrame, 0);
+  aMainLayout->addWidget(myStack, 1);
 
   myButtonsGroup = new QButtonGroup(this);
-  myButtonsGroup->setExclusive( true );
-  myButtonsLayout = new QHBoxLayout( myButtonsFrame );
-  myButtonsLayout->setMargin( 0 );
-  myButtonsLayout->setSpacing( 5 );
-  myButtonsLayout->addStretch( 1 );
-
-  connect( myStack, SIGNAL( currentChanged( int ) ), this, SIGNAL( currentChanged( int ) ) );
-  connect( myButtonsGroup, SIGNAL( buttonPressed( int ) ), this, SLOT( onButton( int ) ) );
+  myButtonsGroup->setExclusive(true);
+  myButtonsLayout = new QHBoxLayout(myButtonsFrame);
+  myButtonsLayout->setMargin(0);
+  myButtonsLayout->setSpacing(5);
+  myButtonsLayout->addStretch(1);
+
+  connect(myStack, SIGNAL(currentChanged(int)), this, SIGNAL(currentChanged(int)));
+  connect(myButtonsGroup, SIGNAL(buttonPressed(int)), this, SLOT(onButton(int)));
 }
 
 ModuleBase_ToolBox::~ModuleBase_ToolBox()
 {
 }
 
-void ModuleBase_ToolBox::addItem( QWidget* thePage, const QString& theName, const QPixmap& theIcon )
+void ModuleBase_ToolBox::addItem(QWidget* thePage, const QString& theName, const QPixmap& theIcon)
 {
   int anOldCount = myStack->count();
 
-  myStack->addWidget( thePage );
+  myStack->addWidget(thePage);
 
-  QToolButton* aButton = new QToolButton( myButtonsFrame );
+  QToolButton* aButton = new QToolButton(myButtonsFrame);
   aButton->setFocusPolicy(Qt::StrongFocus);
-  aButton->setCheckable( true );
-  aButton->setIcon( theIcon );
-  aButton->setIconSize( theIcon.size() );
-  aButton->setToolTip( theName );
-  aButton->setObjectName( theName );
-  myButtonsGroup->addButton( aButton, anOldCount );
-  myButtonsLayout->insertWidget( anOldCount, aButton );
+  aButton->setCheckable(true);
+  if (theIcon.isNull())
+    aButton->setText(theName);
+  else {
+    aButton->setIcon(theIcon);
+    aButton->setIconSize(theIcon.size());
+  }
+  aButton->setToolTip(theName);
+  aButton->setObjectName(theName);
+  myButtonsGroup->addButton(aButton, anOldCount);
+  myButtonsLayout->insertWidget(anOldCount, aButton);
 }
 
 int ModuleBase_ToolBox::count() const
@@ -69,15 +94,15 @@ int ModuleBase_ToolBox::currentIndex() const
   return myStack->currentIndex();
 }
 
-void ModuleBase_ToolBox::setCurrentIndex( const int theIndex )
+void ModuleBase_ToolBox::setCurrentIndex(const int theIndex)
 {
-  myStack->setCurrentIndex( theIndex );
-  myButtonsGroup->button( theIndex )->setChecked( true );
+  myStack->setCurrentIndex(theIndex);
+  myButtonsGroup->button(theIndex)->setChecked(true);
 }
 
-void ModuleBase_ToolBox::onButton( int theIndex )
+void ModuleBase_ToolBox::onButton(int theIndex)
 {
-  myStack->setCurrentIndex( theIndex );
+  myStack->setCurrentIndex(theIndex);
 }
 
 bool ModuleBase_ToolBox::isOffToolBoxParent(ModuleBase_ModelWidget* theWidget)