reflects interface updates

nomacs · Nov 26, 2018 · cec0be6 · cec0be6
1 parent da5b1d2
commit cec0be6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/AffineTransformations/src/DkImgTransformationsPlugin.cpp b/AffineTransformations/src/DkImgTransformationsPlugin.cpp
@@ -31,6 +31,7 @@
 #include "DkMath.h"
 #include "DkBaseViewPort.h"
 #include "DkUtils.h"
+#include "DkToolbars.h"
 
 #include <QMouseEvent>
 
@@ -740,8 +741,8 @@ void DkImgTransformationsViewPort::setVisible(bool visible) {
 	}
 
 
-	if (imgTransformationsToolbar) 
-		emit showToolBar(imgTransformationsToolbar, visible);
+	if (imgTransformationsToolbar)
+		nmc::DkToolBarManager::inst().showToolBar(imgTransformationsToolbar, visible);
 
 	setMode(defaultMode);
 	DkPluginViewPort::setVisible(visible);

diff --git a/AffineTransformations/src/DkImgTransformationsPlugin.h b/AffineTransformations/src/DkImgTransformationsPlugin.h
@@ -77,7 +77,7 @@ enum {
 class DkImgTransformationsPlugin : public QObject, nmc::DkViewPortInterface {
     Q_OBJECT
     Q_INTERFACES(nmc::DkViewPortInterface)
-	Q_PLUGIN_METADATA(IID "com.nomacs.ImageLounge.DkAffineTransformationsPlugin/3.4" FILE "DkAffineTransformationsPlugin.json")
+	Q_PLUGIN_METADATA(IID "com.nomacs.ImageLounge.DkAffineTransformationsPlugin/3.5" FILE "DkAffineTransformationsPlugin.json")
 
 public:
 

diff --git a/PaintPlugin/src/DkPaintPlugin.cpp b/PaintPlugin/src/DkPaintPlugin.cpp
@@ -26,6 +26,7 @@
  *******************************************************************************************************/
 
 #include "DkPaintPlugin.h"
+#include "DkToolbars.h"
 
 #include <QDebug>
 #include <QMouseEvent>
@@ -47,12 +48,6 @@ DkPaintPlugin::DkPaintPlugin() {
 **/
 DkPaintPlugin::~DkPaintPlugin() {
 
-	qDebug() << "[PAINT PLUGIN] deleted...";
-
-	if (viewport) {
-		viewport->deleteLater();
-		viewport = 0;
-	}
 }
 
 /**
@@ -131,7 +126,6 @@ DkPaintViewPort::DkPaintViewPort(QWidget* parent, Qt::WindowFlags flags) : DkPlu
 }
 
 DkPaintViewPort::~DkPaintViewPort() {
-	qDebug() << "[PAINT VIEWPORT] deleted...";
 
 	saveSettings();
 
@@ -401,7 +395,7 @@ bool DkPaintViewPort::isCanceled() {
 void DkPaintViewPort::setVisible(bool visible) {
 
 	if (paintToolbar)
-		emit showToolBar(paintToolbar, visible);
+		nmc::DkToolBarManager::inst().showToolBar(paintToolbar, visible);
 
 	DkPluginViewPort::setVisible(visible);
 }
@@ -430,7 +424,7 @@ void DkPaintToolBar::createIcons() {
 	icons[apply_icon]	= nmc::DkImage::loadIcon(":/nomacs/img/save.svg");
 	icons[cancel_icon]	= nmc::DkImage::loadIcon(":/nomacs/img/close.svg");
 	icons[pan_icon]		= nmc::DkImage::loadIcon(":/nomacs/img/pan.svg");
-	icons[pan_icon].addPixmap(nmc::DkImage::loadIcon(":/nomacs/img/pan_checked.svg"), QIcon::Normal, QIcon::On);
+	icons[pan_icon].addPixmap(nmc::DkImage::loadIcon(":/nomacs/img/pan-checked.svg"), QIcon::Normal, QIcon::On);
 	icons[undo_icon]	= nmc::DkImage::loadIcon(":/nomacs/img/rotate-cc.svg");
 }
 

diff --git a/PaintPlugin/src/DkPaintPlugin.h b/PaintPlugin/src/DkPaintPlugin.h
@@ -58,7 +58,7 @@ class DkPaintToolBar;
 class DkPaintPlugin : public QObject, nmc::DkViewPortInterface {
     Q_OBJECT
     Q_INTERFACES(nmc::DkViewPortInterface)
-	Q_PLUGIN_METADATA(IID "com.nomacs.ImageLounge.DkPaintPlugin/3.3" FILE "DkPaintPlugin.json")
+	Q_PLUGIN_METADATA(IID "com.nomacs.ImageLounge.DkPaintPlugin/3.4" FILE "DkPaintPlugin.json")
 
 public: