more work on addon manager (wip);

added file filters;


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

3 files changed, 26 insertions, 10 deletions

diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp
index a609f7376..ac4863728 100644
--- a/src/modules/addon/addonfunctions.cpp
+++ b/src/modules/addon/addonfunctions.cpp
@@ -39,7 +39,7 @@
 
 namespace KviAddonFunctions
 {
-	static bool notAValidAddonPackage(QString &szError)
+	bool notAValidAddonPackage(QString &szError)
 	{
 		KviQString::sprintf(szError,__tr2qs_ctx("The selected file does not seem to be a valid KVIrc addon package","addon"));
 		return false;
diff --git a/src/modules/addon/addonfunctions.h b/src/modules/addon/addonfunctions.h
index ffed963cf..23cae3719 100644
--- a/src/modules/addon/addonfunctions.h
+++ b/src/modules/addon/addonfunctions.h
@@ -34,7 +34,7 @@
 
 namespace KviAddonFunctions
 {
-	static bool notAValidAddonPackage(QString &szError);
+	bool notAValidAddonPackage(QString &szError);
 	bool installAddonPackage(const QString &szAddonPackageFileName,QString &szError,QWidget * pDialogParent = 0);
 	void getAddonHtmlDescription(
 		QString &szBuffer,
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index d968b25c1..646e7698a 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -24,6 +24,7 @@
 

 #include "managementdialog.h"

 #include "packaddondialog.h"

+#include "addonfunctions.h"

 

 #include "kvi_app.h"

 #include "kvi_locale.h"

@@ -277,17 +278,32 @@ void KviScriptManagementDialog::getMoreScripts()
 

 void KviScriptManagementDialog::installScript()

 {

-	QString buffer;

+	QString szFileName, szError;

 

-	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs("Please select the addon installation file"),QString::null,"install.kvs",false,true))return;

+	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs("Please select the addon installation file"),QString::null,KVI_FILTER_SCRIPTS,false,true))return;

 

-	buffer.replace("\\","\\\\");

+	szFileName.replace("\\","\\\\");

 

-	QString szCmd = "parse \"";

-	szCmd += buffer;

-	szCmd += "\"";

-

-	KviKvsScript::run(szCmd,g_pActiveWindow);

+	// Switch between script and addon

+	if(szFileName.endsWith(".kvs"))

+	{

+		QString szCmd = "parse \"";

+		szCmd += szFileName;

+		szCmd += "\"";

+	

+		KviKvsScript::run(szCmd,g_pActiveWindow);

+	} else if(szFileName.endsWith(".kva")){

+		if(!KviAddonFunctions::installAddonPackage(szFileName,szError,this))

+		{

+			KviMessageBox::information(szError);

+			return;

+		}

+	} else {

+		// Just for sanity check. We should NEVER enter here

+		QString szError;

+		KviAddonFunctions::notAValidAddonPackage(szError);

+		QMessageBox::critical(this,__tr2qs_ctx("Install Addon - KVIrc","addon"),szError,QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);

+	}

 

 	fillListView();

 	currentChanged(0,0);