more work on addon system, fixed some stuff (wip);

removed useless dir;
added properties to KviFileSelector and KviDirectorySelector;


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

2 files changed, 15 insertions, 225 deletions

diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp
index 05a3f93b4..c3e8b33ba 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/packaddondialog.cpp
@@ -81,6 +81,11 @@ KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent)
 	setPixmap(QWizard::LogoPixmap,*pLogo);
 #endif
 
+	// Add the properties to handle fields
+	setDefaultProperty("QTextEdit","plainText","textChanged()");
+	setDefaultProperty("KviFileSelector","file","selectionChanged()");
+	setDefaultProperty("KviDirSelector","dir","selectionChanged()");
+
 	// Welcome page
 	QWizardPage * pPage = new QWizardPage(this);
 	QVBoxLayout * pLayout = new QVBoxLayout(pPage);
@@ -473,14 +478,6 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 {
 	setTitle(__tr2qs_ctx("Package Informations","addon"));
 	setSubTitle(__tr2qs_ctx("Here you need to provide informations about you (the packager) and a short description of the package you're creating.","addon"));
-	//setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/watermark.png"));
-
-	// Default values
-	m_szPackageAuthor = __tr2qs_ctx("Your name here","addon");
-	m_szPackageName = "The name must NOT contains spaces, like MyAddon";
-	m_szPackageDescription = __tr2qs_ctx("Put a package description here...","addon");
-	m_szPackageVersion = "Version number in the form x.y[.z], like 1.0 or 2.0.3";
-	m_szPackageMinVersion = KVI_VERSION;
 
 	QGridLayout * pLayout = new QGridLayout(this);
 
@@ -489,7 +486,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	pLayout->addWidget(pLabel,0,0);
 	
 	m_pPackageAuthorEdit = new QLineEdit(this);
-	m_pPackageAuthorEdit->setText(m_szPackageAuthor);
+	m_pPackageAuthorEdit->setText(__tr2qs_ctx("Your name here","addon"));
 	pLabel->setBuddy(m_pPackageAuthorEdit);
 	pLayout->addWidget(m_pPackageAuthorEdit,0,1);
 
@@ -498,7 +495,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	pLayout->addWidget(pLabel,1,0);
 	
 	m_pPackageNameEdit = new QLineEdit(this);
-	m_pPackageNameEdit->setText(m_szPackageName);
+	m_pPackageNameEdit->setText(__tr2qs_ctx("No spaces allowed, like MyAddon","addon"));
 	pLabel->setBuddy(m_pPackageNameEdit);
 	pLayout->addWidget(m_pPackageNameEdit,1,1);
 
@@ -507,7 +504,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	pLayout->addWidget(pLabel,2,0);
 	
 	m_pPackageVersionEdit = new QLineEdit(this);
-	m_pPackageVersionEdit->setText(m_szPackageVersion);
+	m_pPackageVersionEdit->setText(__tr2qs_ctx("Version in the form x.y[.z], like 1.0 or 2.0.3","addon"));
 	pLabel->setBuddy(m_pPackageVersionEdit);
 	pLayout->addWidget(m_pPackageVersionEdit,2,1);
 
@@ -517,7 +514,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	
 	m_pPackageDescriptionEdit = new KviTalTextEdit(this);
 	m_pPackageDescriptionEdit->setBackgroundRole(QPalette::Window);
-	m_pPackageDescriptionEdit->setText(m_szPackageDescription);
+	m_pPackageDescriptionEdit->setText(__tr2qs_ctx("Put a package description here...","addon"));
 	pLabel->setBuddy(m_pPackageDescriptionEdit);
 	pLayout->addWidget(m_pPackageDescriptionEdit,3,1,1,2);
 	pLayout->setRowStretch(1,1);
@@ -527,7 +524,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	pLayout->addWidget(pLabel,4,0);
 
 	m_pPackageMinVersionEdit = new QLineEdit(this);
-	m_pPackageMinVersionEdit->setText(m_szPackageMinVersion);
+	m_pPackageMinVersionEdit->setText(KVI_VERSION);
 	pLabel->setBuddy(m_pPackageMinVersionEdit);
 	pLayout->addWidget(m_pPackageMinVersionEdit,4,1);
 
@@ -535,9 +532,9 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	registerField("packageAuthor*",m_pPackageAuthorEdit);
 	registerField("packageName*",m_pPackageNameEdit);
 	registerField("packageVersion*",m_pPackageVersionEdit);
+	// FIXME: if the description field is changed before the others, it work, otherwise not
+	//registerField("packageDescription*",m_pPackageDescriptionEdit);
 	registerField("packageDescription",m_pPackageDescriptionEdit);
-	// FIXME
-	//registerField("packageDescription*",m_pPackageDescriptionEdit,"QString toPlainText()","textChanged()");
 	registerField("packageMinVersion",m_pPackageMinVersionEdit);
 }
 
@@ -563,7 +560,7 @@ KviPackAddonFileSelectionWidget::KviPackAddonFileSelectionWidget(KviPackAddonDia
 	pLayout->addWidget(m_pPackageIconEdit);
 
 	// Store data in the fields
-	// FIXME
+	// FIXME they seem to ignore KviFile/DirSelector properties
 	//registerField("packageDirPath*",m_pPackageIconEdit);
 	//registerField("packageIcon*",m_pPackageIconEdit);
 	registerField("packageDirPath",m_pPackageIconEdit);
@@ -588,8 +585,8 @@ KviPackAddonSaveSelectionWidget::KviPackAddonSaveSelectionWidget(KviPackAddonDia
 	pLayout->addWidget(m_pSavePathSelector);
 
 	// Store data in the fields
-	// FIXME: these fields don't get registered
-	//registerField("packageSavePath*",m_pSavePathSelector,"","selectionChanged");
+	// FIXME they seem to ignore KviFile/DirSelector properties
+	//registerField("packageSavePath*",m_pSavePathSelector);
 	registerField("packageSavePath",m_pSavePathSelector);
 }
 
diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h
index 0aceab21e..8ae66e2b2 100644
--- a/src/modules/addon/packaddondialog.h
+++ b/src/modules/addon/packaddondialog.h
@@ -44,104 +44,11 @@
 class QLineEdit;
 class QLabel;
 
-//class KviPackAddonDialog;
 class KviPackAddonInfoPackageWidget;
 class KviPackAddonFileSelectionWidget;
 class KviPackAddonSaveSelectionWidget;
 class KviPackAddonSummaryWidget;
 
-#if 0
-/**
-* \class KviPackAddonDialogData
-* \brief Class for storing addon data
-*/
-class KviPackAddonData
-{
-public:
-	/**
-	* \brief Creates the addon data object
-	* \param pParent The parent wizard dialog
-	* \return KviPackAddonData
-	*/
-	KviPackAddonData(KviPackAddonDialog * pParent);
-
-	/**
-	* \brief Destroys the addon data object
-	*/
-	~KviPackAddonData();
-protected:
-	QString m_szAuthor;
-	QString m_szName;
-	QString m_szVersion;
-	QString m_szDescription;
-	QString m_szMinVersion;
-public:
-	/**
-	* \brief Sets the package author
-	* \param szAuthor The author name
-	* \return void
-	*/
-	void setAuthor(QString & szAuthor){ m_szAuthor = szAuthor; };
-
-	/**
-	* \brief Sets the package name
-	* \param szName The package name
-	* \return void
-	*/
-	void setName(QString & szName){ m_szName = szName; };
-
-	/**
-	* \brief Sets the package version
-	* \param szVersion The author name
-	* \return void
-	*/
-	void setVersion(QString & szVersion){ m_szVersion = szVersion; };
-
-	/**
-	* \brief Sets the package description
-	* \param szDescription
-	* \return void
-	*/
-	void setDescription(QString & szDescription){ m_szDescription = szDescription; };
-
-	/**
-	* \brief Sets the package minimum version
-	* \param szMinVersion
-	* \return void
-	*/
-	void setMinVersion(QString & szMinVersion){ m_szMinVersion = szMinVersion; };
-
-	/**
-	* \brief Returns the author name
-	* \return QString
-	*/
-	QString author(){ return m_szAuthor; };
-
-	/**
-	* \brief Returns the package name
-	* \return QString
-	*/
-	QString name(){ return m_szName; };
-
-	/**
-	* \brief Returns the package version
-	* \return QString
-	*/
-	QString version(){ return m_szVersion; };
-
-	/**
-	* \brief Returns the package description
-	* \return QString
-	*/
-	QString description(){ return m_szDescription; };
-
-	/**
-	* \brief Returns the minimum version allowed of KVIrc
-	* \return QString
-	*/
-	QString minVersion(){ return m_szMinVersion; };
-};
-#endif
 /**
 * \class KviPackAddonDialog
 * \brief Wizard for addon creation
@@ -166,35 +73,6 @@ public:
 	KviPackAddonFileSelectionWidget * m_pPackAddonFileSelectionWidget;
 	KviPackAddonSaveSelectionWidget * m_pPackAddonSaveSelectionWidget;
 	KviPackAddonSummaryWidget       * m_pPackAddonSummaryWidget;
-	//KviPackAddonData                * m_pData;
-#if 0
-protected:
-	QString m_szPackagePath;
-public:
-	/**
-	* \brief Returns the author's info selection widget
-	* \return KviPackAddonCreateInfoPackageWidget *
-	*/
-	KviPackAddonInfoPackageWidget * infoWidget(){ return m_pPackAddonInfoPackageWidget; };
-
-	/**
-	* \brief Returns the directory selection widget
-	* \return KviPackAddonFileSelectionWidget *
-	*/
-	KviPackAddonFileSelectionWidget * fileWidget(){ return m_pPackAddonFileSelectionWidget; };
-
-	/**
-	* \brief Returns the saving selection widget
-	* \return KviPackAddonSaveSelectionWidget *
-	*/
-	KviPackAddonSaveSelectionWidget * saveWidget(){ return m_pPackAddonSaveSelectionWidget; };
-
-	/**
-	* \brief Returns the addon data object
-	* \return KviPackAddonData *
-	*/
-	KviPackAddonData * data(){ return m_pData; };
-#endif
 protected:
 	/**
 	* \brief Runs the packAddon() function and closes the wizard
@@ -244,50 +122,12 @@ public:
 	* \brief Destroys the wizard package info page object
 	*/
 	~KviPackAddonInfoPackageWidget();
-public:
-	QString m_szPackageName;
-	QString m_szPackageAuthor;
-	QString m_szPackageDescription;
-	QString m_szPackageVersion;
-	QString m_szPackageMinVersion;
 protected:
 	QLineEdit       * m_pPackageAuthorEdit;
 	QLineEdit       * m_pPackageNameEdit;
 	QLineEdit       * m_pPackageVersionEdit;
 	KviTalTextEdit  * m_pPackageDescriptionEdit;
 	QLineEdit       * m_pPackageMinVersionEdit;
-#if 0
-public:
-	/**
-	* \brief Returns the author name
-	* \return QString
-	*/
-	QString packageAuthor(){ return m_pPackageAuthorEdit->text(); };
-
-	/**
-	* \brief Returns the package name
-	* \return QString
-	*/
-	QString packageName(){ return m_pPackageNameEdit->text(); };
-
-	/**
-	* \brief Returns the package version
-	* \return QString
-	*/
-	QString packageVersion(){ return m_pPackageVersionEdit->text(); };
-
-	/**
-	* \brief Returns the package description
-	* \return QString
-	*/
-	QString packageDescription(){ return m_pPackageDescriptionEdit->toPlainText(); };
-
-	/**
-	* \brief Returns the minimum version allowed of KVIrc
-	* \return QString
-	*/
-	QString packageMinVersion(){ return m_pPackageMinVersionEdit->text(); };
-#endif
 };
 
 /**
@@ -314,45 +154,6 @@ protected:
 	KviFileSelector      * m_pPackageIconEdit;
 	QString                m_szDirPath;
 	QString                m_szPackageIcon;
-#if 0
-/*
-	KviDirectorySelector * m_pSourcePathSelector;
-	KviDirectorySelector * m_pConfigPathSelector;
-	KviDirectorySelector * m_pImagePathSelector;
-	KviDirectorySelector * m_pLocalePathSelector;
-	KviDirectorySelector * m_pHelpPathSelector;
-	KviDirectorySelector * m_pSoundPathSelector;
-	KviFileSelector      * m_pInstallPathSelector;
-	QString                szSourcePath;
-	QString                szConfigPath;
-	QString                szImagePath;
-	QString                szLocalePath;
-	QString                szHelpPath;
-	QString                szSoundPath;
-	QString                szInstallPath;
-*/
-public:
-	/**
-	* \brief Returns the source directory
-	* \return QString
-	*/
-	QString dirPath(){ m_pDirPathSelector->commit(); return m_szDirPath; };
-
-	/**
-	* \brief Returns the path to the package icon
-	* \return QString
-	*/
-	QString packageIcon(){ m_pPackageIconEdit->commit(); return m_szPackageIcon; };
-/*
-	QString sourcePath(){ m_pSourcePathSelector->commit(); return szSourcePath; };
-	QString configPath(){ m_pConfigPathSelector->commit(); return szConfigPath; };
-	QString imagePath(){ m_pImagePathSelector->commit(); return szImagePath; };
-	QString localePath(){ m_pLocalePathSelector->commit(); return szLocalePath; };
-	QString helpPath(){ m_pHelpPathSelector->commit(); return szHelpPath; };
-	QString soundPath(){ m_pSoundPathSelector->commit(); return szSoundPath; };
-	QString installerPath(){ m_pInstallPathSelector->commit(); return szInstallPath; };
-*/
-#endif
 };
 
 /**
@@ -383,14 +184,6 @@ protected:
 	* \return void
 	*/
 	virtual void initializePage();
-#if 0
-public:
-	/**
-	* \brief Returns the saving path
-	* \return QString
-	*/
-	QString savePath(){ m_pSavePathSelector->commit(); return szSavePath; };
-#endif
 };
 
 /**