From: asl Date: Fri, 14 Aug 2015 06:56:55 +0000 (+0300) Subject: refs #836: the icons of extrusion options with size 32x32 X-Git-Tag: V_1.4.0_beta4~379 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0a04bcd634373c65391611ca0e818d432e71ada5;p=modules%2Fshaper.git refs #836: the icons of extrusion options with size 32x32 --- diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml index d028dcfa6..8db3c8008 100644 --- a/src/FeaturesPlugin/extrusion_widget.xml +++ b/src/FeaturesPlugin/extrusion_widget.xml @@ -9,7 +9,7 @@ - + - + - + - + - + - + - + - + - + getControls() const; diff --git a/src/ModuleBase/ModuleBase_ToolBox.cpp b/src/ModuleBase/ModuleBase_ToolBox.cpp index 0af3267b1..88bb944d8 100644 --- a/src/ModuleBase/ModuleBase_ToolBox.cpp +++ b/src/ModuleBase/ModuleBase_ToolBox.cpp @@ -38,7 +38,7 @@ ModuleBase_ToolBox::~ModuleBase_ToolBox() { } -void ModuleBase_ToolBox::addItem( QWidget* thePage, const QString& theName, const QIcon& theIcon ) +void ModuleBase_ToolBox::addItem( QWidget* thePage, const QString& theName, const QPixmap& theIcon ) { int anOldCount = myStack->count(); @@ -47,6 +47,7 @@ void ModuleBase_ToolBox::addItem( QWidget* thePage, const QString& theName, cons QToolButton* aButton = new QToolButton( myButtonsFrame ); aButton->setCheckable( true ); aButton->setIcon( theIcon ); + aButton->setIconSize( theIcon.size() ); aButton->setToolTip( theName ); myButtonsGroup->addButton( aButton, anOldCount ); myButtonsLayout->insertWidget( anOldCount, aButton ); diff --git a/src/ModuleBase/ModuleBase_ToolBox.h b/src/ModuleBase/ModuleBase_ToolBox.h index 2b48b0849..4462f80ed 100644 --- a/src/ModuleBase/ModuleBase_ToolBox.h +++ b/src/ModuleBase/ModuleBase_ToolBox.h @@ -23,7 +23,7 @@ public: ModuleBase_ToolBox( QWidget* theParent ); virtual ~ModuleBase_ToolBox(); - void addItem( QWidget* thePage, const QString& theName, const QIcon& theIcon ); + void addItem( QWidget* thePage, const QString& theName, const QPixmap& theIcon ); int count() const; int currentIndex() const; void setCurrentIndex( const int ); diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp index b5d65a2cd..24c3165b4 100644 --- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp @@ -106,7 +106,7 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage) ModuleBase_PagedContainer* aContainer = qobject_cast(aWidget); QString anIconPath = qs( myWidgetApi->getProperty( CONTAINER_PAGE_ICON ) ); - QIcon anIcon( anIconPath ); + QPixmap anIcon( anIconPath ); aContainer->addPage( aPage, aPageName, aCaseId, anIcon ); } } while (myWidgetApi->toNextWidget()); diff --git a/src/ModuleBase/ModuleBase_WidgetSwitch.cpp b/src/ModuleBase/ModuleBase_WidgetSwitch.cpp index 0df6f7ebf..00ea70046 100644 --- a/src/ModuleBase/ModuleBase_WidgetSwitch.cpp +++ b/src/ModuleBase/ModuleBase_WidgetSwitch.cpp @@ -43,7 +43,7 @@ ModuleBase_WidgetSwitch::~ModuleBase_WidgetSwitch() int ModuleBase_WidgetSwitch::addPage(ModuleBase_PageBase* thePage, const QString& theName, const QString& theCaseId, - const QIcon& theIcon ) + const QPixmap& theIcon ) { int aSuperCount = ModuleBase_PagedContainer::addPage(thePage, theName, theCaseId, theIcon); myCombo->addItem(theName); diff --git a/src/ModuleBase/ModuleBase_WidgetSwitch.h b/src/ModuleBase/ModuleBase_WidgetSwitch.h index a1cec7a77..8addb375c 100644 --- a/src/ModuleBase/ModuleBase_WidgetSwitch.h +++ b/src/ModuleBase/ModuleBase_WidgetSwitch.h @@ -41,7 +41,7 @@ class MODULEBASE_EXPORT ModuleBase_WidgetSwitch : public ModuleBase_PagedContain virtual int addPage( ModuleBase_PageBase* theWidget, const QString& theName, const QString& theCaseId, - const QIcon& theIcon ); + const QPixmap& theIcon ); protected: virtual int currentPageIndex() const; diff --git a/src/ModuleBase/ModuleBase_WidgetToolbox.cpp b/src/ModuleBase/ModuleBase_WidgetToolbox.cpp index 829afea9e..83afaa5d6 100644 --- a/src/ModuleBase/ModuleBase_WidgetToolbox.cpp +++ b/src/ModuleBase/ModuleBase_WidgetToolbox.cpp @@ -46,7 +46,7 @@ ModuleBase_WidgetToolbox::~ModuleBase_WidgetToolbox() int ModuleBase_WidgetToolbox::addPage(ModuleBase_PageBase* thePage, const QString& theName, const QString& theCaseId, - const QIcon& theIcon ) + const QPixmap& theIcon ) { ModuleBase_PagedContainer::addPage(thePage, theName, theCaseId, theIcon); QFrame* aFrame = dynamic_cast(thePage); diff --git a/src/ModuleBase/ModuleBase_WidgetToolbox.h b/src/ModuleBase/ModuleBase_WidgetToolbox.h index 29c52d140..348ecb248 100644 --- a/src/ModuleBase/ModuleBase_WidgetToolbox.h +++ b/src/ModuleBase/ModuleBase_WidgetToolbox.h @@ -30,7 +30,7 @@ class MODULEBASE_EXPORT ModuleBase_WidgetToolbox : public ModuleBase_PagedContai virtual int addPage( ModuleBase_PageBase* theWidget, const QString& theName, const QString& theCaseId, - const QIcon& theIcon ); + const QPixmap& theIcon ); protected: /// Implements ModuleBase_PagedContainer diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc index 06706b7cd..2e7928ace 100644 --- a/src/PartSet/PartSet_icons.qrc +++ b/src/PartSet/PartSet_icons.qrc @@ -9,6 +9,7 @@ icons/point.png icons/plane.png icons/plane_inverted.png + icons/plane_inverted_32x32.png icons/axis.png icons/duplicate.png icons/remove.png @@ -25,6 +26,7 @@ icons/sketch.png icons/hand_point.png icons/dimension_up.png + icons/dimension_up_32x32.png icons/dimension_down.png icons/dimension_v.png icons/radius.png diff --git a/src/PartSet/icons/dimension_up_32x32.png b/src/PartSet/icons/dimension_up_32x32.png new file mode 100644 index 000000000..03f0f97ea Binary files /dev/null and b/src/PartSet/icons/dimension_up_32x32.png differ diff --git a/src/PartSet/icons/plane_inverted_32x32.png b/src/PartSet/icons/plane_inverted_32x32.png new file mode 100644 index 000000000..ad5b83044 Binary files /dev/null and b/src/PartSet/icons/plane_inverted_32x32.png differ