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

28 files changed, 61 insertions, 396 deletions

diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt
index bc408b8dc..61a7cefbd 100644
--- a/src/modules/filetransferwindow/CMakeLists.txt
+++ b/src/modules/filetransferwindow/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists for src/modules/filetransferwindow
 
-SUBDIRS(caps)
-
 SET(kvifiletransferwindow_MOC_HDRS
 	FileTransferWindow.h
 )
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 6c0239150..b30487f98 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -236,8 +236,8 @@ QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QMo
 	return QSize(((FileTransferWidget*)parent())->viewport()->size().width(), 68);
 }
 
-FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d)
-: KviWindow(KviWindow::Tool,"file transfer window",0), KviModuleExtension(d)
+FileTransferWindow::FileTransferWindow()
+: KviWindow(KviWindow::Tool,"file transfer window",0)
 {
 	g_pFileTransferWindow = this;
 	setAutoFillBackground(false);
diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index 2a6ed35c0..5672c4187 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -85,13 +85,13 @@ public:
 	void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 };
 
-class FileTransferWindow : public KviWindow, public KviModuleExtension
+class FileTransferWindow : public KviWindow
 {
 	friend class FileTransferItem;
 	friend class FileTransferItemDelegate;
 	Q_OBJECT
 public:
-	FileTransferWindow(KviModuleExtensionDescriptor * d);
+	FileTransferWindow();
 	~FileTransferWindow();
 protected:
 	QSplitter		* m_pVertSplitter;
diff --git a/src/modules/filetransferwindow/caps/CMakeLists.txt b/src/modules/filetransferwindow/caps/CMakeLists.txt
deleted file mode 100644
index e52ee758f..000000000
--- a/src/modules/filetransferwindow/caps/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# CMakeLists for src/modules/filetransferwindow/caps
-
-SET(CAPSFILE filetransferwindow)
-
-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/filetransferwindow/caps/filetransferwindow b/src/modules/filetransferwindow/caps/filetransferwindow
deleted file mode 100644
index e69de29bb..000000000
--- a/src/modules/filetransferwindow/caps/filetransferwindow
+++ /dev/null
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 3de366985..23362253a 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -34,50 +34,6 @@
 
 FileTransferWindow * g_pFileTransferWindow = 0;
 
-static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensionAllocStruct * s)
-{
-	bool bCreateMinimized = false;
-	bool bNoRaise = false;
-
-	if(!g_pFileTransferWindow)
-	{
-		if(s->pParams)
-		{
-			if(QVariant * v = s->pParams->find("bCreateMinimized"))
-			{
-				if(v->isValid())
-				{
-					if(v->type() == QVariant::Bool)
-					{
-						bCreateMinimized = v->toBool();
-					}
-				}
-			}
-		}
-
-		g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor);
-		g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized);
-		return g_pFileTransferWindow;
-	}
-
-	if(s->pParams)
-	{
-		if(QVariant * v = s->pParams->find("bNoRaise"))
-		{
-			if(v)
-			{
-				if(v->isValid() && v->type() == QVariant::Bool)
-					bNoRaise = v->toBool();
-			}
-		}
-	}
-
-	if(!bNoRaise)
-		g_pFileTransferWindow->delayedAutoRaise();
-	return g_pFileTransferWindow;
-}
-
-
 /*
 	@doc: filetransferwindow.open
 	@type:
@@ -99,33 +55,25 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 
 static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME);
+	QString dummy;
+	bool bCreateMinimized = c->hasSwitch('m',dummy);
+	bool bNoRaise = c->hasSwitch('n',dummy);
 
-	if(d)
+	if(!g_pFileTransferWindow)
 	{
-		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"));
+		g_pFileTransferWindow = new FileTransferWindow();
+		g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized);
+		return true;
 	}
+
+	if(!bNoRaise)
+		g_pFileTransferWindow->delayedAutoRaise();
 	return true;
 }
 
 static bool filetransferwindow_module_init(KviModule * m)
 {
-	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-		KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME,
-		__tr2qs("Manage File &Transfers"),
-		filetransferwindow_extension_alloc);
-
-	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::FileTransfer)));
-
-
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",filetransferwindow_kvs_cmd_open);
 
 	return true;
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;
diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt
index dba267ce0..0b7d42a8d 100644
--- a/src/modules/logview/CMakeLists.txt
+++ b/src/modules/logview/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists for src/modules/logview
 
-SUBDIRS(caps)
-
 SET(kvilogview_MOC_HDRS
 	LogViewWindow.h
 )
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 71ff8406b..44bf3a67e 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -84,8 +84,8 @@ void LogViewListView::mousePressEvent(QMouseEvent * pEvent)
 }
 
 
-LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * pDesc)
-: KviWindow(KviWindow::LogView,"log"),KviModuleExtension(pDesc)
+LogViewWindow::LogViewWindow()
+: KviWindow(KviWindow::LogView,"log")
 {
 	g_pLogViewWindow = this;
 	//m_pLogViewWidget = new KviLogViewWidget(this);
diff --git a/src/modules/logview/LogViewWindow.h b/src/modules/logview/LogViewWindow.h
index c62a43470..58c485654 100644
--- a/src/modules/logview/LogViewWindow.h
+++ b/src/modules/logview/LogViewWindow.h
@@ -58,11 +58,11 @@ signals:
 	void rightButtonPressed(QTreeWidgetItem *, QPoint);
 };
 
-class LogViewWindow : public KviWindow, public KviModuleExtension
+class LogViewWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	LogViewWindow(KviModuleExtensionDescriptor * pDesc);
+	LogViewWindow();
 	~LogViewWindow();
 protected:
 	KviPointerList<LogFile> m_logList;
diff --git a/src/modules/logview/caps/CMakeLists.txt b/src/modules/logview/caps/CMakeLists.txt
deleted file mode 100644
index cf53ca041..000000000
--- a/src/modules/logview/caps/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# CMakeLists for ./caps
-
-SET(CAPSFILE logview)
-
-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/logview/caps/logview b/src/modules/logview/caps/logview
deleted file mode 100644
index e69de29bb..000000000
--- a/src/modules/logview/caps/logview
+++ /dev/null
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index fe0b7cf87..a6ef0a874 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -59,63 +59,22 @@ LogViewWindow * g_pLogViewWindow = 0;
 */
 static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",LOGVIEW_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(__tr2qs_ctx("Ops.. internal error","log"));
-	}
-	return true;
-}
-
-static KviModuleExtension * logview_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_pLogViewWindow)
 	{
-		if(s->pParams)
-		{
-			if(QVariant * v = s->pParams->find("bCreateMinimized"))
-			{
-				if(v->isValid())
-				{
-					if(v->type() == QVariant::Bool)
-						bCreateMinimized = v->toBool();
-				}
-			}
-		}
-
-		g_pLogViewWindow = new LogViewWindow(s->pDescriptor);
+		g_pLogViewWindow = new LogViewWindow();
 		g_pMainWindow->addWindow(g_pLogViewWindow,!bCreateMinimized);
 		if(bCreateMinimized)
 			g_pLogViewWindow->minimize();
-		return g_pLogViewWindow;
-	}
-
-	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_pLogViewWindow->delayedAutoRaise();
-	return g_pLogViewWindow;
+	return true;
 }
 
 static bool logview_module_init(KviModule * m)
@@ -124,14 +83,6 @@ static bool logview_module_init(KviModule * m)
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",logview_kvs_cmd_open);
 
-	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-		LOGVIEW_MODULE_EXTENSION_NAME,
-		__tr2qs_ctx("Browse Log Files","log"),
-		logview_extension_alloc);
-
-	if(d)
-		d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Log)));
-
 	return true;
 }
 
diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt
index 6f69065e7..fba19455e 100644
--- a/src/modules/sharedfileswindow/CMakeLists.txt
+++ b/src/modules/sharedfileswindow/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists for src/modules/sharedfileswindow
 
-SUBDIRS(caps)
-
 SET(kvisharedfileswindow_MOC_HDRS
 	SharedFilesWindow.h
 )
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 75f4c80ae..1becf1271 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -206,8 +206,8 @@ SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem()
 }
 
 
-SharedFilesWindow::SharedFilesWindow(KviModuleExtensionDescriptor * d)
-: KviWindow(KviWindow::Tool,"shared files window",0), KviModuleExtension(d)
+SharedFilesWindow::SharedFilesWindow()
+: KviWindow(KviWindow::Tool,"shared files window",0)
 {
 	g_pSharedFilesWindow = this;
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h
index 0faad1be8..fc38b1347 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.h
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.h
@@ -74,12 +74,12 @@ protected slots:
 };
 
 
-class SharedFilesWindow : public KviWindow, public KviModuleExtension
+class SharedFilesWindow : public KviWindow
 {
 	friend class KviSharedFilesItem;
 	Q_OBJECT
 public:
-	SharedFilesWindow(KviModuleExtensionDescriptor * d);
+	SharedFilesWindow();
 	~SharedFilesWindow();
 protected:
 	QSplitter           * m_pVertSplitter;
diff --git a/src/modules/sharedfileswindow/caps/CMakeLists.txt b/src/modules/sharedfileswindow/caps/CMakeLists.txt
deleted file mode 100644
index 2837b3f4a..000000000
--- a/src/modules/sharedfileswindow/caps/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# CMakeLists for ./caps
-
-SET(CAPSFILE sharedfileswindow)
-
-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/sharedfileswindow/caps/sharedfileswindow b/src/modules/sharedfileswindow/caps/sharedfileswindow
deleted file mode 100644
index e69de29bb..000000000
--- a/src/modules/sharedfileswindow/caps/sharedfileswindow
+++ /dev/null
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index e9bb1e74b..1b12d39c4 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -36,50 +36,6 @@
 
 SharedFilesWindow * g_pSharedFilesWindow = 0;
 
-static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtensionAllocStruct * s)
-{
-	bool bCreateMinimized = false;
-	bool bNoRaise = false;
-
-	if(!g_pSharedFilesWindow)
-	{
-		if(s->pParams)
-		{
-			if(QVariant * v = s->pParams->find("bCreateMinimized"))
-			{
-				if(v->isValid())
-				{
-					if(v->type() == QVariant::Bool)
-					{
-						bCreateMinimized = v->toBool();
-					}
-				}
-			}
-		}
-
-		g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor);
-		g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized);
-		if(bCreateMinimized)g_pSharedFilesWindow->minimize();
-		return g_pSharedFilesWindow;
-	}
-
-	if(s->pParams)
-	{
-		if(QVariant * v = s->pParams->find("bNoRaise"))
-		{
-			if(v)
-			{
-				if(v->isValid() && v->type() == QVariant::Bool)
-					bNoRaise = v->toBool();
-			}
-		}
-	}
-
-	if(!bNoRaise)g_pSharedFilesWindow->delayedAutoRaise();
-	return g_pSharedFilesWindow;
-}
-
-
 /*
 	@doc: sharedfileswindow.open
 	@type:
@@ -101,30 +57,24 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension
 
 static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_SHARED_FILES_WINDOW_EXTENSION_NAME);
-	if(d)
-	{
-		KviPointerHashTable<QString,QVariant> dict(17,true);
-		dict.setAutoDelete(true);
-		dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',"minimized")));
-		dict.replace("bNoRaise",new QVariant(c->hasSwitch('n',"noraise")));
+	QString dummy;
+	bool bCreateMinimized = c->hasSwitch('m',"minimized");
+	bool bNoRaise = c->hasSwitch('n',"noraise");
 
-		d->allocate(c->window(),&dict,0);
-	} else {
-		c->warning("Ops.. internal error");
+	if(!g_pSharedFilesWindow)
+	{
+		g_pSharedFilesWindow = new SharedFilesWindow();
+		g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized);
+		if(bCreateMinimized)g_pSharedFilesWindow->minimize();
+		return true;
 	}
+
+	if(!bNoRaise)g_pSharedFilesWindow->delayedAutoRaise();
 	return true;
 }
 
 static bool sharedfileswindow_module_init(KviModule * m)
 {
-	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-		KVI_SHARED_FILES_WINDOW_EXTENSION_NAME,
-		__tr2qs_ctx("Manage S&hared Files","sharedfileswindow"),
-		sharedfileswindow_extension_alloc);
-
-	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::SharedFiles)));
-
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",sharedfileswindow_kvs_cmd_open);
 	return true;
 }
diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt
index f060f3477..749fbcae0 100644
--- a/src/modules/url/CMakeLists.txt
+++ b/src/modules/url/CMakeLists.txt
@@ -1,7 +1,5 @@
 # CMakeLists for src/modules/url
 
-SUBDIRS(caps)
-
 SET(kviurl_MOC_HDRS
 	libkviurl.h
 )
diff --git a/src/modules/url/caps/CMakeLists.txt b/src/modules/url/caps/CMakeLists.txt
deleted file mode 100644
index 222cfc3ac..000000000
--- a/src/modules/url/caps/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# CMakeLists for ./caps
-
-SET(CAPSFILE url)
-
-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/url/caps/url b/src/modules/url/caps/url
deleted file mode 100644
index e69de29bb..000000000
--- a/src/modules/url/caps/url
+++ /dev/null
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 54b648e12..c0c444c7e 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -51,7 +51,6 @@
 #include <QPainter>
 #include <QMenu>
 
-static KviUrlAction * g_pUrlAction = 0;
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground;
@@ -78,18 +77,11 @@ void loadUrlList();
 void saveBanList();
 void loadBanList();
 UrlDlgList * findFrame();
-bool urllist();
 void url_module_help();
 
 
 #define KVI_URL_EXTENSION_NAME "URL module extenstion"
 
-static KviModuleExtension * url_extension_alloc(KviModuleExtensionAllocStruct *)
-{
-	urllist();
-	return 0;
-}
-
 UrlDialogTreeWidget::UrlDialogTreeWidget(QWidget * par)
 : QTreeWidget(par)
 {
@@ -139,24 +131,6 @@ void UrlDialogTreeWidget::paintEvent(QPaintEvent * event)
 	QTreeWidget::paintEvent(event);
 }
 
-KviUrlAction::KviUrlAction(QObject * pParent)
-: KviKvsAction(
-		pParent,
-		"url.list",
-		"url.list",
-		__tr2qs("Show URL List"),
-		__tr2qs("Shows the URL list window"),
-		KviActionManager::categoryGeneric(),
-		"kvi_bigicon_www.png",
-		QString("%1").arg(KviIconManager::Url)
-	)
-{
-}
-
-KviUrlAction::~KviUrlAction()
-{
-}
-
 // ---------------------------- CLASS URLDIALOG ------------------------begin //
 
 UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
@@ -719,25 +693,6 @@ void loadBanList()
 
 static bool url_kvs_cmd_list(KviKvsModuleCommandCall *)
 {
-	urllist();
-	return true;
-}
-
-UrlDlgList *findFrame()
-{
-	UrlDlgList *tmpitem = g_pUrlDlgList->first();
-	if (!tmpitem) {
-		UrlDlgList *udl = new UrlDlgList();
-		udl->dlg = 0;
-		udl->menu_id = -1;
-		g_pUrlDlgList->append(udl);
-		tmpitem = g_pUrlDlgList->current();
-	}
-	return tmpitem;
-}
-
-bool urllist()
-{
 	UrlDlgList *tmpitem = findFrame();
 	if (tmpitem->dlg) return false;
 
@@ -753,6 +708,18 @@ bool urllist()
 	return true;
 }
 
+UrlDlgList *findFrame()
+{
+	UrlDlgList *tmpitem = g_pUrlDlgList->first();
+	if (!tmpitem) {
+		UrlDlgList *udl = new UrlDlgList();
+		udl->dlg = 0;
+		udl->menu_id = -1;
+		g_pUrlDlgList->append(udl);
+		tmpitem = g_pUrlDlgList->current();
+	}
+	return tmpitem;
+}
 
 /*
  	@doc: url.config
@@ -872,12 +839,6 @@ bool urllist_module_event_onUrl(KviKvsModuleEventCall * c)
 
 static bool url_module_init(KviModule *m)
 {
-	KviModuleExtensionDescriptor * d = m->registerExtension("tool",
-							KVI_URL_EXTENSION_NAME,
-							__tr2qs("View URL list"),
-							url_extension_alloc);
-	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Url)));
-
 	g_pList = new KviPointerList<KviUrl>;
 	g_pList->setAutoDelete(true);
 
@@ -889,8 +850,6 @@ static bool url_module_init(KviModule *m)
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"list",url_kvs_cmd_list);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"config",url_kvs_cmd_config);
-	g_pUrlAction = new KviUrlAction(KviActionManager::instance());
-	KviActionManager::instance()->registerAction(g_pUrlAction);
 
 	m->kvsRegisterAppEventHandler(KviEvent_OnURL,urllist_module_event_onUrl);
 
@@ -922,8 +881,6 @@ static bool url_module_cleanup(KviModule *)
 
 	delete g_pUrlDlgList;
 	g_pUrlDlgList = 0;
-	delete g_pUrlAction;
-	g_pUrlAction = 0;
 
 	return true;
 }
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 812473da3..7347e1b58 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -134,13 +134,4 @@ protected slots:
 	void discardbtn();
 };
 
-
-class KviUrlAction : public KviKvsAction
-{
-	Q_OBJECT
-public:
-	KviUrlAction(QObject * pParent);
-	~KviUrlAction();
-};
-
 #endif