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

1 files changed, 12 insertions, 55 deletions

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