More work on addon managmenet

6 files changed, 23 insertions, 17 deletions

diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
index fb366502f..c553d3594 100644
--- a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
+++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
@@ -85,7 +85,7 @@ KviKvsScriptAddon::~KviKvsScriptAddon()
 
 QPixmap * KviKvsScriptAddon::icon()
 {
-	qDebug("Addon requests icon %s",m_szIconId.toUtf8().data());
+	//qDebug("Addon requests icon %s",m_szIconId.toUtf8().data());
 	return g_pIconManager->getBigIcon(m_szIconId.isEmpty() ? QString(KVI_BIGICON_KVS) : m_szIconId);
 }
 
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 03f3613a9..008506684 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -313,9 +313,15 @@ namespace AddonFunctions
 		pw.addInfoField("MinimumKVIrcVersion",info.szMinVersion);
 		pw.addInfoField("Application","KVIrc " KVI_VERSION "." KVI_SOURCES_DATE);
 
-		QPixmap pix(info.szIcon);
-		if(!pix.isNull())
+		if(!info.szImage.isEmpty())
 		{
+			QPixmap pix(info.szImage);
+			if(pix.isNull())
+			{
+				szError = __tr2qs_ctx("Failed to load the image at %1","addon").arg(info.szImage);
+				return false;
+			}
+
 			QByteArray * pba = new QByteArray();
 			QBuffer bufferz(pba,0);
 	
diff --git a/src/modules/addon/AddonFunctions.h b/src/modules/addon/AddonFunctions.h
index b4de8b668..6c9825f0e 100644
--- a/src/modules/addon/AddonFunctions.h
+++ b/src/modules/addon/AddonFunctions.h
@@ -40,7 +40,7 @@ public:
 	QString szVersion;
 	QString szDescription;
 	QString szMinVersion;
-	QString szIcon;
+	QString szImage;
 	QString szDirPath;
 	QString szSavePath;
 };
diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp
index 6f5a79b04..9f56cc320 100644
--- a/src/modules/addon/PackAddonDialog.cpp
+++ b/src/modules/addon/PackAddonDialog.cpp
@@ -139,7 +139,7 @@ bool PackAddonDialog::packAddon()
 	info.szVersion = field("packageVersion").toString();
 	info.szDescription = field("packageDescription").toString();
 	info.szMinVersion = field("packageMinVersion").toString();
-	info.szIcon = field("packageIcon").toString();
+	info.szImage = field("packageImage").toString();
 	info.szDirPath = field("packageDirPath").toString();
 	info.szSavePath = field("packageSavePath").toString();
 
@@ -272,12 +272,12 @@ PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pPa
 	pLayout->addWidget(m_pDirPathSelector);
 
 	// Select addon icon
-	m_pPackageIconEdit = new KviFileSelector(this,__tr2qs_ctx("Select the icon file:","addon"),&m_szPackageIcon,true,KviFileSelector::VerticalLayout,KVI_FILTER_IMAGE);
-	pLayout->addWidget(m_pPackageIconEdit);
+	m_pPackageImageEdit = new KviFileSelector(this,__tr2qs_ctx("Select the image file:","addon"),&m_szPackageImage,true,KviFileSelector::VerticalLayout,KVI_FILTER_IMAGE);
+	pLayout->addWidget(m_pPackageImageEdit);
 
 	// Store data in the fields
 	registerField("packageDirPath*",m_pDirPathSelector);
-	registerField("packageIcon*",m_pPackageIconEdit);
+	registerField("packageImage*",m_pPackageImageEdit);
 }
 
 PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget()
@@ -354,7 +354,7 @@ void PackAddonSummaryInfoWidget::initializePage()
 	QString szVersion = field("packageVersion").toString();
 	QString szDescription = field("packageDescription").toString();
 	QString szMinVersion = field("packageMinVersion").toString();
-	QString szIcon = field("packageIcon").toString();
+	QString szImage = field("packageImage").toString();
 	QString szDirPath = field("packageDirPath").toString();
 	QString szSavePath = field("packageSavePath").toString();
 
@@ -380,9 +380,9 @@ void PackAddonSummaryInfoWidget::initializePage()
 	szText += ":</b> ";
 	szText += szMinVersion;
 	szText += "<br><b>";
-	szText += __tr2qs_ctx("Icon File","addon");
+	szText += __tr2qs_ctx("Image File","addon");
 	szText += ":</b> ";
-	szText += szIcon;
+	szText += szImage;
 	szText += "<br><b>";
 	szText += __tr2qs_ctx("Source Directory","addon");
 	szText += ":</b> ";
diff --git a/src/modules/addon/PackAddonDialog.h b/src/modules/addon/PackAddonDialog.h
index e3bcca402..09e1303d5 100644
--- a/src/modules/addon/PackAddonDialog.h
+++ b/src/modules/addon/PackAddonDialog.h
@@ -163,9 +163,9 @@ public:
 	~PackAddonFileSelectionWidget();
 protected:
 	KviDirectorySelector * m_pDirPathSelector;
-	KviFileSelector      * m_pPackageIconEdit;
+	KviFileSelector      * m_pPackageImageEdit;
 	QString                m_szDirPath;
-	QString                m_szPackageIcon;
+	QString                m_szPackageImage;
 };
 
 /**
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 74fb8a4ea..f64e08cd2 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -822,7 +822,7 @@ static bool addon_kvs_cmd_install(KviKvsModuleCommandCall * c)
 	@short:
 		Creates a kva package containing an addon
 	@syntax:
-		addon.pack <package_path> <addon_name> <addon_version> <description> <author> <min_kvirc_version> <icon> <addon_path>
+		addon.pack <package_path> <addon_name> <addon_version> <description> <author> <min_kvirc_version> <image> <addon_path>
 	@description:
 		Creates a *.kva package containing a KVIrc addon.[br]
 		<package_path> is the absolute path and file name of the package that should be saved.[br]
@@ -832,8 +832,8 @@ static bool addon_kvs_cmd_install(KviKvsModuleCommandCall * c)
 		<author> is the name of the person that is creating the addon.
 		<min_kvirc_version> is the minimum kvirc version that this addon supports. Pass an empty string if you want
 		this to become the current kvirc version.
-		<icon> is the path of an icon to be used as rappresentative image of the addon. Pass an empty string if you
-		don't want an icon to be stored in the package.
+		<image> is the path of an image to be used in the installation dialog. Pass an empty string if you
+		don't want an image to be stored in the package.
 		<addon_path> is a path to a directory containing an addon. It should contain an install.kvs file
 		that calls [cmd]addon.register[/cmd] and then installs all the addon aliases, events and files (via [cmd]addon.installfiles[/cmd].
 */
@@ -848,7 +848,7 @@ static bool addon_kvs_cmd_pack(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("description",KVS_PT_STRING,0,info.szDescription)
 		KVSM_PARAMETER("author",KVS_PT_NONEMPTYSTRING,0,info.szAuthor)
 		KVSM_PARAMETER("min_kvirc_version",KVS_PT_STRING,0,info.szMinVersion)
-		KVSM_PARAMETER("addon_icon",KVS_PT_STRING,0,info.szIcon)
+		KVSM_PARAMETER("image",KVS_PT_STRING,0,info.szImage)
 		KVSM_PARAMETER("addon_path",KVS_PT_NONEMPTYSTRING,0,info.szDirPath)
 	KVSM_PARAMETERS_END(c)