Created KVICOREACTIONS for the old previously caps-based entries in the tools menu; added 2 dynamic submenus to the tools menu to stop 3rd part caps-based items and scripting actions items

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6089 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 10 insertions, 78 deletions

diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt
index ab691e09f..897cbeac8 100644
--- a/src/modules/iograph/CMakeLists.txt
+++ b/src/modules/iograph/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists for src/modules/iograph
 
-SUBDIRS(caps)
-
 SET(kviiograph_MOC_HDRS
 	libkviiograph.h
 )
diff --git a/src/modules/iograph/caps/CMakeLists.txt b/src/modules/iograph/caps/CMakeLists.txt
deleted file mode 100644
index d4a7ad532..000000000
--- a/src/modules/iograph/caps/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# CMakeLists for ./caps
-
-SET(CAPSFILE iograph)
-
-IF(UNIX)
-	IF(APPLE)
-		INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/)
-	ELSE()
-		# Assume linux
-		INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/)
-	ENDIF()
-ELSEIF(WIN32)
-	INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/tool/)
-ENDIF()
diff --git a/src/modules/iograph/caps/iograph b/src/modules/iograph/caps/iograph
deleted file mode 100644
index e69de29bb..000000000
--- a/src/modules/iograph/caps/iograph
+++ /dev/null
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index e0035137f..d34a3489e 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -42,8 +42,8 @@
 
 KviIOGraphWindow* g_pIOGraphWindow = 0;
 
-KviIOGraphWindow::KviIOGraphWindow(KviModuleExtensionDescriptor * d, const char * name)
-: KviWindow(KviWindow::IOGraph, name), KviModuleExtension(d)
+KviIOGraphWindow::KviIOGraphWindow(const char * name)
+: KviWindow(KviWindow::IOGraph, name)
 {
 	m_pIOGraph = new KviIOGraphWidget(this);
 	setAutoFillBackground(false);
@@ -262,66 +262,22 @@ void KviIOGraphWidget::paintEvent(QPaintEvent *)
 
 static bool iograph_module_cmd_open(KviKvsModuleCommandCall * c)
 {
-	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",IOGRAPH_MODULE_EXTENSION_NAME);
-
-	if(d)
-	{
-		KviPointerHashTable<QString,QVariant> dict(17,true);
-		dict.setAutoDelete(true);
-		QString dummy;
-		dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',dummy)));
-		dict.replace("bNoRaise",new QVariant(c->hasSwitch('n',dummy)));
-
-		d->allocate(c->window(),&dict,0);
-	} else {
-		c->warning(__tr("Ops.. internal error"));
-	}
-	return true;
-}
-
-static KviModuleExtension * iograph_extension_alloc(KviModuleExtensionAllocStruct * s)
-{
-	bool bCreateMinimized = false;
-	bool bNoRaise = false;
+	QString dummy;
+	bool bCreateMinimized = c->hasSwitch('m',dummy);
+	bool bNoRaise = c->hasSwitch('n',dummy);
 
 	if(!g_pIOGraphWindow)
 	{
-		if(s->pParams)
-		{
-			if(QVariant * v = s->pParams->find("bCreateMinimized"))
-			{
-				if(v->isValid())
-				{
-					if(v->type() == QVariant::Bool)
-					{
-						bCreateMinimized = v->toBool();
-					}
-				}
-			}
-		}
-
-		g_pIOGraphWindow = new KviIOGraphWindow(s->pDescriptor,"IOGraph Window");
+		g_pIOGraphWindow = new KviIOGraphWindow("IOGraph Window");
 		g_pMainWindow->addWindow(g_pIOGraphWindow,!bCreateMinimized);
 
 		if(bCreateMinimized)g_pIOGraphWindow->minimize();
-		return g_pIOGraphWindow;
-	}
-
-	if(s->pParams)
-	{
-		if(QVariant * v = s->pParams->find("bNoRaise"))
-		{
-			if(v)
-			{
-				if(v->isValid() && v->type() == QVariant::Bool)
-					bNoRaise = v->toBool();
-			}
-		}
+		return true;
 	}
 
 	if(!bNoRaise)
 		g_pIOGraphWindow->delayedAutoRaise();
-	return g_pIOGraphWindow;
+	return true;
 }
 
 static bool iograph_module_init(KviModule *m)
@@ -329,14 +285,6 @@ static bool iograph_module_init(KviModule *m)
 	g_pIOGraphWindow = 0;
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",iograph_module_cmd_open);
-
-	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-							IOGRAPH_MODULE_EXTENSION_NAME,
-							__tr2qs("Show I/O &Traffic graph"),
-							iograph_extension_alloc);
-
-	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::SayIcon)));
-
 	return true;
 }
 
diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
index 1c33141af..0a8eb4018 100644
--- a/src/modules/iograph/libkviiograph.h
+++ b/src/modules/iograph/libkviiograph.h
@@ -53,11 +53,11 @@ protected:
 	virtual void paintEvent (QPaintEvent *e);
 };
 
-class KviIOGraphWindow : public KviWindow, public KviModuleExtension
+class KviIOGraphWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviIOGraphWindow(KviModuleExtensionDescriptor * d, const char * name);
+	KviIOGraphWindow(const char * name);
 	~KviIOGraphWindow();
 private:
 	KviIOGraphWidget * m_pIOGraph;