Rework the addon pack dialog.

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

2 files changed, 17 insertions, 18 deletions

diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index bb68a95c9..b715bb00b 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -437,7 +437,6 @@ bool KviPackThemeDialog::packTheme()
 	m_szPackagePath = field("packageSavePath").toString();
 	//m_szSavePath = field("packageSavePath").toString();
 
-	debug("author: %s, name: %s, version: %s, desc: %s, image: %s, save: %s, engine: %s\n",m_szAuthor.toUtf8().data(),m_szName.toUtf8().data(),m_szVersion.toUtf8().data(),m_szDescription.toUtf8().data(),m_szImagePath.toUtf8().data(),m_szPackagePath.toUtf8().data(),KVI_CURRENT_THEME_ENGINE_VERSION);
 	//return false;
 
 	QImage pix(m_szImagePath);
@@ -537,7 +536,6 @@ bool KviPackThemeDialog::packTheme()
 
 		if(!f.addDirectory(pInfo->absoluteDirectory(),pInfo->subdirectory()))
 		{
-			debug("error abs %s - sub %s",pInfo->absoluteDirectory().toUtf8().data(),pInfo->subdirectory().toUtf8().data());
 			szTmp = __tr2qs_ctx("Packaging failed","theme");
 			szTmp += ": ";
 			szTmp += f.lastError();
@@ -553,8 +551,6 @@ bool KviPackThemeDialog::packTheme()
 
 	if(!f.pack(m_szPackagePath))
 	{
-		debug("error package path %s",m_szPackagePath.toUtf8().data());
-
 		szTmp = __tr2qs_ctx("Packaging failed","theme");
 		szTmp += ": ";
 		szTmp += f.lastError();
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index 3890ef68d..a1a39a991 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -61,10 +61,9 @@ namespace KviThemeFunctions
 
 		// check if it is a valid theme file
 		KviPackageReader r;
-		debug("check file");
+
 		if(!r.readHeader(szThemePackageFileName))
 		{
-			debug("Error!");
 			QString szErr = r.lastError();
 			KviQString::sprintf(szError,__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","theme"),&szErr);
 			return false;
@@ -73,16 +72,18 @@ namespace KviThemeFunctions
 		pInfoFields = r.stringInfoFields();
 
 		pValue = pInfoFields->find("PackageType");
-		if(!pValue)return notAValidThemePackage(szError);
-		debug("pValue themepack= %s",pValue->toUtf8().data());
-		if(!KviQString::equalCI(*pValue,"ThemePack"))return notAValidThemePackage(szError);
+		if(!pValue)
+			return notAValidThemePackage(szError);
+
+		if(!KviQString::equalCI(*pValue,"ThemePack"))
+			return notAValidThemePackage(szError);
+
 		pValue = pInfoFields->find("ThemePackVersion");
-		debug("pValue theme version %s",pValue->toUtf8().data());
 
-		if(!pValue)return notAValidThemePackage(szError);
+		if(!pValue)
+			return notAValidThemePackage(szError);
 
 		// make sure the default fields exist
-		debug("check defaults fields");
 		for(int i=0;i<6;i++)
 		{
 			pValue = pInfoFields->find(check_fields[i]);
@@ -90,12 +91,16 @@ namespace KviThemeFunctions
 		}
 
 		pValue = pInfoFields->find("ThemeCount");
-		debug("pValue theme count %s",pValue->toUtf8().data());
-		if(!pValue)return notAValidThemePackage(szError);
+		if(!pValue)
+			return notAValidThemePackage(szError);
+
 		bool bOk;
 		int iThemeCount = pValue->toInt(&bOk);
-		if(!bOk)return notAValidThemePackage(szError);
-		if(iThemeCount < 1)return notAValidThemePackage(szError);
+		if(!bOk)
+			return notAValidThemePackage(szError);
+
+		if(iThemeCount < 1)
+			return notAValidThemePackage(szError);
 
 		// ok.. it should be really valid at this point
 
@@ -283,12 +288,10 @@ namespace KviThemeFunctions
 		hd.iFlags = KviHtmlDialogData::ForceMinimumSize;
 
 		bInstall = KviHtmlDialog::display(pDialogParent,&hd) == 2;
-		debug("installint %d",bInstall);
 		if(bInstall)
 		{
 			QString szUnpackPath;
 			g_pApp->getLocalKvircDirectory(szUnpackPath,KviApp::Themes);
-			debug("unpack theme %s in  %s",szThemePackageFileName.toUtf8().data(),szUnpackPath.toUtf8().data());
 			if(!r.unpack(szThemePackageFileName,szUnpackPath))
 			{
 				QString szErr2 = r.lastError();