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 d028dcfa65f62ac042e1f74a8fa876f347d7bd03..8db3c8008386ceddc3a1495a84af4b525ad11b4c 100644 (file)
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -9,7 +9,7 @@
     <validator id="PartSet_SketchEntityValidator" parameters="Sketch"/>
   </multi_selector>
   <toolbox id="CreationMethod">
-    <box id="BySizes" title="By sizes" icon=":icons/dimension_up.png">
+    <box id="BySizes" title="By sizes" icon=":icons/dimension_up_32x32.png">
       <groupbox>
         <doublevalue
           id="to_size"
@@ -31,7 +31,7 @@
         </doublevalue>
       </groupbox>
     </box>
-    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
+    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
       <groupbox title="To">
         <shape_selector id="to_object"
                         icon=":icons/plane_inverted.png"

diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index 078a77c2c3deec28e31053f8212833d51eba936c..8160f493661b1548b0571b8fd99ef49d54fa607e 100755 (executable)
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -8,7 +8,7 @@
       tooltip="Create or edit a sketch">
     </sketch_launcher>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up.png">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
@@ -32,7 +32,7 @@
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
         <groupbox title="To">
           <shape_selector id="to_object"
                           icon=":icons/plane_inverted.png"

diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index f80bdd18712ae5800625de48ab68caef19abc137..17ef824ba0d03834cb80466684431012786d3341 100644 (file)
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -8,7 +8,7 @@
       tooltip="Create or edit a sketch">
     </sketch_launcher>
     <toolbox id="CreationMethod">
-      <box id="BySizes" title="By sizes" icon=":icons/dimension_up.png">
+      <box id="BySizes" title="By sizes" icon=":icons/dimension_up_32x32.png">
         <groupbox>
           <doublevalue
             id="to_size"
@@ -32,7 +32,7 @@
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
         <groupbox title="To">
           <shape_selector id="to_object"
                           icon=":icons/plane_inverted.png"

diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml
index b956fed62c93ec7fdd0440e1e32b7ff0f31d8cd4..1ce674bf851a39099f8dedd5fdd6f33bc4ea6f10 100644 (file)
--- a/src/FeaturesPlugin/revolution_widget.xml
+++ b/src/FeaturesPlugin/revolution_widget.xml
@@ -41,7 +41,7 @@
         </doublevalue>
       </groupbox>
     </box>
-    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
+    <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
       <groupbox title="To">
         <shape_selector id="to_object"
                         icon=":icons/plane_inverted.png"

diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 5b7c9155eb39141e37a4c914d8f4445852672f3d..b45230c6671727548b0985483276fa40cb4fa9ec 100644 (file)
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -40,7 +40,7 @@
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
         <groupbox title="To">
           <shape_selector id="to_object"
                           icon=":icons/plane_inverted.png"

diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index 047090f822737014d50d934157539437127f136a..e348ecd06afb818923f7afbe259efc235f361234 100644 (file)
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -40,7 +40,7 @@
           </doublevalue>
         </groupbox>
       </box>
-      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted.png">
+      <box id="ByPlanesAndOffsets" title="By bounding planes and offsets" icon=":icons/plane_inverted_32x32.png">
         <groupbox title="To">
           <shape_selector id="to_object"
                           icon=":icons/plane_inverted.png"

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp
index 87ef65afa4d3c8949c8a93e74008133fd9c4ed49..38b145bfc2f302d504fe629feaf3a2043456fe42 100644 (file)
--- a/src/ModuleBase/ModuleBase_PagedContainer.cpp
+++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp
@@ -30,7 +30,7 @@ ModuleBase_PagedContainer::~ModuleBase_PagedContainer()
 
 int ModuleBase_PagedContainer::addPage(ModuleBase_PageBase* thePage,
                                       const QString& theName, const QString& theCaseId,
-                                      const QIcon& theIcon )
+                                      const QPixmap& theIcon )
 {
   if (!myPages.count()) {
     setDefaultValue(theCaseId.toStdString());

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.h b/src/ModuleBase/ModuleBase_PagedContainer.h
index b31f0c5709e5374132215bfb68c66789cd55ee71..8d7511d2bee7286f459284f0e5f6fba565c57d86 100644 (file)
--- a/src/ModuleBase/ModuleBase_PagedContainer.h
+++ b/src/ModuleBase/ModuleBase_PagedContainer.h
@@ -24,7 +24,7 @@ class MODULEBASE_EXPORT ModuleBase_PagedContainer : public ModuleBase_ModelWidge
   virtual int addPage( ModuleBase_PageBase* theWidget,
                        const QString& theName,
                        const QString& theCaseId,
-                       const QIcon& theIcon );
+                       const QPixmap& theIcon );
 
   // ModuleBase_ModelWidget
   virtual QList<QWidget*> getControls() const;

diff --git a/src/ModuleBase/ModuleBase_ToolBox.cpp b/src/ModuleBase/ModuleBase_ToolBox.cpp
index 0af3267b19d008747769ebfd4543156172258d97..88bb944d8e9138de571afebf79c195e9f01a86d0 100644 (file)
--- 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 2b48b0849d7fe9c436a2d955678a5ec17c82800d..4462f80edcb6b9759626e392f0e7d497619ec0cc 100644 (file)
--- 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 b5d65a2cd05145ba9206506813fc602002f2ef39..24c3165b4e18a5bc1e2bdeff3d6f4da9a35bc3e8 100644 (file)
--- 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<ModuleBase_PagedContainer*>(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 0df6f7ebf0b041a411b25009a4c2acd96b00498a..00ea700462e9aacd0a5f24d75d85b38e3fc35ffc 100644 (file)
--- 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 a1cec7a779402f91454144f4bbf488645e303703..8addb375cf4cb39e7efc8f5fc7c8781a6417bfc6 100644 (file)
--- 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 829afea9e292398b7b0c54bd98ce9a4301187d15..83afaa5d62555adee1cf8dbb8798333a0bcb3737 100644 (file)
--- 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<QFrame*>(thePage);

diff --git a/src/ModuleBase/ModuleBase_WidgetToolbox.h b/src/ModuleBase/ModuleBase_WidgetToolbox.h
index 29c52d140400d7396b7a567a24e460b9ccc3f2b5..348ecb248b921a104c3c9d410aaccde5c0ff878a 100644 (file)
--- 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 06706b7cd73fc6bad29897e2e9822e05d56eec1a..2e7928ace2c07dd632f2ccda67436858d07e10b3 100644 (file)
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -9,6 +9,7 @@
      <file>icons/point.png</file>
      <file>icons/plane.png</file>
      <file>icons/plane_inverted.png</file>
+     <file>icons/plane_inverted_32x32.png</file>
      <file>icons/axis.png</file>
      <file>icons/duplicate.png</file>
      <file>icons/remove.png</file>
@@ -25,6 +26,7 @@
      <file>icons/sketch.png</file>
      <file>icons/hand_point.png</file>
      <file>icons/dimension_up.png</file>
+     <file>icons/dimension_up_32x32.png</file>
      <file>icons/dimension_down.png</file>
      <file>icons/dimension_v.png</file>
      <file>icons/radius.png</file>

diff --git a/src/PartSet/icons/dimension_up_32x32.png b/src/PartSet/icons/dimension_up_32x32.png
new file mode 100644 (file)
index 0000000..03f0f97
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 (file)
index 0000000..ad5b830
Binary files /dev/null and b/src/PartSet/icons/plane_inverted_32x32.png differ