Commit 087e62f0 authored by Martin Schultz's avatar Martin Schultz

added icon for merge plugin

icon is public domain downloaded from https://thenounproject.com/term/welding/147374/
parent 6503bb28
include (plugin) include (plugin)
openflipper_plugin (TYPES TRIANGLEMESH POLYMESH) openflipper_plugin (TYPES TRIANGLEMESH POLYMESH INSTALLDATA Icons)
...@@ -131,10 +131,11 @@ void MergePlugin::initializePlugin() { ...@@ -131,10 +131,11 @@ void MergePlugin::initializePlugin() {
connect(tool_->mergeButton, SIGNAL( clicked() ), this, SLOT( mergeObjects() ) ); connect(tool_->mergeButton, SIGNAL( clicked() ), this, SLOT( mergeObjects() ) );
tool_->mergeButton->setStatusTip("Merge all target objects into one without changing geometry"); tool_->mergeButton->setStatusTip("Merge all target objects into one without changing geometry");
tool_->mergeButton->setToolTip( tool_->mergeButton->statusTip() ); tool_->mergeButton->setToolTip( tool_->mergeButton->statusTip() );
QIcon* toolIcon_ = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"merge.png");
connect(this,SIGNAL(cleanup(DataType, bool)),this,SLOT(slotCleanup(DataType, bool)),Qt::QueuedConnection); connect(this,SIGNAL(cleanup(DataType, bool)),this,SLOT(slotCleanup(DataType, bool)),Qt::QueuedConnection);
emit addToolbox( tr("Merge") , tool_ ); emit addToolbox( tr("Merge") , tool_, toolIcon_ );
} }
void MergePlugin::pluginsInitialized() void MergePlugin::pluginsInitialized()
......
...@@ -40,6 +40,7 @@ signals: ...@@ -40,6 +40,7 @@ signals:
// ToolboxInterface // ToolboxInterface
void addToolbox( QString _name , QWidget* _widget ); void addToolbox( QString _name , QWidget* _widget );
void addToolbox( QString _name , QWidget* _widget , QIcon* _icon );
// ScriptInterface // ScriptInterface
void setSlotDescription(QString _slotName, QString _slotDescription, void setSlotDescription(QString _slotName, QString _slotDescription,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment