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

5 files changed, 22 insertions, 778 deletions

diff --git a/scripts/po/libpo.py b/scripts/po/libpo.py
deleted file mode 100644
index 4629222db..000000000
--- a/scripts/po/libpo.py
+++ /dev/null
@@ -1,524 +0,0 @@
-# Handling of PO files contents.
-# Modified for KVIrc by Elvio Basello <hellvis69 at netsons dot org> 2008
-# Copyright (C) 2001, 2002 Free Translation Project.
-# Copyright (C) 1998, 1999, 2000, 2001 Progiciels Bourbeau-Pinard inc.
-# Francois Pinard <pinard@iro.umontreal.ca>, 1998.
-
-import re, string, sys, types
-cre = re
-
-def _(text):
-	return text
-
-_default_header = { 'TITLE': _('SOME DESCRIPTIVE TITLE.'),
-					'COPYRIGHT'
-					: 'Copyright (C) YEAR Free Software Foundation, Inc.',
-					'FIRST-AUTHOR'
-					: _('FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.'),
-					'COMMENTS': '',
-					'FLAGS': '',
-					'project-id-version': _('PACKAGE VERSION'),
-					'pot-creation-date': _('YEAR-MO-DA HO:MI +ZONE'),
-					'po-revision-date': _('YEAR-MO-DA HO:MI +ZONE'),
-					'last-translator': _('FULL NAME <EMAIL@ADDRESS>'),
-					'language-team': _('LANGUAGE <LL@li.org>'),
-					'mime-version': '1.0',
-					'content-type': _('text/plain; charset=CHARSET'),
-					'content-transfer-encoding': _('ENCODING'),
-					'FIELDS': '' }
-
-_default_order = [ 'Project-Id-Version',
-				   'POT-Creation-Date',
-				   'PO-Revision-Date',
-				   'Last-Translator',
-				   'Language-Team',
-				   'MIME-Version',
-				   'Content-Type',
-				   'Content-Transfer-Encoding' ]
-
-# XXX: This doesn't produce the true canonical form: if there are many
-# #: source references, it writes them all in a single line, whereas
-# GNU gettext breaks them at appropriate places. Use msgcat instead.
-def copy_canonical(source, to):
-	entries = read(source)
-	data = header(entries)
-	set_header(entries, data)
-	write(to, entries)
-	return data
-
-# Input and output.
-
-def read(name):
-	entries = []				# retained entries
-	entry = {}				# entry being constructed
-	keys = {}				# msgid to full entry dictionary
-	status = None				# None, 'msgid' or `msgstr'
-	msgid = ''				# msgid being accumulated
-	msgid_plural = ''
-	msgstr = ''				# msgstr being accumulated
-
-	if name == '-':
-		file = sys.stdin
-	else:
-		file = open(name)
-	line_count = 0
-
-	for line in file.readlines():
-		line = cre.sub(r'\r$', '', line, 1)
-		line_count = line_count + 1
-
-		obsolete = line[:2] == '#~'
-		# FIXME: Better study the obsoleteness of an obsolete entry.
-
-		line = cre.sub(r'[ \t]+$', '', line, 1)
-
-		if obsolete:
-			line = cre.sub('#~ *', '', line, 1)
-		if cre.match('$', line):
-			continue
-
-		if line[0] == '#':
-			if status == 'msgstr':
-				entry['msgid'] = unquote(msgid)
-				if msgid_plural:
-					entry['msgid_plural'] = unquote(msgid_plural)
-					entry['msgstr'] = map(unquote, msgstr)
-				else:
-					entry['msgstr'] = unquote(msgstr)
-				_append(entries, entry, keys)
-				entry = {}
-				status = None
-			if obsolete:
-				entry['obsolete'] = 1
-			if cre.match(r'#[ \t\n]', line):
-				if entry.has_key('comment'):
-					entry['comment'] = entry['comment'] + line
-				elif not cre.match(r'#[ \t\n]*$', line):
-					entry['comment'] = line
-			elif cre.match(r'#\.', line):
-				if entry.has_key('quote'):
-					entry['quote'] = entry['quote'] + line
-				else:
-					entry['quote'] = line
-			elif cre.match('#:', line):
-				if entry.has_key('refs'):
-					entry['refs'] = entry['refs'] + line
-				else:
-					entry['refs'] = line
-			elif cre.match('#,', line):
-				if entry.has_key('flags'):
-					entry['flags'] = entry['flags'] + line
-				else:
-					entry['flags'] = line
-			else:
-				sys.stderr.write(_('%s:%d: Unrecognised line\n%s') % (name, line_count, line))
-		elif cre.match('msgid_plural', line):
-			msgid_plural = line
-			status = 'msgid_plural'
-			msgstr = []
-		elif cre.match('msgid', line):
-			if status == 'msgstr':
-				entry['msgid'] = unquote(msgid)
-				if msgid_plural:
-					entry['msgid_plural'] = unquote(msgid_plural)
-					entry['msgstr'] = map(unquote, msgstr)
-				else:
-					entry['msgstr'] = unquote(msgstr)
-				_append(entries, entry, keys)
-				entry = {}
-			msgid_plural = ''
-			if obsolete:
-				entry['obsolete'] = 1
-			status = 'msgid'
-			msgid = line
-		elif cre.match('msgstr', line):
-			if obsolete:
-				entry['obsolete'] = 1
-			status = 'msgstr'
-			if msgid_plural:
-				msgstr.append(line)
-			else:
-				msgstr = line
-		elif cre.match(r'[ \t]*"', line):
-			if obsolete:
-				entry['obsolete'] = 1
-			if status == 'msgid':
-				msgid = msgid + line
-			elif status == 'msgid_plural':
-				msgid_plural = msgid_plural + line
-			elif status == 'msgstr':
-				if msgid_plural:
-					msgstr[-1] = msgstr[-1] + line
-				else:
-					msgstr = msgstr + line
-			else:
-				sys.stderr.write(_('%s:%d: Unrecognised line\n%s') % (name, line_count, line))
-		else:
-			sys.stderr.write(_('%s:%d: Unrecognised line\n%s') % (name, line_count, line))
-
-	if name != '-':
-		file.close()
-
-	if status == 'msgstr':
-		entry['msgid'] = unquote(msgid)
-		if msgid_plural:
-			entry['msgid_plural'] = unquote(msgid_plural)
-			entry['msgstr'] = map(unquote, msgstr)
-		else:
-			entry['msgstr'] = unquote(msgstr)
-		_append(entries, entry, keys)
-	elif status is None and entry.has_key('comment'):
-		# Allow terminating comment
-		entries.append(entry)
-
-	return entries
-
-def _append(entries, entry, keys):
-	msgid = entry['msgid']
-	if entry.has_key('obsolete'):
-		entries.append(entry)
-	else:
-		if keys.has_key(msgid):
-			old_entry = keys[msgid]
-			if old_entry['msgstr'] == entry['msgstr']:
-				for field in 'comment', 'quote', 'refs':
-					if entry.has_key(field):
-						if old_entry.has_key(field):
-							old_entry[field] = old_entry[field] + entry[field]
-						else:
-							old_entry[field] = entry[field]
-				if entry.has_key('flags'):
-					if old_entry.has_key('flags'):
-						if old_entry['flags'] != entry['flags']:
-							old_entry['flags'] = (
-								old_entry['flags'] + entry['flags'])
-					else:
-						old_entry['flags'] = entry['flags']
-			else:
-				sys.stderr.write(requote(_('Duplicate'), msgid))
-		else:
-			entries.append(entry)
-			keys[msgid] = entry
-
-def unquote(text):
-	text = cre.sub(r'^[^"]+"([^\0]*)"[^"]*\n$', r'\1', text)
-	text = cre.sub(r'"[ \t]*\\?\n(\#~)?[ \t]*"', '', text)
-	text = cre.sub(r'\\[ \t]*\n', '', text)
-
-	result = ''
-	while 1:
-		match = cre.search(r'\\([abfnrt\"\\]|[0-7]+)', text)
-		if not match:
-			break
-		result = result + text[:match.start()]
-
-		group = match.group(1)
-		if group == 'a':
-			result = result + '\a'
-		elif group == 'b':
-			result = result + '\b'
-		elif group == 'f':
-			result = result + '\f'
-		elif group == 'n':
-			result = result + '\n'
-		elif group == 'r':
-			result = result + '\r'
-		elif group == 't':
-			result = result + '\t'
-		elif group == '"':
-			result = result + '"'
-		elif group == '\\':
-			result = result + '\\'
-		else:
-			result = result + chr(string.atoi(group, 8))
-
-		text = text[match.end():]
-
-	return result + text
-
-def write(name, entries):
-	first_entry = 1
-
-	if name == '-':
-		file = sys.stdout
-	else:
-		file = open(name, 'w')
-
-	for entry in entries:
-		if first_entry:
-			first_entry = 0
-		else:
-			file.write('\n')
-		if entry.has_key('obsolete') and entry['obsolete']:
-			text = ''
-			if entry.has_key('comment'):
-				text = text + entry['comment']
-			if entry.has_key('quote'):
-				text = text + entry['quote']
-			if entry.has_key('refs'):
-				text = text + entry['refs']
-			if entry.has_key('flags'):
-				text = text + entry['flags']
-			text = text + requote('msgid', entry['msgid'])
-			msgstr = entry['msgstr']
-			if entry.has_key('msgid_plural'):
-				text = text + requote('msgid_plural', entry['msgid_plural'])
-				for i in range(len(msgstr)):
-					text = text + requote('msgstr[%d]' % i, msgstr[i])
-			else:
-				text = text + requote('msgstr', msgstr)
-			lines = string.split(text, '\n')
-			del lines[-1]
-			for text in lines:
-				if text:
-					file.write('#~ %s\n' % text)
-				else:
-					file.write('#~\n')
-		else:
-			if entry.has_key('comment'):
-				file.write(entry['comment'])
-			if not entry.has_key('msgid'):
-				continue
-			if entry.has_key('quote'):
-				file.write(entry['quote'])
-			if entry.has_key('refs'):
-				file.write(entry['refs'])
-			if entry.has_key('flags'):
-				file.write(entry['flags'])
-			file.write(requote('msgid', entry['msgid']))
-			msgstr = entry['msgstr']
-			if entry.has_key('msgid_plural'):
-				file.write(requote('msgid_plural', entry['msgid_plural']))
-				for i in range(len(msgstr)):
-					file.write(requote('msgstr[%d]' % i, msgstr[i]))
-			else:
-				file.write(requote('msgstr', msgstr))
-
-	if name != '-':
-		file.close()
-
-def requote(status, text):
-	multi = cre.search('[^\n]\n+[^\n]', text)
-
-	text = cre.sub('\\\\', r'\\\\', text)
-	text = cre.sub('"', r'\\"', text)
-	text = cre.sub('\a', r'\\a', text)
-	text = cre.sub('\b', r'\\b', text)
-	text = cre.sub('\f', r'\\f', text)
-	text = cre.sub('\t', r'\\t', text)
-	text = cre.sub('\r', r'\\r', text)
-
-	if multi:
-		text = cre.sub(r'\n', r'\\n"\n"', text)
-		text = cre.sub(r'"\n"$', '', text)
-		return '%s ""\n"%s"\n' % (status, text)
-
-	text = cre.sub(r'\n', r'\\n', text)
-	text = cre.sub(r'\t', r'\\t', text)
-	return '%s "%s"\n' % (status, text)
-
-def empty(msgstr):
-	if isinstance(msgstr, types.StringType):
-		return msgstr == ""
-	for m in msgstr:
-		if m == "":
-			return 1
-	return 0
-
-def stats(entries):
-	translated = fuzzy = untranslated = obsolete = 0
-	total_length = translated_length = 0
-	for entry in entries:
-		if entry.get('msgid'):
-			if entry.has_key('obsolete'):
-				obsolete = obsolete + 1
-			elif (entry.has_key('flags')
-				  and cre.search('fuzzy', entry['flags'])):
-				total_length = total_length + len(entry['msgid'])
-				fuzzy = fuzzy + 1
-			elif not empty(entry["msgstr"]):
-				total_length = total_length + len(entry['msgid'])
-				translated_length = translated_length + len(entry['msgid'])
-				translated = translated + 1
-			else:
-				total_length = total_length + len(entry['msgid'])
-				untranslated = untranslated + 1
-	return {'translated': translated,
-			'fuzzy': fuzzy,
-			'untranslated': untranslated,
-			'obsolete': obsolete,
-			'translated_length': translated_length,
-			'total_length': total_length}
-
-def percentage(stats):
-	if stats['total_length'] == 0:
-		return 0
-	return 100 * stats['translated_length'] / stats['total_length']
-
-# Header processing.
-
-def add_copyright(header, lines):
-	if not lines:
-		return
-	if not header['COPYRIGHT']:
-		header['COPYRIGHT'] = lines
-		return
-	if isinstance(header['COPYRIGHT'], types.StringType):
-		header['COPYRIGHT'] = [header['COPYRIGHT']]
-	for l in lines:
-		header['COPYRIGHT'].append(l[2:])
-
-def header(entries):
-	entry = entries[0]
-
-	header = { 'TITLE': '',
-			   'COPYRIGHT': '',
-			   'FIRST-AUTHOR': '',
-			   'COMMENTS': '',
-			   'FLAGS': '',
-			   'project-id-version': '',
-			   'pot-creation-date': '',
-			   'po-revision-date': '',
-			   'last-translator': '',
-			   'language-team': '',
-			   'mime-version': '',
-			   'content-type': '',
-			   'content-transfer-encoding': '',
-			   'FIELDS': '' }
-
-	if entry['msgid']:
-		return header
-
-	if entry.has_key('comment'):
-		lines = string.split(entry['comment'], '\n')
-		while lines[-1] == '' or cre.match('#[ \t]*$', lines[-1]):
-			del lines[-1]
-
-		if len(lines) > 0:
-			if not (cre.match('# .*opyright', lines[0])
-					or cre.match('# (.*) <(.*)>, .*(199[4-9]|200[0-3])',
-								 lines[0])):
-				match = cre.match('# +(.*)', lines[0])
-				if match:
-					header['TITLE'] = match.group(1)
-					del lines[0]
-
-		if len(lines) > 0:
-			match = cre.match('# +(.*opyright.*)', lines[0])
-			if match:
-				header['COPYRIGHT'] = match.group(1)
-				del lines[0]
-				while lines:
-					match = cre.match('# +(.*opyright.*)', lines[0])
-					if match:
-						add_copyright(header, lines[0])
-						del lines[0]
-					else:
-						break
-
-		# Add any lines between the copyright and the first author to
-		# the copyright
-		for lineno in range(len(lines)):
-			match = cre.match('# (.+ <.+>, .*(199[4-9]|200[0-3]|YEAR).*)',
-							  lines[lineno])
-			if match:
-				add_copyright(header, lines[:lineno])
-				header['FIRST-AUTHOR'] = match.group(1)
-				del lines[:lineno+1]
-				break
-
-		if len(lines) > 0:
-			header['COMMENTS'] = string.joinfields(lines, '\n') + '\n'
-
-	if entry.has_key('flags'):
-		header['FLAGS'] = entry['flags']
-		if header['FLAGS'][-1] == '\n':
-			header['FLAGS'] = header['FLAGS'][:-1]
-		header['FLAGS'] = cre.sub('^#, *', '', header['FLAGS'], 1)
-
-	for text in string.split(entry['msgstr'], '\n'):
-		match = cre.match('([^:]+):[ \t]+(.*)', text)
-		if match:
-			field = string.lower(match.group(1))
-			if header.has_key(field):
-				header[field] = match.group(2)
-				header[field] = cre.sub(r'[ \t]+$', '', header[field], 1)
-			else:
-				header['FIELDS'] = header['FIELDS'] + text + '\n'
-
-	return header
-
-def set_header(entries, header):
-	creation = 'pot-creation-date'
-	revision = 'po-revision-date'
-	fuzzy = 0
-	for field in _default_header.keys():
-		if not (header.has_key(field) and header[field]):
-			# A while ago, POT files did not have POT-Creation-Date.
-			# Do not fuzzy the header merely to add such a field.  Instead,
-			# and short of better, use PO-Revision-Date value if it exists.
-			if (field == creation and header.has_key(revision)
-				and header[revision] != _default_header[revision]):
-				header[creation] = header[revision]
-			else:
-				header[field] = _default_header[field]
-				if _default_header[field]:
-					fuzzy = 1
-	if fuzzy:
-		if header['FLAGS']:
-			if not cre.search('fuzzy', header['FLAGS']):
-				header['FLAGS'] = header['FLAGS'] + ', fuzzy'
-		else:
-			header['FLAGS'] = 'fuzzy'
-
-	entry = { 'msgid': '' }
-
-	if isinstance(header["COPYRIGHT"], types.ListType):
-		copyright = ""
-		for h in header["COPYRIGHT"]:
-			copyright = copyright + ('# %s\n' % h)
-	else:
-		copyright = '# %s\n' % header["COPYRIGHT"]
-
-	entry['comment'] = ('# %s\n' % header['TITLE']
-			+ copyright
-			+ '# %s\n' % header['FIRST-AUTHOR']
-			+ header['COMMENTS']
-			+ '#\n')
-
-	if header['FLAGS']:
-		entry['flags'] = '#, %s\n' % header['FLAGS']
-
-	text = ''
-	for field in _default_order:
-		text = text + '%s: %s\n' % (field, header[string.lower(field)])
-	text = text + header['FIELDS']
-	entry['msgstr'] = text
-
-	if entries[0]['msgid']:
-		entries.insert(0, entry)
-	else:
-		entries[0] = entry
-
-def decfunc(header):
-	retval = lambda x:(x,len(x))
-	match = re.match('text/plain; charset=(.*)', header['content-type'])
-	if not match:
-		retval
-	charset = match.group(1)
-	import codecs
-	try:
-		retval = codecs.lookup(charset)[1]
-	except (LookupError,ValueError):
-		pass
-	return retval
-
-def last_translator(header):
-	d = decfunc(header)
-	text = header['last-translator']
-	match = re.match('(.*?)( +)<(.+)>$', text)
-	if match:
-		last_translator, last_address = match.group(1, 3)
-		last_translator = d(last_translator)[0] # ignore len
-		return last_translator, last_address
-	return header['last-translator'], None
diff --git a/scripts/po/po-count.py b/scripts/po/po-count.py
deleted file mode 100644
index dc920ba65..000000000
--- a/scripts/po/po-count.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-# Modified for KVIrc by Elvio Basello <hellvis69 at netsons dot org> 2008
-# Copyright (C) 1998, 1999, 2000 Progiciels Bourbeau-Pinard inc.
-# Francois Pinard <pinard@iro.umontreal.ca>, 1998.
-
-"""\
-Count entries of various types in a PO file.
-
-Usage: po-count [FILE]...
-"""
-
-import os, sys
-sys.path.insert(0, os.path.expanduser('./'))
-
-import libpo
-
-def main(*arguments):
-	write = sys.stdout.write
-	if len(arguments) == 0:
-		write('%s\n' % numbers(libpo.stats(libpo.read('-'))))
-	else:
-		for file in arguments:
-			write('File: %s\n%s\n' % (file,numbers(libpo.stats(libpo.read(file)))))
-
-def numbers(stats):
-	return 'Translated: %d\nFuzzy: %d\nObsolete: %d\nPercentage: %d' % (stats['translated'],stats['fuzzy'] + stats['untranslated'],stats['obsolete'],libpo.percentage(stats))
-
-if __name__ == '__main__':
-	apply(main, tuple(sys.argv[1:]))
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index 0897344db..f36dd007f 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -210,6 +210,7 @@ public slots:
 class KVIRC_API KviFileSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
+	Q_PROPERTY(QString file READ file WRITE setFile)
 public:
 	KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags = 0,const QString &szFilter = QString());
 	~KviFileSelector(){};
@@ -226,6 +227,8 @@ protected:
 	unsigned int  m_uFlags;
 	QString       m_szFilter;
 public:
+	QString file(){ return *m_pOption; };
+	void setFile(QString & szFile){ *m_pOption = szFile; };
 	virtual void commit();
 	void setSelection(const QString &szSelection);
 signals:
@@ -241,9 +244,13 @@ protected:
 class KVIRC_API KviDirectorySelector : public KviFileSelector
 {
 	Q_OBJECT
+	Q_PROPERTY(QString dir READ dir WRITE setDir)
 public:
 	KviDirectorySelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled);
 	~KviDirectorySelector(){};
+public:
+	QString dir(){ return *m_pOption; };
+	void setDir(QString szDir){ *m_pOption = szDir; };
 protected:
 	virtual void select();
 };
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
 };
 
 /**