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

6 files changed, 10 insertions, 75 deletions

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;
 }