The FileTransferWindow no longer offers a module extension interface

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

1 files changed, 42 insertions, 46 deletions

diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 30a76f302..c05fb5cee 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -32,51 +32,54 @@
 
 #include <QSplitter>
 
-FileTransferWindow * g_pFileTransferWindow = 0;
+FileTransferWindow * g_pFileTransferWindow = NULL;
 
+static FileTransferWindow * filetransferwindow_alloc(bool bCreateMinimized,bool bNoRaise)
+{
+	if(!g_pFileTransferWindow)
+	{
+		g_pFileTransferWindow = new FileTransferWindow();
+		g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized);
+		return g_pFileTransferWindow;
+	}
+
+	if(!bNoRaise)
+		g_pFileTransferWindow->delayedAutoRaise();
+	return g_pFileTransferWindow;
+}
+
+#if 0
 static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensionAllocStruct * s)
 {
 	bool bCreateMinimized = false;
 	bool bNoRaise = false;
 
-	if(!g_pFileTransferWindow)
+	if(s->pParams)
 	{
-		if(s->pParams)
+		if(QVariant * v1 = s->pParams->find("bCreateMinimized"))
 		{
-			if(QVariant * v = s->pParams->find("bCreateMinimized"))
+			if(v1->isValid())
 			{
-				if(v->isValid())
+				if(v1->type() == QVariant::Bool)
 				{
-					if(v->type() == QVariant::Bool)
-					{
-						bCreateMinimized = v->toBool();
-					}
+					bCreateMinimized = v1->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(QVariant * v2 = s->pParams->find("bNoRaise"))
 		{
-			if(v)
+			if(v2)
 			{
-				if(v->isValid() && v->type() == QVariant::Bool)
-					bNoRaise = v->toBool();
+				if(v2->isValid() && v2->type() == QVariant::Bool)
+					bNoRaise = v2->toBool();
 			}
 		}
 	}
 
-	if(!bNoRaise)
-		g_pFileTransferWindow->delayedAutoRaise();
-	return g_pFileTransferWindow;
+	return filetransferwindow_alloc(bCreateMinimized,bNoRaise);
 }
-
+#endif
 
 /*
 	@doc: filetransferwindow.open
@@ -89,9 +92,9 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 	@syntax:
 		filetransferwindow.open [-m] [-n]
 	@switches:
-		!sw: -m
+		!sw: -m | --minimized
 		Causes the window to be created as minimized
-		!sw: -n
+		!sw: -n | --noraise
 		Causes the window to be not raised if already open
 	@description:
 		Opens the file transfer window
@@ -99,32 +102,24 @@ 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);
+	filetransferwindow_alloc(c->hasSwitch('m',QString::fromAscii("minimized")),c->hasSwitch('n',QString::fromAscii("noraise")));
 
-	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 bool filetransferwindow_module_init(KviModule * m)
 {
-	KviModuleExtensionDescriptor * d = m->registerExtension("transfer",
-		KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME,
-		__tr2qs("Manage File &Transfers"),
-		filetransferwindow_extension_alloc);
-
-	if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::FileTransfer)));
+#if 0
+	KviModuleExtensionDescriptor * d = m->registerExtension(
+			"transfer",
+			KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME,
+			__tr2qs("Manage File &Transfers"),
+			filetransferwindow_extension_alloc
+		);
 
+	if(d)
+		d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::FileTransfer)));
+#endif
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",filetransferwindow_kvs_cmd_open);
 
@@ -148,10 +143,11 @@ KVIRC_MODULE(
 	"FileTransferWindow",
 	"4.0.0",
 	"Copyright (C) 2008 Szymon Stefanek (pragma at kvirc dot net)",
-	"Links window extension",
+	"File Transfer Window Extension",
 	filetransferwindow_module_init,
 	filetransferwindow_module_can_unload,
 	0,
 	filetransferwindow_module_cleanup,
 	"filetransferwindow"
 )
+