From 0a04bcd634373c65391611ca0e818d432e71ada5 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 14 Aug 2015 09:56:55 +0300 Subject: [PATCH] refs #836: the icons of extrusion options with size 32x32 --- src/FeaturesPlugin/extrusion_widget.xml | 4 ++-- src/FeaturesPlugin/extrusioncut_widget.xml | 4 ++-- src/FeaturesPlugin/extrusionfuse_widget.xml | 4 ++-- src/FeaturesPlugin/revolution_widget.xml | 2 +- src/FeaturesPlugin/revolutioncut_widget.xml | 2 +- src/FeaturesPlugin/revolutionfuse_widget.xml | 2 +- src/ModuleBase/ModuleBase_PagedContainer.cpp | 2 +- src/ModuleBase/ModuleBase_PagedContainer.h | 2 +- src/ModuleBase/ModuleBase_ToolBox.cpp | 3 ++- src/ModuleBase/ModuleBase_ToolBox.h | 2 +- src/ModuleBase/ModuleBase_WidgetFactory.cpp | 2 +- src/ModuleBase/ModuleBase_WidgetSwitch.cpp | 2 +- src/ModuleBase/ModuleBase_WidgetSwitch.h | 2 +- src/ModuleBase/ModuleBase_WidgetToolbox.cpp | 2 +- src/ModuleBase/ModuleBase_WidgetToolbox.h | 2 +- src/PartSet/PartSet_icons.qrc | 2 ++ src/PartSet/icons/dimension_up_32x32.png | Bin 0 -> 583 bytes src/PartSet/icons/plane_inverted_32x32.png | Bin 0 -> 2183 bytes 18 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 src/PartSet/icons/dimension_up_32x32.png create mode 100644 src/PartSet/icons/plane_inverted_32x32.png 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 0000000000000000000000000000000000000000..03f0f97ea661893ba9b9950597cbb2cda1376b4e GIT binary patch literal 583 zcmV-N0=WH&P)N2bPDNB8 zb~7$DE-^4L^m3s900F~EL_t(oNA1^5D@8#V!0}5d5hcn?WM`>J`3x3_51=e;^z=l;9{M%jU~17!!w z4wM}zJMixvFlnsT-*GHg*w96ViwhSSjxMlJwFQa4Wv|V>K(Rqsg1NnNiXCNO!PJs0 zdyQ>!Z_UCY)J=#}>_*cKXAla004R=004l4008;_004mL004C`008P>0026e000+nl3&F}00009 za7bBm000XQ000XQ0h0Lxr2qf`8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^4L z^m3s900-AeL_t(oN43`pP?YB#2Jm-bxr9Yw7mz!IeQwp`vCfZL!^anamf20flM!qLMJNF%V>?t}#J83x;k)F)y zk!409R7TzO3LT?A({=jfG05XSqAPTfPSZYGM@^JN(Ior)s3uV%bx}VZCix}zg-}2U zQwW8U%>OfCLHt~pjT|dX9?}Dzdz;@O1D&Pc(95)$zAsaf(^EpS`F47p-W8@}?ptbf z80$F&cDiubO^k%ScN9gB@SOpT&kU%2W1*Rp0Ed7iI0hucDKN=sJYPHb$6>6y9?CJ} z7)sovqqKvJr6M^Ur6jMFOed%PvQSz-uyNJHJ;DIL%r*oRtbo3x4?!iX5oB0{;Ahq$ zxNJQ_$~RzYa@wo`idjr zOY(Zmp_Md1a=~3Tv9kNp)-wd2)5{QCx*pLB4nUpl2%+mO7EYL zy6P`TU;7?%Hr_z~*4rrDeiw!v_fXnDjG`CcM@Hvi%qZ`LUwGyjCuffqm6gQ=3#O1Y zo90mu$<_KhdS7W}_cuG;H0a`MF{Nq?V%m^?L$D0RkpXGWu7^O`$_+X?sSk zdm6rJO^B=?Kq?nl_KVk$_tGsCZNCGer|mxQqOrqlhV8g2b|RRIDCC>ucX& z8Asmx2C$m?4&B9)Z6{INwe^$Inzof0vx`F#;uA$|Y^(?i4gFC7x!dhmTG~8NYp1|B zxfWqn8xhmI7YU0GBDM1f(w84YE{9dJ<}AwBoU4y2VXL}o=Rs(N;#Wyjm-*n17# zzrKOq!M~z=;5=ITb`Dqnq-V*b>e{34NS2YSDF?*f3Eqt_VrE8izDXM)C(D)xVT6ZF~p;4ro-9x}f%?|qprC>2QBgN%%}PUVZtlav!lFF}LupNU`J964>gxQu z+S=5H`Ud~Th6YhrUni<6tNv?%@5@A?5a#AeVPi8!Xn2dbI6DiSRx5mceT0{nPT}a_ zFwxD;b^er)kmHGoiO9~%x|WwWyQZ+PKwVZ=CgxUEiJF>cMMHhPXl$q#^$Z|Ac8vru z6Dk{Pp|-a-QmJf&rG1qTNsJS^|8VInv<=rcB7$o1i5rc@da9If)COzKc7 zmA`V(Xoe?vdBM-m?;bBlI~S{mTqC1Z^1Hn$kGdIP(9X{8b9Z-lXtml0PkDNFGLUXG z1IR};9myH!G&M09w6(Rp@8skJS6A1Et}ZUCczf!(cUX|H}3dlPQ9`DXa$h}uE_^Dt)-=9 zJg@&&Hvg7}8Q?i`VF+XM(F!1+;H|g@>^S-$Htu87du)1}T1f^N&8@&#yaP=vx$wN$ zY$;d&Fx{qB;%4YP>H!3&--ONG*{sdQ#pP4FMXe<3e+VGNKLM9SK!=liCf5J}002ov JPDHLkV1ml)6|evR literal 0 HcmV?d00001 -- 2.39.2