Commit 3df82952 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'mergePluginIcon' into 'master'

added icon for merge plugin

See merge request !249
parents 0282b659 087e62f0
include (plugin)
openflipper_plugin (TYPES TRIANGLEMESH POLYMESH)
openflipper_plugin (TYPES TRIANGLEMESH POLYMESH INSTALLDATA Icons)
......@@ -137,10 +137,11 @@ void MergePlugin::initializePlugin() {
connect(tool_->mergeButton, SIGNAL( clicked() ), this, SLOT( mergeObjects() ) );
tool_->mergeButton->setStatusTip("Merge all target objects into one without changing geometry");
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);
emit addToolbox( tr("Merge") , tool_ );
emit addToolbox( tr("Merge") , tool_, toolIcon_ );
}
void MergePlugin::pluginsInitialized()
......
......@@ -40,6 +40,7 @@ signals:
// ToolboxInterface
void addToolbox( QString _name , QWidget* _widget );
void addToolbox( QString _name , QWidget* _widget , QIcon* _icon );
// ScriptInterface
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