Release-1.5.7.1-20081206

56 files changed, 8194 insertions, 4300 deletions

diff --git a/INSTALL b/INSTALL
index 200fdc0..e9d896b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
-DOXYGEN Version 1.5.7.1-20081103
+DOXYGEN Version 1.5.7.1-20081206
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (03 November 2008)
+Dimitri van Heesch (06 December 2008)
diff --git a/Makefile.in b/Makefile.in
index 11e4cbc..618fb05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,12 +41,7 @@ distclean: clean
 	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
 	-rm -f src/version.cpp
 	-rm -r addon/doxywizard/Makefile
-	-rm -f addon/doxywizard/Makefile.doxywizard
 	-rm -f addon/doxywizard/doxywizard.pro
-	-rm -f addon/doxywizard/moc/moc_*
-	-rm -f addon/doxywizard/config.cpp
-	-rm -f addon/doxywizard/lib
-	-rm -f addon/doxywizard/objects
 	-rm -f VERSION
 	-rm -f packages/rpm/doxygen.spec
 
diff --git a/README b/README
index b58cd7b..3dc06f4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.5.7.1_20081103
+DOXYGEN Version 1.5.7.1_20081206
 
 Please read INSTALL for compilation instructions.
 
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (03 November 2008)
+Dimitri van Heesch (dimitri@stack.nl) (06 December 2008)
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index 3861d09..fa459c2 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -10,38 +10,23 @@
 # See the GNU General Public License for more details.
 # 
 
-all: version.cpp config.h config.l portable.h portable.cpp Makefile.doxywizard  
-	$(MAKE) -f Makefile.doxywizard QTDIR=$(QTDIR) $@
+QMAKE = qmake
 
-version.cpp: ../../src/version.cpp
-	$(CP) ../../src/version.cpp version.cpp
+all: Makefile.doxywizard  
+	$(MAKE) -f Makefile.doxywizard 
 
-portable.cpp: ../../src/portable.cpp
-	$(CP) ../../src/portable.cpp portable.cpp
+Makefile.doxywizard: doxywizard.pro
+	$(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
 
-portable.h: ../../src/portable.h
-	$(CP) ../../src/portable.h portable.h
-
-config.h: ../../src/config.h
-	$(CP) ../../src/config.h config.h
-
-config.l: ../../src/config.l
-	$(CP) ../../src/config.l config.l
-
-Makefile.doxywizard: doxywizard.pro 
-	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
-
-tmake: 
-	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
+qmake: 
+	$(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
 
 clean: Makefile.doxywizard 
 	$(MAKE) -f Makefile.doxywizard clean 
-	$(RM) config.cpp 
-
-distclean: clean
-	$(RM) Makefile.doxywizard version.cpp config.l config.h portable.h portable.cpp
 
-MAN1DIR = man/man1
+distclean: Makefile.doxywizard
+	$(MAKE) -f Makefile.doxywizard distclean 
+	$(RM) Makefile.doxywizard
 
 install:
 	$(INSTTOOL) -d $(INSTALL)/bin	
diff --git a/addon/doxywizard/Makefile.win_nmake.in b/addon/doxywizard/Makefile.win_nmake.in
deleted file mode 100644
index e4b6c99..0000000
--- a/addon/doxywizard/Makefile.win_nmake.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
-# 
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby 
-# granted. No representations are made about the suitability of this software 
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-# 
-
-all: config.h config.l unistd.h Makefile.doxywizard  
-	$(MAKE) -f Makefile.doxywizard $@
-
-unistd.h: ..\..\src\unistd.h
-	$(CP) ..\..\src\unistd.h unistd.h
-
-config.h: ..\..\src\config.l
-	$(CP) ..\..\src\config.h config.h
-
-config.l: ..\..\src\config.l
-	$(CP) ..\..\src\config.l config.l
-
-version.cpp: ..\..\src\version.cpp
-	$(CP) ..\..\src\version.cpp version.cpp
-
-Makefile.doxywizard: doxywizard.pro 
-	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
-
-tmake: 
-	$(ENV) $(PERL) $(TMAKE) doxywizard.pro >Makefile.doxywizard
-
-clean: Makefile.doxywizard 
-	$(MAKE) -f Makefile.doxywizard clean 
-	$(RM) config.cpp
-
-distclean: clean
-	$(RM) Makefile.doxywizard config.l config.h
-
-FORCE:
diff --git a/addon/doxywizard/README b/addon/doxywizard/README
index fc9c5aa..57705f0 100644
--- a/addon/doxywizard/README
+++ b/addon/doxywizard/README
@@ -1,3 +1,3 @@
 Doxywizard is a graphical front-end to read/edit/write doxygen configuration 
-files. It requires Qt version 3.x or higher.
+files and to launch doxygen. It requires Qt version 4.3 or higher.
 
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 160ba9c..6d88624 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -1,1415 +1,595 @@
-#include <qlabel.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qlineedit.h>
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qcombobox.h>
-#include <qfiledialog.h>
-#include <qmessagebox.h>
-#include <qtextedit.h>
-#include <qprocess.h>
-#include <qtimer.h>
-#include <qstatusbar.h>
-#include <qfileinfo.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qtooltip.h>
-
-#include <stdlib.h>
-
-#if defined(Q_OS_MACX)
-#include <CoreFoundation/CFBundle.h>
-#include <ApplicationServices/ApplicationServices.h>
-#undef check
-#endif
-
+#include <QtGui>
 #include "doxywizard.h"
-#include "expert.h"
-#include "config.h"
 #include "version.h"
+#include "expert.h"
+#include "wizard.h"
 
 const int messageTimeout = 5000; //!< status bar message timeout in millisec.
 
-#if defined(Q_OS_MACX)
-QCString getResourcePath()
-{
-  // todo: use qApp->applicationDirPath()
-  QCString result;
-  CFURLRef pluginRef  = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-  CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef, kCFURLPOSIXPathStyle);
-  result = CFStringGetCStringPtr(macPath, CFStringGetSystemEncoding());
-  result+="/Contents/Resources/";
-  return result;
-}
-
-void setDotPath()
-{
-  // TODO: enable this if we ship dot with doxygen again...
-//  Config_getString("DOT_PATH")=getResourcePath();
-}
-
-bool setMscgenPath()
-{
-  if (Config_getString("MSCGEN_PATH")!=getResourcePath())
-  {
-    Config_getString("MSCGEN_PATH")=getResourcePath();
-    return TRUE;
-  }
-  return FALSE;
-}
+MainWindow &MainWindow::instance()
+{
+  static MainWindow theInstance;
+  return theInstance;
+}
+
+MainWindow::MainWindow()
+  : m_settings(QString::fromAscii("Doxygen.org"), QString::fromAscii("Doxywizard"))
+{
+  QMenu *file = menuBar()->addMenu(tr("File"));
+  file->addAction(tr("Open..."), 
+                  this, SLOT(openConfig()), Qt::CTRL+Qt::Key_O);
+  m_recentMenu = file->addMenu(tr("Open recent"));
+  file->addAction(tr("Save"), 
+                  this, SLOT(saveConfig()), Qt::CTRL+Qt::Key_S);
+  file->addAction(tr("Save as..."), 
+                  this, SLOT(saveConfigAs()), Qt::SHIFT+Qt::CTRL+Qt::Key_S);
+  file->addAction(tr("Quit"),  
+                  this, SLOT(quit()), Qt::CTRL+Qt::Key_Q);
+
+  QMenu *settings = menuBar()->addMenu(tr("Settings"));
+  settings->addAction(tr("Reset to factory defaults"),
+                  this,SLOT(resetToDefaults()));
+  settings->addAction(tr("Use current settings at startup"),
+                  this,SLOT(makeDefaults()));
+
+  QMenu *help = menuBar()->addMenu(tr("Help"));
+  help->addAction(tr("Online manual"), 
+                  this, SLOT(manual()), Qt::Key_F1);
+  help->addAction(tr("About"), 
+                  this, SLOT(about()) );
+
+  m_expert = new Expert;
+  m_wizard = new Wizard(m_expert->modelData());
+
+  // ----------- top part ------------------
+  QWidget *topPart = new QWidget;
+  QVBoxLayout *rowLayout = new QVBoxLayout(topPart);
+
+  // select working directory
+  QHBoxLayout *dirLayout = new QHBoxLayout;
+  m_workingDir = new QLineEdit;
+  m_selWorkingDir = new QPushButton(tr("Select..."));
+  dirLayout->addWidget(m_workingDir);
+  dirLayout->addWidget(m_selWorkingDir);
+
+  //------------- bottom part --------------
+  QWidget *runTab = new QWidget;
+  QVBoxLayout *runTabLayout = new QVBoxLayout(runTab);
+
+  // run doxygen
+  QHBoxLayout *runLayout = new QHBoxLayout;
+  m_run = new QPushButton(tr("Run doxygen"));
+  m_run->setEnabled(false);
+  m_runStatus = new QLabel(tr("Status: not running"));
+  m_saveLog = new QPushButton(tr("Save log..."));
+  m_saveLog->setEnabled(false);
+  QPushButton *showSettings = new QPushButton(tr("Show configuration"));
+  runLayout->addWidget(m_run);
+  runLayout->addWidget(m_runStatus);
+  runLayout->addStretch(1);
+  runLayout->addWidget(showSettings);
+  runLayout->addWidget(m_saveLog);
+
+  // output produced by doxygen
+  runTabLayout->addLayout(runLayout);
+  runTabLayout->addWidget(new QLabel(tr("Output produced by doxygen")));
+  QGridLayout *grid = new QGridLayout;
+  m_outputLog = new QTextEdit;
+  m_outputLog->setReadOnly(true);
+  m_outputLog->setFontFamily(QString::fromAscii("courier"));
+  m_outputLog->setMinimumWidth(600);
+  grid->addWidget(m_outputLog,0,0);
+  grid->setColumnStretch(0,1);
+  grid->setRowStretch(0,1);
+  QHBoxLayout *launchLayout = new QHBoxLayout;
+  m_launchHtml = new QPushButton(tr("Show HTML output"));
+  launchLayout->addWidget(m_launchHtml);
 
+#if 0
+  m_launchPdf  = new QPushButton(tr("Show PDF output"));
+  launchLayout->addWidget(m_launchPdf);
 #endif
+  launchLayout->addStretch(1);
+  grid->addLayout(launchLayout,1,0);
+  runTabLayout->addLayout(grid);
 
+  QTabWidget *tabs = new QTabWidget;
+  tabs->addTab(m_wizard,tr("Wizard"));
+  tabs->addTab(m_expert,tr("Expert"));
+  tabs->addTab(runTab,tr("Run"));
 
-//==========================================================================
-
-Step1::Step1(QWidget *parent) : QWidget(parent,"Step1") 
-{
-  QVBoxLayout *layout = new QVBoxLayout(this);
-  layout->setMargin(4);
-  layout->setSpacing(8);
-  layout->addWidget(new QLabel( "Provide some information "
-              "about the project you are documenting",this));
-  QWidget *w      = new QWidget( this );
-  QHBoxLayout *bl = new QHBoxLayout(w,10);
-
-  QVBox *col1      = new QVBox( w );
-  col1->setSpacing(8);
-  (new QLabel("Project name:",col1))->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-  (new QLabel("Project version or id:",col1))->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-
-  QVBox *col2      = new QVBox( w );
-  col2->setSpacing(8);
-  m_projName = new QLineEdit(col2);
-  m_projNumber = new QLineEdit(col2);
+  rowLayout->addWidget(new QLabel(tr("Step 1: Specify the working directory from which doxygen will run")));
+  rowLayout->addLayout(dirLayout);
+  rowLayout->addWidget(new QLabel(tr("Step 2: Configure doxygen using the Wizard and/or Expert tab, then switch to the Run tab to generate the documentation")));
+  rowLayout->addWidget(tabs);
 
-  bl->addWidget(col1);
-  bl->addWidget(col2);
+  setCentralWidget(topPart);
+  statusBar()->showMessage(tr("Welcome to Doxygen"),messageTimeout);
+  loadSettings();
 
-  layout->addWidget(w);
-
-  //---------------------------------------------------
-  QFrame *f = new QFrame( this );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  layout->addWidget(f);
-  
-  layout->addWidget(new QLabel( "Specify the directory to "
-              "scan for source code", this));
-  QHBox *row = new QHBox( this );
-  row->setSpacing(10);
-  new QLabel("Source code directory:",row);
-  m_sourceDir = new QLineEdit(row);
-  m_srcSelectDir = new QPushButton("Select...",row);
-  layout->addWidget(row);
-
-  m_recursive = new QCheckBox("Scan recursively",this);
-  m_recursive->setChecked(TRUE);
-  layout->addWidget(m_recursive);
-
-  //---------------------------------------------------
-  f = new QFrame( this );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  layout->addWidget(f);
-
-  layout->addWidget(new QLabel(
-              "Specify the directory where doxygen should "
-              "put the generated documentation",this
-            ));
-  row = new QHBox( this );
-  row->setSpacing(10);
-  new QLabel("Destination directory:",row);
-  m_destDir = new QLineEdit(row);
-  m_dstSelectDir = new QPushButton("Select...",row);
-  layout->addWidget(row);
-  layout->addStretch(1);
-
-  connect(m_srcSelectDir,SIGNAL(clicked()),
-          this,SLOT(selectSourceDir()));
-  connect(m_dstSelectDir,SIGNAL(clicked()),
-          this,SLOT(selectDestinationDir()));
-}
-
-void Step1::selectSourceDir()
-{
-  m_sourceDir->setText(QFileDialog::getExistingDirectory(m_sourceDir->text(),this));
-}
-
-void Step1::selectDestinationDir()
-{
-  m_destDir->setText(QFileDialog::getExistingDirectory(m_destDir->text(),this));
-}
-
-QString Step1::getProjectName() const 
-{ 
-  return m_projName->text(); 
-}
-
-QString Step1::getProjectNumber() const 
-{ 
-  return m_projNumber->text(); 
-}
-
-QString Step1::getSourceDir() const
-{
-  return m_sourceDir->text();
-}
-
-bool Step1::scanRecursively() const
-{
-  return m_recursive->isChecked();
-}
-
-QString Step1::getDestinationDir() const
-{
-  return m_destDir->text();
-}
-
-void Step1::setProjectName(const QString &name)
-{
-  m_projName->setText(name);
-}
-
-void Step1::setProjectNumber(const QString &num)
-{
-  m_projNumber->setText(num);
-}
-
-void Step1::setSourceDir(const QString &dir)
-{
-  m_sourceDir->setText(dir);
-}
-
-void Step1::setRecursiveScan(bool enable)
-{
-  m_recursive->setChecked(enable);
-}
-
-void Step1::setDestinationDir(const QString &dir)
-{
-  m_destDir->setText(dir);
-}
-
-
-//==========================================================================
-
-Step2::Step2(QWidget *parent) : QWidget(parent,"Step2") 
-{
-  QVBoxLayout *layout = new QVBoxLayout(this);
-  layout->setSpacing(8);
-
-  m_extractMode = new QButtonGroup("Select the desired extraction mode:",this);
-  QGridLayout *gbox = new QGridLayout( m_extractMode, 4, 1, 8, 0 );
-  gbox->addRowSpacing( 0, fontMetrics().lineSpacing()+2 );
-  gbox->addWidget(new QRadioButton("Documented entities only",m_extractMode),1,0);
-  gbox->addWidget(new QRadioButton("All entities",m_extractMode),2,0);
-  gbox->addWidget(m_crossRef = new QCheckBox("Include cross-referenced source code in the output",m_extractMode),3,0);
-  m_extractMode->setButton(0);
-  layout->addWidget(m_extractMode);
-  
-  //---------------------------------------------------
-  QFrame *f = new QFrame( this );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  layout->addWidget(f);
-
-  m_optimizeLang = new QButtonGroup("Select programming language to optimize the results for",this);
-  gbox = new QGridLayout( m_optimizeLang, 5, 1, 8, 0 );
-  gbox->addRowSpacing( 0, fontMetrics().lineSpacing()+2 );
-  gbox->addWidget(new QRadioButton("Optimize for C++ output",m_optimizeLang),1,0);
-  gbox->addWidget(new QRadioButton("Optimize for Java output",m_optimizeLang),2,0);
-  gbox->addWidget(new QRadioButton("Optimize for C output",m_optimizeLang),3,0);
-  gbox->addWidget(new QRadioButton("Optimize for C# output",m_optimizeLang),4,0);
-  m_optimizeLang->setButton(0);
-  layout->addWidget(m_optimizeLang);
-
-  layout->addStretch(1);
-}
+  m_runProcess = new QProcess;
+  m_running = false;
+  m_timer = new QTimer;
+  updateLaunchButtonState();
+  m_modified = false;
+  updateTitle();
 
-bool Step2::crossReferencingEnabled() const
-{
-  //printf("Step2::crossReferencingEnabled()=%d\n",m_crossRef->isOn());
-  return m_crossRef->isOn();
+  // connect signals and slots
+  connect(tabs,SIGNAL(currentChanged(int)),SLOT(selectTab(int)));
+  connect(m_selWorkingDir,SIGNAL(clicked()),SLOT(selectWorkingDir()));
+  connect(m_recentMenu,SIGNAL(triggered(QAction*)),SLOT(openRecent(QAction*)));
+  connect(m_workingDir,SIGNAL(returnPressed()),SLOT(updateWorkingDir()));
+  connect(m_runProcess,SIGNAL(readyReadStandardOutput()),SLOT(readStdout()));
+  connect(m_runProcess,SIGNAL(finished(int, QProcess::ExitStatus)),SLOT(runComplete()));
+  connect(m_timer,SIGNAL(timeout()),SLOT(readStdout()));
+  connect(m_run,SIGNAL(clicked()),SLOT(runDoxygen()));
+  connect(m_launchHtml,SIGNAL(clicked()),SLOT(showHtmlOutput()));
+  connect(m_saveLog,SIGNAL(clicked()),SLOT(saveLog()));
+  connect(showSettings,SIGNAL(clicked()),SLOT(showSettings()));
+  connect(m_expert,SIGNAL(changed()),SLOT(configChanged()));
 }
 
-void Step2::enableCrossReferencing()
+void MainWindow::closeEvent(QCloseEvent *event)
 {
-  //printf("Step2::enableCrossReferencing()\n");
-  m_crossRef->setChecked(TRUE);
+  if (discardUnsavedChanges())
+  {
+    saveSettings();
+    event->accept();
+  }
+  else
+  {
+    event->ignore();
+  }
 }
 
-bool Step2::extractAll() const
+void MainWindow::quit()
 {
-  //printf("Step2::extractAll()=%d\n",m_extractMode->find(1)->isOn());
-  return m_extractMode->find(1)->isOn();
+  if (discardUnsavedChanges())
+  {
+    saveSettings();
+  }
+  QApplication::exit(0);
 }
 
-bool Step2::crossReferencing() const
+void MainWindow::setWorkingDir(const QString &dirName)
 {
-  return m_crossRef->isChecked();
+    QDir::setCurrent(dirName);
+    m_workingDir->setText(dirName);
+    m_run->setEnabled(!dirName.isEmpty());
 }
 
-OptLang Step2::optimizeFor() const
+void MainWindow::selectWorkingDir()
 {
-  switch (m_optimizeLang->selectedId())
+  QString dirName = QFileDialog::getExistingDirectory(this,
+        tr("Select working directory"),m_workingDir->text());
+  if (!dirName.isEmpty())
   {
-    case 0:  return Lang_Cpp;
-    case 1:  return Lang_Java;
-    case 2:  return Lang_C;
-    case 3:  return Lang_CS;
+    setWorkingDir(dirName);
   }
-  return Lang_Cpp;
-}
-
-void Step2::setExtractAll(bool enable)
-{
-  //printf("Step2::setExtractAll(%d)\n",enable);
-  m_extractMode->setButton(enable?1:0);
 }
 
-void Step2::setCrossReferencing(bool enable)
+void MainWindow::updateWorkingDir()
 {
-  //printf("Step2::setCrossReferencing(%d)\n",enable);
-  m_crossRef->setChecked(enable);
+  setWorkingDir(m_workingDir->text());
 }
 
-void Step2::setOptimizeFor(OptLang lang)
+void MainWindow::manual()
 {
-  switch (lang)
-  {
-    case Lang_Cpp:  m_optimizeLang->setButton(0); break;
-    case Lang_Java: m_optimizeLang->setButton(1); break;
-    case Lang_C:    m_optimizeLang->setButton(2); break;
-    case Lang_CS:   m_optimizeLang->setButton(3); break;
-  }
+  QDesktopServices::openUrl(QUrl(QString::fromAscii("http://www.doxygen.org/manual.html")));
 }
 
-//==========================================================================
-
-Step3::Step3(QWidget *parent) : QWidget(parent,"Step3") 
+void MainWindow::about()
 {
-  QVBoxLayout *layout = new QVBoxLayout(this);
-  QButtonGroup *bg = new QButtonGroup("Output format(s) to generate",this);
-  QGridLayout *gbox = new QGridLayout( bg, 8, 1, 8, 0 );
-  gbox->addRowSpacing( 0, fontMetrics().lineSpacing()+2 );
-  gbox->addWidget(m_htmlEnabled=new QCheckBox("HTML",bg),1,0);
-  QWidget *w = new QWidget(bg);
-  QHBoxLayout *bl = new QHBoxLayout(w);
-    m_htmlOptions = new QButtonGroup(w);
-    m_htmlOptions->hide();
-    m_htmlOptionBox = new QVBox(w);
-    m_htmlOptions->insert(new QRadioButton("plain HTML",m_htmlOptionBox));
-    m_htmlOptions->insert(new QRadioButton("with frames and a navigation tree",m_htmlOptionBox));
-    m_htmlOptions->insert(new QRadioButton("prepare for compressed HTML (.chm)",m_htmlOptionBox));
-    m_htmlOptions->insert(m_searchEnabled=new QCheckBox("With search function (requires PHP enabled web server)",m_htmlOptionBox));
-    bl->addSpacing(30);
-    bl->addWidget(m_htmlOptionBox);
-    m_htmlOptions->setButton(0);
-    m_htmlOptionBox->setEnabled(TRUE);
-  gbox->addWidget(w,2,0);
-
-  gbox->addWidget(m_latexEnabled=new QCheckBox("LaTeX",bg),3,0);
-  w = new QWidget(bg);
-  bl = new QHBoxLayout(w);
-    m_texOptions = new QButtonGroup(w);
-    m_texOptions->hide();
-    m_texOptionBox = new QVBox(w);
-    m_texOptions->insert(new QRadioButton("as intermediate format for hyperlinked PDF",m_texOptionBox));
-    m_texOptions->insert(new QRadioButton("as intermediate format for PDF",m_texOptionBox));
-    m_texOptions->insert(new QRadioButton("as intermediate format for PostScript",m_texOptionBox));
-    bl->addSpacing(30);
-    bl->addWidget(m_texOptionBox);
-    m_texOptions->setButton(0);
-    m_texOptionBox->setEnabled(FALSE);
-  gbox->addWidget(w,4,0);
-
-  gbox->addWidget(m_manEnabled=new QCheckBox("Man pages",bg),5,0);
-  gbox->addWidget(m_rtfEnabled=new QCheckBox("Rich Text Format (RTF)",bg),6,0);
-  gbox->addWidget(m_xmlEnabled=new QCheckBox("XML",bg),7,0);
-  bg->setButton(0);
-  layout->addWidget(bg);
-
-  layout->addStretch(1);
-
-  connect(m_latexEnabled,SIGNAL(stateChanged(int)),
-          this,SLOT(latexStateChange(int)));
-  connect(m_htmlEnabled,SIGNAL(stateChanged(int)),
-          this,SLOT(htmlStateChange(int)));
+  QString msg;
+  QTextStream t(&msg,QIODevice::WriteOnly);
+  t << QString::fromAscii("<qt><center>A tool to configure and run doxygen version ")+
+       QString::fromAscii(versionString)+
+       QString::fromAscii(" on your source files.</center><p><br>"
+       "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2008</center><p>"
+       "</qt>");
+  QMessageBox::about(this,tr("Doxygen GUI"),msg);
 }
 
-void Step3::latexStateChange(int state)
+void MainWindow::openConfig()
 {
-  if (state==QButton::On)
-  {
-    m_texOptionBox->setEnabled(TRUE);
-  }
-  else if (state==QButton::Off)
+  if (discardUnsavedChanges(false))
   {
-    m_texOptionBox->setEnabled(FALSE);
+    QString fn = QFileDialog::getOpenFileName(this,
+        tr("Open configuration file"),
+        m_workingDir->text());
+    if (!fn.isEmpty())
+    {
+      loadConfigFromFile(fn);
+    }
   }
 }
 
-void Step3::htmlStateChange(int state)
+void MainWindow::updateConfigFileName(const QString &fileName)
 {
-  if (state==QButton::On)
-  {
-    m_htmlOptionBox->setEnabled(TRUE);
-  }
-  else if (state==QButton::Off)
+  if (m_fileName!=fileName)
   {
-    m_htmlOptionBox->setEnabled(FALSE);
+    m_fileName = fileName;
+    QString curPath = QFileInfo(fileName).path();
+    setWorkingDir(curPath);
+    addRecentFile(fileName);
+    updateTitle();
   }
 }
 
-bool Step3::htmlEnabled() const
-{
-  return m_htmlEnabled->isChecked();
-}
-
-bool Step3::latexEnabled() const
+void MainWindow::loadConfigFromFile(const QString & fileName)
 {
-  return m_latexEnabled->isChecked();
+  m_expert->loadConfig(fileName);
+  m_wizard->refresh();
+  updateConfigFileName(fileName);
+  updateLaunchButtonState();
+  m_modified = false;
+  updateTitle();
 }
 
-bool Step3::manEnabled() const
+void MainWindow::saveConfig(const QString &fileName)
 {
-  return m_manEnabled->isChecked();
+  if (fileName.isEmpty()) return;
+  QFile f(fileName);
+  if (!f.open(QIODevice::WriteOnly)) return;
+  QTextStream t(&f);
+  m_expert->writeConfig(t,false);
+  updateConfigFileName(fileName);
+  m_modified = false;
+  updateTitle();
 }
 
-bool Step3::rtfEnabled() const
+bool MainWindow::saveConfig()
 {
-  return m_rtfEnabled->isChecked();
-}
-
-bool Step3::xmlEnabled() const
-{
-  return m_xmlEnabled->isChecked();
-}
-
-bool Step3::searchEnabled() const   
-{ 
-  return m_searchEnabled->isChecked();   
-}
-
-HtmlStyle Step3::htmlStyle() const   
-{ 
-  if (m_htmlOptions->find(0)->isOn())
-  {
-    return HS_Plain;
-  }
-  else if (m_htmlOptions->find(1)->isOn())
+  if (m_fileName.isEmpty())
   {
-    return HS_TreeView;
+    return saveConfigAs();
   }
-  else if (m_htmlOptions->find(2)->isOn())
-  {
-    return HS_CHM;
-  }
-  // broken radio button logic
-  return HS_Plain;
-}
-
-TexStyle Step3::texStyle() const   
-{ 
-  switch (m_texOptions->selectedId())
+  else
   {
-    case 0: return TS_PDFHyper;
-    case 1: return TS_PDF;
-    case 2: return TS_PS;
+    saveConfig(m_fileName);
+    return true;
   }
-  return TS_PDFHyper;
-}
-
-void Step3::setHtmlEnabled(bool enable)
-{
-  m_htmlEnabled->setChecked(enable);
-}
-
-void Step3::setLatexEnabled(bool enable)
-{
-  m_latexEnabled->setChecked(enable);
 }
 
-void Step3::setManEnabled(bool enable)
+bool MainWindow::saveConfigAs()
 {
-  m_manEnabled->setChecked(enable);
+  QString fileName = QFileDialog::getSaveFileName(this, QString(), 
+             m_workingDir->text()+QString::fromAscii("/Doxyfile"));
+  if (fileName.isEmpty()) return false;
+  saveConfig(fileName);
+  return true;
 }
 
-void Step3::setRtfEnabled(bool enable)
+void MainWindow::makeDefaults()
 {
-  m_rtfEnabled->setChecked(enable);
-}
-
-void Step3::setXmlEnabled(bool enable)
-{
-  m_xmlEnabled->setChecked(enable);
-}
-
-void Step3::setSearchEnabled(bool enable)
-{
-  m_searchEnabled->setChecked(enable);
-}
-
-void Step3::setHtmlStyle(HtmlStyle style)
-{
-  switch(style)
+  if (QMessageBox::question(this,tr("Use current setting at startup?"),
+                        tr("Do you want to save the current settings "
+                           "and use them next time Doxywizard starts?"),
+                        QMessageBox::Save|
+                        QMessageBox::Cancel)==QMessageBox::Save)
   {
-    case HS_Plain:    m_htmlOptions->setButton(0); break;
-    case HS_TreeView: m_htmlOptions->setButton(1); break;
-    case HS_CHM:      m_htmlOptions->setButton(2); break;
+    //printf("MainWindow:makeDefaults()\n");
+    m_expert->saveSettings(&m_settings);
+    m_settings.setValue(QString::fromAscii("wizard/loadsettings"), true);
   }
 }
 
-void Step3::setTexStyle(TexStyle style)
+void MainWindow::resetToDefaults()
 {
-  switch(style)
+  if (QMessageBox::question(this,tr("Reset settings to their default values?"),
+                        tr("Do you want to revert all settings back "
+                           "to their original values?"),
+                        QMessageBox::Reset|
+                        QMessageBox::Cancel)==QMessageBox::Reset)
   {
-    case TS_PDFHyper: m_texOptions->setButton(0); break;
-    case TS_PDF:      m_texOptions->setButton(1); break;
-    case TS_PS:       m_texOptions->setButton(2); break;
+    //printf("MainWindow:resetToDefaults()\n");
+    m_expert->resetToDefaults();
+    m_settings.setValue(QString::fromAscii("wizard/loadsettings"), false);
+    m_wizard->refresh();
   }
 }
 
-
-//==========================================================================
-
-Step4::Step4(QWidget *parent) : QWidget(parent,"Step4") 
+void MainWindow::loadSettings()
 {
-  QVBoxLayout *layout = new QVBoxLayout(this);
-  m_diagramMode = new QButtonGroup("Diagrams to generate",this);
-  QGridLayout *gbox = new QGridLayout( m_diagramMode, 5, 1, 8, 0 );
-  gbox->addRowSpacing( 0, fontMetrics().lineSpacing()+2 );
-  gbox->addWidget(new QRadioButton("No diagrams",m_diagramMode),1,0);
-  gbox->addWidget(new QRadioButton("Use built-in class diagram generator",m_diagramMode),2,0);
-  gbox->addWidget(new QRadioButton("Use dot tool from the GraphViz package to generate",m_diagramMode),3,0);
-  QWidget *w = new QWidget(m_diagramMode);
-  QHBoxLayout *bl = new QHBoxLayout(w);
-    QButtonGroup *dotGroup = new QButtonGroup(w);
-    dotGroup->hide();
-    m_dotOptions = new QVBox(w);
-    dotGroup->insert(m_dotClass=new QCheckBox("Class diagrams",m_dotOptions));
-    dotGroup->insert(m_dotCollaboration=new QCheckBox("Collaboration diagrams",m_dotOptions));
-    dotGroup->insert(m_dotInclude=new QCheckBox("Include dependency graphs",m_dotOptions));
-    dotGroup->insert(m_dotIncludedBy=new QCheckBox("Included by dependency graphs",m_dotOptions));
-    dotGroup->insert(m_dotInheritance=new QCheckBox("Overall Class hierarchy",m_dotOptions));
-    dotGroup->insert(m_dotCall=new QCheckBox("Call graphs",m_dotOptions));
-    bl->addSpacing(30);
-    bl->addWidget(m_dotOptions);
-    dotGroup->setButton(0);
-    m_dotOptions->setEnabled(FALSE);
-  gbox->addWidget(w,4,0);
+  QVariant geometry     = m_settings.value(QString::fromAscii("main/geometry"), QVariant::Invalid);
+  QVariant state        = m_settings.value(QString::fromAscii("main/state"),    QVariant::Invalid);
+  QVariant expState     = m_settings.value(QString::fromAscii("expert/state"),  QVariant::Invalid);
+  QVariant expState2    = m_settings.value(QString::fromAscii("expert/state2"), QVariant::Invalid);
+  QVariant wizState     = m_settings.value(QString::fromAscii("wizard/state"),  QVariant::Invalid);
+  QVariant loadSettings = m_settings.value(QString::fromAscii("wizard/loadsettings"),  QVariant::Invalid);
+  //QVariant workingDir   = m_settings.value(QString::fromAscii("main/defdir"),   QVariant::Invalid);
 
-//#if defined(Q_OS_MACX) // we bundle dot with the mac package
-//  m_diagramMode->setButton(2);
-//#else
-  m_diagramMode->setButton(1);
-//#endif
-  layout->addWidget(m_diagramMode);
-  layout->addStretch(1);
-
-  connect(m_diagramMode,SIGNAL(clicked(int)),
-          this,SLOT(diagramModeChanged(int)));
-  //connect(m_dotCall,SIGNAL(stateChanged(int)),
-  //        parent,SLOT(changeCallGraphState(int)));
-}
-
-void Step4::diagramModeChanged(int buttonId)
-{
-  m_dotOptions->setEnabled(buttonId==2);
-}
-
-//void Step4::disableCallGraphs()
-//{
-//  m_dotCall->setChecked(FALSE);
-//}
-
-//bool Step4::callGraphEnabled() const
-//{
-//  return m_dotCall->isOn();
-//}
-
-DiagramMode Step4::diagramMode() const
-{
-  switch(m_diagramMode->selectedId())
+  if (geometry  !=QVariant::Invalid) restoreGeometry(geometry.toByteArray());
+  if (state     !=QVariant::Invalid) restoreState   (state.toByteArray());
+  if (expState  !=QVariant::Invalid) m_expert->restoreState(expState.toByteArray());
+  if (expState2 !=QVariant::Invalid) m_expert->restoreInnerState(expState2.toByteArray());
+  if (wizState  !=QVariant::Invalid) m_wizard->restoreState(wizState.toByteArray());
+  //if (workingDir!=QVariant::Invalid) 
+  //{ 
+  //  QString dir = workingDir.toString();
+  //  m_workingDir->setText(dir);
+  //  QDir::setCurrent(dir);
+  //  m_run->setEnabled(!dir.isEmpty());
+  //}
+  if (loadSettings!=QVariant::Invalid && loadSettings.toBool())
   {
-    case 0: return DM_None;
-    case 1: return DM_Builtin;
-    case 2: return DM_Dot;
+    m_expert->loadSettings(&m_settings);
   }
-  return DM_None;
-}
 
-bool Step4::classDiagram() const
-{
-  return m_dotClass->isChecked();
-}
-
-bool Step4::collaborationDiagram() const
-{
-  return m_dotCollaboration->isChecked();
-}
-
-bool Step4::includeGraph() const
-{
-  return m_dotInclude->isChecked();
-}
-
-bool Step4::includedByGraph() const
-{
-  return m_dotIncludedBy->isChecked();
-}
-
-bool Step4::inheritanceGraph() const
-{
-  return m_dotInheritance->isChecked();
-}
-
-bool Step4::callGraph() const
-{
-  return m_dotCall->isChecked();
-}
-
-void Step4::setDiagramMode(DiagramMode mode)
-{
-  switch(mode)
+  for (int i=0;i<10;i++)
   {
-    case DM_None:    m_diagramMode->setButton(0); diagramModeChanged(0); break;
-    case DM_Builtin: m_diagramMode->setButton(1); diagramModeChanged(1); break;
-    case DM_Dot:     m_diagramMode->setButton(2); diagramModeChanged(2); break;
+    QString entry = m_settings.value(QString().sprintf("recent/config%d",i)).toString();
+    if (!entry.isEmpty()) addRecentFile(entry);
   }
-}
 
-void Step4::setClassDiagram(bool enable)
-{
-  m_dotClass->setChecked(enable);
-}
-
-void Step4::setCollaborationDiagram(bool enable)
-{
-  m_dotCollaboration->setChecked(enable);
 }
 
-void Step4::setIncludeGraph(bool enable)
+void MainWindow::saveSettings()
 {
-  m_dotInclude->setChecked(enable);
-}
+  QSettings settings(QString::fromAscii("Doxygen.org"), QString::fromAscii("Doxywizard"));
 
-void Step4::setIncludedByGraph(bool enable)
-{
-  m_dotIncludedBy->setChecked(enable);
+  m_settings.setValue(QString::fromAscii("main/geometry"), saveGeometry());
+  m_settings.setValue(QString::fromAscii("main/state"),    saveState());
+  m_settings.setValue(QString::fromAscii("expert/state"),  m_expert->saveState());
+  m_settings.setValue(QString::fromAscii("expert/state2"), m_expert->saveInnerState());
+  m_settings.setValue(QString::fromAscii("wizard/state"),  m_wizard->saveState());
 }
 
-void Step4::setInheritanceGraph(bool enable)
+void MainWindow::selectTab(int id)
 {
-  m_dotInheritance->setChecked(enable);
+  if (id==0) m_wizard->refresh();
 }
 
-void Step4::setCallGraph(bool enable)
+void MainWindow::addRecentFile(const QString &fileName)
 {
-  m_dotCall->setChecked(enable);
-}
-
-
-//==========================================================================
-
-Wizard::Wizard(QWidget *parent=0) : QTabDialog(parent) 
-{
-  addTab( m_step1 = new Step1(this),"Project");
-  addTab( m_step2 = new Step2(this),"Mode");
-  addTab( m_step3 = new Step3(this),"Output");
-  addTab( m_step4 = new Step4(this),"Diagrams");
-  setCancelButton();
-}
-
-//==========================================================================
-
-MainWidget::MainWidget(QWidget *parent) 
-  : QMainWindow(parent,"MainWidget")
-{
-  setCaption("Doxygen GUI frontend");
-
-  // initialize config settings
-  Config::instance()->init();
-  Config::instance()->check();
-  Config_getBool("HAVE_DOT")=TRUE;
-#if defined(Q_OS_MACX)
-  setDotPath();
-  setMscgenPath();
-#endif
+  int i=m_recentFiles.indexOf(fileName);
+  if (i!=-1) m_recentFiles.removeAt(i);
   
-  QWidget *w = new QWidget(this);
-  setCentralWidget(w);
-  QVBoxLayout *layout = new QVBoxLayout(w);
-  layout->setMargin(10);
-
-  QPopupMenu *file = new QPopupMenu(this);
-  file->insertItem("Open...",  this, SLOT(loadConfigFile()), CTRL+Key_O);
-  file->insertItem("Save As...",  this, SLOT(saveConfigFile()), CTRL+Key_S);
-  m_recentMenu = new QPopupMenu;
-  file->insertItem( "&Recent configurations", m_recentMenu );
-  connect(m_recentMenu,SIGNAL(activated(int)),this,SLOT(openRecent(int)));
-  file->insertItem("Set as default...",this,SLOT(saveDefaults()) );
-  file->insertItem("Reset...",this,SLOT(resetConfig()) );
-  file->insertItem("Quit",  this, SLOT(quit()), CTRL+Key_Q);
-  QPopupMenu *help = new QPopupMenu(this);
-#if defined(Q_OS_MACX)
-  help->insertItem("Online manual", this, SLOT(manual()), Key_F1);
-#endif
-  help->insertItem("About", this, SLOT(about()) );
-  menuBar()->insertItem("File",file);
-  menuBar()->insertItem("Help",help);
-
-  //---------------------------------------------------
-  QVBox *heading = new QVBox(w);
-  QLabel *l = new QLabel("Step 1: Configure doxygen",heading);
-  QFrame *f = new QFrame( heading );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  //f->setFixedSize(l->sizeHint().width(),f->sizeHint().height());
-  layout->addWidget(heading);
-  layout->addSpacing(10);
-
-  l = new QLabel("Choose one of the following ways to configure doxygen",w);
-  layout->addWidget(l);
-  layout->addSpacing(5);
-  QHBoxLayout *hbl = new QHBoxLayout(layout);
-  hbl->setSpacing(8);
-
-  m_wizard = new QPushButton("Wizard...",w);
-  QToolTip::add(m_wizard,"Quickly configure the most important settings");
-  hbl->addWidget(m_wizard);
-
-  m_expert = new QPushButton("Expert...",w);
-  QToolTip::add(m_expert,"Determine all configuration settings in detail");
-  hbl->addWidget(m_expert);
-
-  m_load = new QPushButton("Load...",w);
-  QToolTip::add(m_load,"Load the configuration settings from file");
-  hbl->addWidget(m_load);
-
-  hbl->addStretch(1);
-
-  //---------------------------------------------------
-  heading = new QVBox(w);
-  l = new QLabel("Step 2: Save the configuration file",heading);
-  f = new QFrame( heading );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  //f->setFixedSize(l->sizeHint().width(),f->sizeHint().height());
-  layout->addSpacing(15);
-  layout->addWidget(heading);
-  layout->addSpacing(5);
-
-  QGridLayout *grid = new QGridLayout(layout,1,2,10);
-  m_save = new QPushButton("Save...",w);
-  m_save->setFixedSize(m_save->sizeHint());
-  grid->addWidget(m_save,0,0);
-  grid->addWidget(m_saveStatus=new QLabel(w),0,1);
-  m_saveStatus->setTextFormat(Qt::RichText);
-
-  //---------------------------------------------------
-  heading = new QVBox(w);
-  l = new QLabel("Step 3: Specify the directory from which to run doxygen",heading);
-  f = new QFrame( heading );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  //f->setFixedSize(l->sizeHint().width(),f->sizeHint().height());
-  layout->addSpacing(15);
-  layout->addWidget(heading);
-  layout->addSpacing(5);
-
-  QHBoxLayout *row = new QHBoxLayout( layout );
-  row->setSpacing(10);
-  row->addWidget(new QLabel("Working directory:",w));
-  m_workingDir = new QLineEdit(w);
-  m_selWorkingDir = new QPushButton("Select...",w);
-  row->addWidget(m_workingDir,1);
-  row->addWidget(m_selWorkingDir);
-
-  //---------------------------------------------------
-  heading = new QVBox(w);
-  l = new QLabel("Step 4: Run doxygen",heading);
-  f = new QFrame( heading );
-  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
-  //f->setFixedSize(l->sizeHint().width(),f->sizeHint().height());
-  layout->addSpacing(15);
-  layout->addWidget(heading);
-  layout->addSpacing(5);
-
-  row = new QHBoxLayout( layout );
-  row->setSpacing(10);
-  m_run = new QPushButton("Start",w);
-  row->addWidget(m_run);
-  row->addWidget(m_runStatus = new QLabel("Status: not running",w));
-  row->addStretch(1);
-  m_run->setEnabled(FALSE);
-  m_runStatus->setEnabled(FALSE);
-
-  m_saveLog = new QPushButton("Save log...",w);
-  m_saveLog->setEnabled(FALSE);
-  row->addWidget(m_saveLog);
-
-  layout->addSpacing(8);
-  layout->addWidget(m_outputHeading=new QLabel("Output produced by doxygen",w));
-  grid = new QGridLayout(layout,1,1,3);
-  m_outputLog = new QTextEdit(w);
-  m_outputLog->setReadOnly(TRUE);
-  m_outputLog->setMinimumWidth(600);
-  grid->addWidget(m_outputLog,0,0);
-  grid->setColStretch(0,1);
-  grid->setRowStretch(0,1);
-  m_outputLog->setEnabled(FALSE);
-  m_outputHeading->setEnabled(FALSE);
-
-  // make connections
-  connect(m_wizard,SIGNAL(clicked()),
-          this,SLOT(launchWizard()));
-  connect(m_expert,SIGNAL(clicked()),
-          this,SLOT(launchExpert()));
-  connect(m_load,SIGNAL(clicked()),
-          this,SLOT(loadConfigFile()));
-  connect(m_save,SIGNAL(clicked()),
-          this,SLOT(saveConfigFile()));
-  connect(m_selWorkingDir,SIGNAL(clicked()),
-          this,SLOT(selectWorkingDir()));
-  connect(m_workingDir,SIGNAL(textChanged(const QString&)),
-          this,SLOT(updateRunnable(const QString&)));
-  connect(m_run,SIGNAL(clicked()),
-          this,SLOT(runDoxygen()));
-  connect(m_saveLog,SIGNAL(clicked()),
-          this,SLOT(saveLog()));
-
-  // load default settings
-  m_settings.setPath("www.doxygen.org","Doxygen GUI");
-  bool ok;
-  QString config = m_settings.readEntry("/doxywizard/config/default",QString::null,&ok);
-  if (ok && !config.isEmpty())
+  // not found
+  if (m_recentFiles.count() < 10) // append
   {
-    Config::instance()->parseString("default settings",config);
+    m_recentFiles.prepend(fileName);
   }
-  QString workingDir = m_settings.readEntry("/doxywizard/config/workingdir",QString::null,&ok);
-  if (ok && !workingDir.isEmpty())
+  else // add + drop last item
   {
-    m_workingDir->setText(workingDir);
+    m_recentFiles.removeLast();
+    m_recentFiles.prepend(fileName);
   }
-  setConfigSaved(FALSE);
-  for (int i=0;i<10;i++)
+  m_recentMenu->clear();
+  i=0;
+  foreach( QString str, m_recentFiles ) 
   {
-    QString entry = m_settings.readEntry(QString().sprintf("/doxywizard/recent/config%d",i));
-    if (!entry.isEmpty())
-    {
-      addRecentFile(entry);
-    }
+    m_recentMenu->addAction(str);
+    m_settings.setValue(QString().sprintf("recent/config%d",i++),str);
   }
-
-  m_runProcess = new QProcess;
-  connect(m_runProcess,SIGNAL(readyReadStdout()),this,SLOT(readStdout()));
-  connect(m_runProcess,SIGNAL(processExited()),this,SLOT(runComplete()));
-  m_running = FALSE;
-  m_timer = new QTimer;
-  connect(m_timer,SIGNAL(timeout()),this,SLOT(readStdout()));
-
-  statusBar()->message("Welcome to Doxygen",messageTimeout);
-}
-
-MainWidget::~MainWidget()
-{
-  delete m_runProcess;
 }
 
-void MainWidget::selectWorkingDir()
+void MainWindow::openRecent(QAction *action)
 {
-  QString selectedDir = QFileDialog::getExistingDirectory(m_workingDir->text());
-  if (!selectedDir.isEmpty())
+  if (discardUnsavedChanges(false))
   {
-    m_workingDir->setText(selectedDir);
+    loadConfigFromFile(action->text());
   }
 }
 
-void MainWidget::updateRunnable(const QString &newDirName)
-{
-  if (m_running) return;
-  QFileInfo fi(newDirName);
-  bool isRunnable = fi.exists() && fi.isDir() && m_configSaved;
-  m_run->setEnabled(isRunnable);
-  m_runStatus->setEnabled(isRunnable);
-  m_outputHeading->setEnabled(isRunnable);
-  m_outputLog->setEnabled(isRunnable);
-  m_saveLog->setEnabled(isRunnable && !m_outputLog->text().isEmpty());
-}
-
-void MainWidget::launchWizard()
+void MainWindow::runDoxygen()
 {
-  Wizard wizard(this);
-
-  // --------  Initialize the dialog ----------------
-  
-  // step1
-  wizard.setProjectName(QString::fromLocal8Bit(Config_getString("PROJECT_NAME")));
-  wizard.setProjectNumber(QString::fromLocal8Bit(Config_getString("PROJECT_NUMBER")));
-  if (Config_getList("INPUT").count()>0)
-  {
-    QString dirName=Config_getList("INPUT").getFirst();
-    QFileInfo fi(dirName);
-    if (fi.exists() && fi.isDir())
-    {
-      wizard.setSourceDir(dirName);
-    }
-  }
-  wizard.setRecursiveScan(Config_getBool("RECURSIVE"));
-  wizard.setDestinationDir(QString::fromLocal8Bit(Config_getString("OUTPUT_DIRECTORY")));
-
-  // step2
-  wizard.setExtractAll(Config_getBool("EXTRACT_ALL"));
-  wizard.setCrossReferencing(Config_getBool("SOURCE_BROWSER"));
-  if (Config_getBool("OPTIMIZE_OUTPUT_JAVA"))
-  {
-    wizard.setOptimizeFor(Lang_Java);
-  }
-  else if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-  {
-    wizard.setOptimizeFor(Lang_C);
-  }
-  else
-  {
-    wizard.setOptimizeFor(Lang_Cpp);
-  }
-
-  // step3
-  wizard.setHtmlEnabled(Config_getBool("GENERATE_HTML"));
-  wizard.setLatexEnabled(Config_getBool("GENERATE_LATEX"));
-  wizard.setManEnabled(Config_getBool("GENERATE_MAN"));
-  wizard.setRtfEnabled(Config_getBool("GENERATE_RTF"));
-  wizard.setXmlEnabled(Config_getBool("GENERATE_XML"));
-  wizard.setSearchEnabled(Config_getBool("SEARCHENGINE"));
-  if (Config_getBool("GENERATE_HTMLHELP"))
-  {
-    wizard.setHtmlStyle(HS_CHM);
-  }
-  else if (Config_getEnum("GENERATE_TREEVIEW")!="NONE")
-  {
-    wizard.setHtmlStyle(HS_TreeView);
-  }
-  else
-  {
-    wizard.setHtmlStyle(HS_Plain);
-  }
-  if (Config_getBool("USE_PDFLATEX"))
-  {
-    if (Config_getBool("PDF_HYPERLINKS"))
-    {
-      wizard.setTexStyle(TS_PDFHyper);
-    }
-    else
-    {
-      wizard.setTexStyle(TS_PDF);
-    }
-  }
-  else
+  if (!m_running)
   {
-    wizard.setTexStyle(TS_PS);
-  }
+    QString doxygenPath; 
+#if defined(Q_OS_MACX)
+    doxygenPath = qApp->applicationDirPath()+QString::fromAscii("/../Resources/");
+    qDebug() << tr("Doxygen path: ") << doxygenPath;
+    if ( !QFile(doxygenPath + QString::fromAscii("doxygen")).exists() ) {
+        // No doygen binary in the resources, if there is a system doxygen binary, use that instead
+        if ( QFile(QString::fromAscii("/usr/local/bin/doxygen")).exists() )
+            doxygenPath = QString::fromAscii("/usr/local/bin/");
+        else {
+            qDebug() << tr("Can't find the doxygen command, make sure it's in your $$PATH");
+            doxygenPath = QString::fromAscii("");
+       	}
+   	}
+    qDebug() << tr("Getting doxygen from: ") << doxygenPath;
+#endif
 
-  // step4
-  if (Config_getBool("HAVE_DOT"))
-  {
-    wizard.setDiagramMode(DM_Dot);
-  }
-  else if (Config_getBool("CLASS_DIAGRAMS"))
-  {
-    wizard.setDiagramMode(DM_Builtin);
-  }
-  else
-  {
-    wizard.setDiagramMode(DM_None);
-  }
-  wizard.setClassDiagram(Config_getBool("CLASS_GRAPH"));
-  wizard.setCollaborationDiagram(Config_getBool("COLLABORATION_GRAPH"));
-  wizard.setIncludeGraph(Config_getBool("INCLUDE_GRAPH"));
-  wizard.setIncludedByGraph(Config_getBool("INCLUDED_BY_GRAPH"));
-  wizard.setInheritanceGraph(Config_getBool("GRAPHICAL_HIERARCHY"));
-  wizard.setCallGraph(Config_getBool("CALL_GRAPH"));
-  
-  // --------  Run the dialog ----------------
+    m_runProcess->setReadChannel(QProcess::StandardOutput);
+    m_runProcess->setProcessChannelMode(QProcess::MergedChannels);
+    m_runProcess->setWorkingDirectory(m_workingDir->text());
+    QStringList env=QProcess::systemEnvironment();
+    // set PWD environment variable to m_workingDir
+    env.replaceInStrings(QRegExp(QString::fromAscii("^PWD=(.*)"),Qt::CaseInsensitive), 
+                         QString::fromAscii("PWD=")+m_workingDir->text());
+    m_runProcess->setEnvironment(env);
 
-  if (wizard.exec()==QDialog::Accepted)
-  {
-    // -------- Store the results ----------------
+    QStringList args;
+    args << QString::fromAscii("-b"); // make stdout unbuffered
+    args << QString::fromAscii("-");  // read config from stdin
 
-    // step1
-    Config_getString("PROJECT_NAME")=wizard.getProjectName().local8Bit();
-    Config_getString("PROJECT_NUMBER")=wizard.getProjectNumber();
-    Config_getList("INPUT").clear();
-    Config_getList("INPUT").append(wizard.getSourceDir());
-    Config_getBool("RECURSIVE")=wizard.scanRecursively();
-    Config_getString("OUTPUT_DIRECTORY")=wizard.getDestinationDir().local8Bit();
+    m_outputLog->clear();
+    m_runProcess->start(doxygenPath + QString::fromAscii("doxygen"), args);
 
-    // step2
-    if (wizard.extractAll())
+    if (!m_runProcess->waitForStarted())
     {
-      Config_getBool("EXTRACT_ALL")=TRUE;
-      Config_getBool("EXTRACT_PRIVATE")=TRUE;
-      Config_getBool("EXTRACT_STATIC")=TRUE;
-      Config_getBool("EXTRACT_LOCAL_CLASSES")=TRUE;
-      Config_getBool("HIDE_UNDOC_MEMBERS")=FALSE;
-      Config_getBool("HIDE_UNDOC_CLASSES")=FALSE;
-    } 
-    else
-    {
-      Config_getBool("EXTRACT_ALL")=FALSE;
-      Config_getBool("EXTRACT_PRIVATE")=FALSE;
-      Config_getBool("EXTRACT_STATIC")=FALSE;
-      Config_getBool("EXTRACT_LOCAL_CLASSES")=TRUE;
-      Config_getBool("HIDE_UNDOC_MEMBERS")=TRUE;
-      Config_getBool("HIDE_UNDOC_CLASSES")=TRUE;
+      m_outputLog->append(QString::fromAscii("*** Failed to run doxygen\n"));
+      return;
     }
+    QTextStream t(m_runProcess);
+    m_expert->writeConfig(t,false);
+    m_runProcess->closeWriteChannel();
     
-    if (wizard.crossReferencing())
+    if (m_runProcess->state() == QProcess::NotRunning)
     {
-      Config_getBool("SOURCE_BROWSER")=TRUE;
-      Config_getBool("REFERENCED_BY_RELATION")=TRUE;
-      Config_getBool("REFERENCES_RELATION")=TRUE;
-      Config_getBool("VERBATIM_HEADERS")=TRUE;
+      m_outputLog->append(QString::fromAscii("*** Failed to run doxygen\n"));
     }
     else
     {
-      Config_getBool("SOURCE_BROWSER")=FALSE;
-      Config_getBool("REFERENCED_BY_RELATION")=FALSE;
-      Config_getBool("REFERENCES_RELATION")=FALSE;
-      Config_getBool("VERBATIM_HEADERS")=FALSE;
-    }
-
-    switch(wizard.optimizeFor())
-    {
-      case Lang_Cpp:
-        Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=FALSE;
-        Config_getBool("OPTIMIZE_OUTPUT_JAVA")=FALSE;
-        break;
-      case Lang_Java:
-        Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=FALSE;
-        Config_getBool("OPTIMIZE_OUTPUT_JAVA")=TRUE;
-        break;
-      case Lang_C:
-        Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=TRUE;
-        Config_getBool("OPTIMIZE_OUTPUT_JAVA")=FALSE;
-        break;
-      case Lang_CS:
-        Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=FALSE;
-        Config_getBool("OPTIMIZE_OUTPUT_JAVA")=TRUE;
-        Config_getBool("EXTRACT_STATIC")=TRUE;
-        Config_getBool("EXTRACT_LOCAL_CLASSES")=TRUE;
-        break;
-    }
-
-    // step3
-    Config_getBool("GENERATE_HTML")=wizard.htmlEnabled();
-    Config_getBool("GENERATE_LATEX")=wizard.latexEnabled();
-    Config_getBool("GENERATE_MAN")=wizard.manEnabled();
-    Config_getBool("GENERATE_RTF")=wizard.rtfEnabled();
-    Config_getBool("GENERATE_XML")=wizard.xmlEnabled();
-    Config_getBool("SEARCHENGINE")=wizard.searchEnabled();
-    if (wizard.htmlEnabled())
-    {
-      switch (wizard.htmlStyle())
-      {
-        case HS_Plain:
-          Config_getBool("GENERATE_HTMLHELP")=FALSE;
-          Config_getEnum("GENERATE_TREEVIEW")="NONE";
-          break;
-        case HS_TreeView:
-          Config_getBool("GENERATE_HTMLHELP")=FALSE;
-          Config_getEnum("GENERATE_TREEVIEW")="ALL";
-          break;
-        case HS_CHM:
-          Config_getBool("GENERATE_HTMLHELP")=TRUE;
-          Config_getEnum("GENERATE_TREEVIEW")="NONE";
-          break;
-      }
-    }
-    if (wizard.latexEnabled())
-    {
-      switch (wizard.texStyle())
-      {
-        case TS_PDFHyper:
-          Config_getBool("USE_PDFLATEX")=TRUE;
-          Config_getBool("PDF_HYPERLINKS")=TRUE;
-          break;
-        case TS_PDF:
-          Config_getBool("USE_PDFLATEX")=TRUE;
-          Config_getBool("PDF_HYPERLINKS")=FALSE;
-          break;
-        case TS_PS:
-          Config_getBool("USE_PDFLATEX")=FALSE;
-          Config_getBool("PDF_HYPERLINKS")=FALSE;
-          break;
-      }
-    }
-
-    // step4
-    switch (wizard.diagramMode())
-    {
-      case DM_None:
-        Config_getBool("CLASS_DIAGRAMS")=FALSE;
-        Config_getBool("HAVE_DOT")=FALSE;
-        break;
-      case DM_Builtin:
-        Config_getBool("CLASS_DIAGRAMS")=TRUE;
-        Config_getBool("HAVE_DOT")=FALSE;
-        break;
-      case DM_Dot:
-        Config_getBool("CLASS_DIAGRAMS")=FALSE;
-        Config_getBool("HAVE_DOT")=TRUE;
-        Config_getBool("CLASS_GRAPH")=wizard.classDiagram();
-        Config_getBool("COLLABORATION_GRAPH")=wizard.collaborationDiagram();
-        Config_getBool("INCLUDE_GRAPH")=wizard.includeGraph();
-        Config_getBool("INCLUDED_BY_GRAPH")=wizard.includedByGraph();
-        Config_getBool("GRAPHICAL_HIERARCHY")=wizard.inheritanceGraph();
-        Config_getBool("CALL_GRAPH")=wizard.callGraph();
-        break;
-    }
-#if defined(Q_OS_MACX)
-    if (Config_getString("DOT_PATH").isEmpty())
-    {
-      setDotPath();
-    }
-    if (Config_getString("MSCGEN_PATH").isEmpty())
-    {
-      setMscgenPath();
+      m_saveLog->setEnabled(false);
+      m_running=true;
+      m_run->setText(tr("Stop doxygen"));
+      m_runStatus->setText(tr("Status: running"));
+      m_timer->start(1000);
     }
-#endif
-    setConfigSaved(FALSE);
-  }
-}
-
-void MainWidget::loadConfigFromFile(const QString &fn)
-{
-  if (!Config::instance()->parse(fn))
-  {
-    QMessageBox::warning(0,"Warning",
-        "Could not open or read config file "+fn+"!",
-        "abort"
-        );
   }
   else
   {
-    Config::instance()->convertStrToVal();
-#if 0 //defined(Q_OS_MACX)
-    if (checkIfDotInstalled() && 
-        qstricmp(Config_getString("DOT_PATH"),DOT_PATH)!=0
-       )
-    {
-      Config_getString("DOT_PATH")=DOT_PATH;
-      setConfigSaved(FALSE);
-    }
-    else
-    {
-      setConfigSaved(TRUE);
-    }
-#else
-    setConfigSaved(TRUE);
-#endif
-    addRecentFile(fn);
-    m_workingDir->setText(QFileInfo(fn).dirPath(TRUE));
-    m_configFileName = fn;
-#if defined(Q_OS_MACX)
-    //if (Config_getString("DOT_PATH").isEmpty())
-    //{
-    //  setDotPath();
-    //  setConfigSaved(FALSE);
-    //}
-    if (Config_getString("MSCGEN_PATH").isEmpty())
-    {
-      setMscgenPath();
-      setConfigSaved(FALSE);
-    }
-#endif
-    statusBar()->message("New configuration loaded",messageTimeout);
+    m_running=false;
+    m_run->setText(tr("Run doxygen"));
+    m_runStatus->setText(tr("Status: not running"));
+    m_runProcess->kill();
+    m_timer->stop();
+    //updateRunnable(m_workingDir->text());
   }
 }
 
-void MainWidget::loadConfigFile()
+void MainWindow::readStdout()
 {
-  QString fn = QFileDialog::getOpenFileName(m_workingDir->text(),QString::null,this);
-  if (!fn.isEmpty())
+  if (m_running)
   {
-    loadConfigFromFile(fn);
-    // set current dir to where the config file is located
-    QDir::setCurrent(QFileInfo(fn).dirPath(TRUE));
+    QByteArray data = m_runProcess->readAllStandardOutput();
+    QString text = QString::fromLocal8Bit(data);
+    if (!text.isEmpty())
+    {
+      m_outputLog->append(text.trimmed());
+    }
   }
 }
 
-void MainWidget::launchExpert()
-{
-  Expert expert(this);
-  expert.init();
-  expert.exec();
-//#if defined(Q_OS_MACX)
-//  setDotPath();
-//#endif
-  if (expert.hasChanged()) setConfigSaved(FALSE);
-}
-
-void MainWidget::saveDefaults()
+void MainWindow::runComplete()
 {
-  if (QMessageBox::question(this,"Store settings as defaults",
-                "Do you wish to use the "
-                "current configuration settings as the default settings?",
-                QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes)
+  if (m_running)
   {
-    QString newConfig;
-    QTextStream t(&newConfig,IO_WriteOnly);
-    Config::instance()->writeTemplate(t,TRUE,FALSE);
-    m_settings.writeEntry("/doxywizard/config/default",newConfig);
-    m_settings.writeEntry("/doxywizard/config/workingdir",m_workingDir->text());
-    statusBar()->message("Current configuration saved as default",messageTimeout);
+    m_outputLog->append(tr("*** Doxygen has finished\n"));
   }
-}
-
-void MainWidget::saveConfigFile()
-{
-  QString fn = QFileDialog::getSaveFileName(m_workingDir->text()+"/Doxyfile",QString::null,this);
-  if (!fn.isEmpty())
+  else
   {
-    QFile f(fn);
-    if (f.exists() && QMessageBox::question(this,
-          "Overwrite file? -- Doxywizard",
-          "A file called "+fn+" already exists. Do you want to overwrite it?",
-          "&Yes","&no",
-          QString::null, 0, 1)
-       )
-    {
-      statusBar()->message("Save request aborted",messageTimeout);
-      return;
-    }
-    if (f.open(IO_WriteOnly))
-    {
-      QTextStream t(&f);
-      Config::instance()->writeTemplate(t,TRUE,FALSE);
-      m_configFileName = fn;
-      setConfigSaved(TRUE);
-      addRecentFile(fn);
-      statusBar()->message("Configuration saved",messageTimeout);
-    }
-    else
-    {
-      QMessageBox::warning(0,"Warning",
-          "Cannot open file "+fn+" for writing. Nothing saved!","ok");
-    }
+    m_outputLog->append(tr("*** Cancelled by user\n"));
   }
+  m_outputLog->ensureCursorVisible();
+  m_run->setText(tr("Run doxygen"));
+  m_runStatus->setText(tr("Status: not running"));
+  m_running=false;
+  updateLaunchButtonState();
+  //updateRunnable(m_workingDir->text());
+  m_saveLog->setEnabled(true);
 }
 
-void MainWidget::resetConfig()
+void MainWindow::updateLaunchButtonState()
 {
-  if (QMessageBox::question(this,"Reset settings to their defaults",
-                "Do you wish to reset the "
-                "current configuration settings to their factory defaults?",
-                QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes)
-  {
-    // initialize config settings
-    Config::instance()->init();
-#if defined(Q_OS_MACX)
-    setDotPath();
-    setMscgenPath();
+  m_launchHtml->setEnabled(m_expert->htmlOutputPresent(m_workingDir->text()));
+#if 0
+  m_launchPdf->setEnabled(m_expert->pdfOutputPresent(m_workingDir->text()));
 #endif
-
-    m_configFileName = "";
-    setConfigSaved(FALSE);
-    statusBar()->message("Configuration settings reset to their defaults",messageTimeout);
-  }
 }
 
-void MainWidget::setConfigSaved(bool enable)
+void MainWindow::showHtmlOutput()
 {
-  m_configSaved=enable;
-  if (m_configSaved)
-  {
-    m_saveStatus->setText("Status: saved");
-  }
-  else
-  {
-    m_saveStatus->setText("Status: <font color=\"red\">not saved</font>");
-  }
-  updateRunnable(m_workingDir->text());
+  QString indexFile = m_expert->getHtmlOutputIndex(m_workingDir->text());
+  QFileInfo fi(indexFile);
+  QString indexUrl(QString::fromAscii("file://")+fi.absoluteFilePath());
+  QDesktopServices::openUrl(QUrl(indexUrl));
 }
 
-void MainWidget::runDoxygen()
+void MainWindow::saveLog()
 {
-  if (!m_running)
+  QString fn = QFileDialog::getSaveFileName(this, tr("Save log file"), 
+        m_workingDir->text()+
+        QString::fromAscii("/doxygen_log.txt"));
+  if (!fn.isEmpty())
   {
-    QString doxygenPath; 
-#if defined(Q_OS_MACX)
-    doxygenPath = getResourcePath();
-#else
-    // TODO: get the right value if not in the search path
-#endif
-    //printf("Trying to run doxygen from path %s\n",doxygenPath.data());
-
-    m_runProcess->setCommunication(QProcess::Stdout|
-                                   QProcess::Stderr|
-                                   QProcess::DupStderr
-                                  );
-    m_runProcess->setWorkingDirectory(QDir(m_workingDir->text()));
-    m_runProcess->clearArguments();
-    m_runProcess->addArgument(doxygenPath+"doxygen");
-    m_runProcess->addArgument("-b");
-    m_runProcess->addArgument(m_configFileName);
-    m_outputLog->clear();
-    if (!m_runProcess->start())
+    QFile f(fn);
+    if (f.open(QIODevice::WriteOnly))
     {
-      m_outputLog->append(QString("*** Failed to run doxygen\n"));
+      QTextStream t(&f);
+      t << m_outputLog->toPlainText();
+      statusBar()->showMessage(tr("Output log saved"),messageTimeout);
     }
     else
     {
-      m_running=TRUE;
-      m_run->setText("Cancel");
-      m_runStatus->setText("Status: running");
-      m_timer->start(1000);
+      QMessageBox::warning(0,tr("Warning"),
+          tr("Cannot open file ")+fn+tr(" for writing. Nothing saved!"),tr("ok"));
     }
   }
-  else
-  {
-    m_running=FALSE;
-    m_run->setText("Start");
-    m_runStatus->setText("Status: not running");
-    m_runProcess->kill();
-    m_timer->stop();
-    updateRunnable(m_workingDir->text());
-  }
 }
 
-void MainWidget::readStdout()
+void MainWindow::showSettings()
 {
-  m_outputLog->append(QString(m_runProcess->readStdout()));
+  QString text;
+  QTextStream t(&text);
+  m_expert->writeConfig(t,true);
+  m_outputLog->clear();
+  m_outputLog->append(text);
+  m_outputLog->ensureCursorVisible();
+  m_saveLog->setEnabled(true);
 }
 
-void MainWidget::runComplete()
+void MainWindow::configChanged()
 {
-  if (m_running)
-  {
-    m_outputLog->append(QString("*** Doxygen has finished\n"));
-  }
-  else
-  {
-    m_outputLog->append(QString("*** Cancelled by user\n"));
-  }
-  m_run->setText("Start");
-  m_runStatus->setText("Status: not running");
-  m_running=FALSE;
-  updateRunnable(m_workingDir->text());
-}
-
-void MainWidget::about()
-{
-  QString msg;
-  QTextStream t(&msg,IO_WriteOnly);
-  t << QString("<qt><center>A tool to configure and run doxygen version ")+versionString+
-       " on your source files.</center><p><br>"
-       "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2008</center><p>"
-       "</qt>";
-  QMessageBox::about(this,"Doxygen GUI",msg);
+  m_modified = true;
+  updateTitle();
 }
 
-void MainWidget::manual()
+void MainWindow::updateTitle()
 {
-#if defined(Q_OS_MACX)
-  const char *urlBytes = "http://www.doxygen.org/manual.html";
-  CFURLRef url = CFURLCreateWithBytes (
-      NULL, // allocator 
-      (UInt8*)urlBytes, // bytes 
-      strlen(urlBytes), // length
-      kCFStringEncodingASCII, // encoding
-      NULL // baseURL
-      );
-  LSOpenCFURLRef(url,0);
-  CFRelease(url);
-#endif
-}
-
-void MainWidget::addRecentFile(const QString &file)
-{
-  QStringList::Iterator it = m_recentFiles.find(file);
-  if (it!=m_recentFiles.end())
-  {
-    // already found => move to top
-    m_recentFiles.remove(it);
-    m_recentFiles.prepend(file);
-  }
-  else
+  QString title = tr("Doxygen GUI frontend");
+  if (m_modified)
   {
-    // not found
-    if (m_recentFiles.count() < 10) // append
-    {
-      m_recentFiles.prepend(file);
-    }
-    else // add + drop last item
-    {
-      m_recentFiles.remove(m_recentFiles.last());
-      m_recentFiles.prepend(file);
-    }
+    title+=QString::fromAscii(" +");
   }
-
-  m_recentMenu->clear();
-  int i=0;
-  for ( it = m_recentFiles.begin(); it != m_recentFiles.end(); ++it, ++i )
+  if (!m_fileName.isEmpty())
   {
-    m_recentMenu->insertItem(*it);
-    m_settings.writeEntry(QString().sprintf("/doxywizard/recent/config%d",i),*it);
+    title+=QString::fromAscii(" (")+m_fileName+QString::fromAscii(")");
   }
+  setWindowTitle(title);
 }
 
-
-void MainWidget::openRecent(int id)
-{
-  loadConfigFromFile(m_recentMenu->text(id)); 
-}
-
-void MainWidget::quit()
-{
-  if (!m_configSaved &&
-      QMessageBox::warning( this, "DoxyWizard", "Quit and lose changes?",
-        QMessageBox::Yes, QMessageBox::No)==QMessageBox::No
-     ) return; // Quit cancelled by user
-
-  qApp->quit();
-}
-
-void MainWidget::saveLog()
+bool MainWindow::discardUnsavedChanges(bool saveOption)
 {
-  QString fn = QFileDialog::getSaveFileName(m_workingDir->text()+"/doxygen_log.txt",QString::null,this);
-  if (!fn.isEmpty())
+  if (m_modified)
   {
-    QFile f(fn);
-    if (f.open(IO_WriteOnly))
+    QMessageBox::StandardButton button;
+    if (saveOption)
     {
-      QTextStream t(&f);
-      t << m_outputLog->text();
-      statusBar()->message("Output log saved",messageTimeout);
+      button = QMessageBox::question(this,
+          tr("Unsaved changes"),
+          tr("Unsaved changes will be lost! Do you want to save the configuration file?"),
+          QMessageBox::Save    |
+          QMessageBox::Discard |
+          QMessageBox::Cancel
+          );
+      if (button==QMessageBox::Save)
+      {
+        return saveConfig();
+      }
     }
     else
     {
-      QMessageBox::warning(0,"Warning",
-          "Cannot open file "+fn+" for writing. Nothing saved!","ok");
+      button = QMessageBox::question(this,
+          tr("Unsaved changes"),
+          tr("Unsaved changes will be lost! Do you want to continue?"),
+          QMessageBox::Discard |
+          QMessageBox::Cancel
+          );
     }
+    return button==QMessageBox::Discard;
   }
+  return true;
 }
 
-//==========================================================================
+//-----------------------------------------------------------------------
 
 int main(int argc,char **argv)
 {
   QApplication a(argc,argv);
-  MainWidget main;
+  MainWindow &main = MainWindow::instance();
   if (argc==2 && argv[1][0]!='-') // name of config file as an argument
   {
-    main.loadConfigFromFile(argv[1]);
+    main.loadConfigFromFile(QString::fromLocal8Bit(argv[1]));
   }
   else if (argc>1)
   {
     printf("Usage: %s [config file]\n",argv[0]);
     exit(1);
   }
-  a.setMainWidget(&main);
   main.show();
   return a.exec();
 }
-
diff --git a/addon/doxywizard/doxywizard.h b/addon/doxywizard/doxywizard.h
index 6e157b1..49e13cc 100644
--- a/addon/doxywizard/doxywizard.h
+++ b/addon/doxywizard/doxywizard.h
@@ -1,288 +1,83 @@
 #ifndef DOXYWIZARD_H
 #define DOXYWIZARD_H
 
-#include <qvbox.h>
-#include <qtabdialog.h>
-#include <qmainwindow.h>
-#include <qsettings.h>
-#include <qstringlist.h>
+#include <QMainWindow>
+#include <QSettings>
+#include <QStringList>
 
+class Expert;
+class Wizard;
+class QLabel;
 class QLineEdit;
-class QCheckBox;
 class QPushButton;
-class QComboBox;
-class QButtonGroup;
 class QTextEdit;
-class QLabel;
+class QMenu;
 class QProcess;
 class QTimer;
-class QPopupMenu;
-
-enum OptLang { Lang_Cpp, Lang_C, Lang_Java, Lang_CS };
-enum HtmlStyle { HS_Plain, HS_TreeView, HS_CHM };
-enum TexStyle { TS_PDFHyper, TS_PDF, TS_PS };
-enum DiagramMode { DM_None, DM_Builtin, DM_Dot };
-
-class Step1 : public QWidget
-{
-    Q_OBJECT
-
-  public:
-    Step1(QWidget *parent);
-
-    QString getProjectName() const;
-    QString getProjectNumber() const;
-    QString getSourceDir() const;
-    bool scanRecursively() const;
-    QString getDestinationDir() const;
-
-    void setProjectName(const QString &name);
-    void setProjectNumber(const QString &num);
-    void setSourceDir(const QString &dir);
-    void setRecursiveScan(bool enable);
-    void setDestinationDir(const QString &dir);
-
-  private slots:
-    void selectSourceDir(); 
-    void selectDestinationDir(); 
-    
-  private:
-    QLineEdit *m_projName;
-    QLineEdit *m_projNumber;
-    QLineEdit *m_sourceDir;
-    QLineEdit *m_destDir;
-    QCheckBox *m_recursive;
-    QPushButton *m_srcSelectDir;
-    QPushButton *m_dstSelectDir;
-};
-
-class Step2 : public QWidget
-{
-  public:
-    Step2(QWidget *parent);
-    bool crossReferencingEnabled() const;
-    void enableCrossReferencing();
-
-    bool extractAll() const;
-    bool crossReferencing() const;
-    OptLang optimizeFor() const;
-
-    void setExtractAll(bool enable);
-    void setCrossReferencing(bool enable);
-    void setOptimizeFor(OptLang lang);
-
-  private:
-    QButtonGroup *m_extractMode;
-    QButtonGroup *m_optimizeLang;
-    QCheckBox *m_crossRef;
-};
-
-class Step3 : public QWidget
-{
-    Q_OBJECT
-
-  public:
-    Step3(QWidget *parent);
-
-    bool htmlEnabled() const;
-    bool latexEnabled() const;
-    bool manEnabled() const;
-    bool rtfEnabled() const;
-    bool xmlEnabled() const;
-    bool searchEnabled() const;
-    HtmlStyle htmlStyle() const;
-    TexStyle texStyle() const;
-
-    void setHtmlEnabled(bool);
-    void setLatexEnabled(bool);
-    void setManEnabled(bool);
-    void setRtfEnabled(bool);
-    void setXmlEnabled(bool);
-    void setSearchEnabled(bool);
-    void setHtmlStyle(HtmlStyle);
-    void setTexStyle(TexStyle);
-
-
-  private slots:
-    void latexStateChange(int state);
-    void htmlStateChange(int state);
-
-  private:
-    QButtonGroup *m_texOptions;
-    QVBox *m_texOptionBox;
-    QButtonGroup *m_htmlOptions;
-    QVBox *m_htmlOptionBox;
-    QCheckBox *m_htmlEnabled;
-    QCheckBox *m_latexEnabled;
-    QCheckBox *m_manEnabled;
-    QCheckBox *m_rtfEnabled;
-    QCheckBox *m_xmlEnabled;
-    QCheckBox *m_searchEnabled;
-};
-
-class Step4 : public QWidget
-{
-    Q_OBJECT
-
-  public:
-    Step4(QWidget *parent);
-    //void disableCallGraphs();
-    //bool callGraphEnabled() const;
-
-    DiagramMode diagramMode() const;
-    bool classDiagram() const;
-    bool collaborationDiagram() const;
-    bool includeGraph() const;
-    bool includedByGraph() const;
-    bool inheritanceGraph() const;
-    bool callGraph() const;
-
-    void setDiagramMode(DiagramMode mode);
-    void setClassDiagram(bool enable);
-    void setCollaborationDiagram(bool enable);
-    void setIncludeGraph(bool enable);
-    void setIncludedByGraph(bool enable);
-    void setInheritanceGraph(bool enable);
-    void setCallGraph(bool enable);
-
-  private slots:
-    void diagramModeChanged(int);
-    
-  private:
-    QButtonGroup *m_diagramMode;
-    QVBox *m_dotOptions;
-    QCheckBox *m_dotClass;
-    QCheckBox *m_dotCollaboration;
-    QCheckBox *m_dotInclude;
-    QCheckBox *m_dotIncludedBy;
-    QCheckBox *m_dotInheritance;
-    QCheckBox *m_dotCall;
-};
 
-class Wizard : public QTabDialog
+class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
   public:
-    Wizard(QWidget *parent);
-    //void disableCallGraphs();
-
-    // step1
-    QString getProjectName() const    { return m_step1->getProjectName(); }
-    QString getProjectNumber() const  { return m_step1->getProjectNumber(); }
-    QString getSourceDir() const      { return m_step1->getSourceDir(); }
-    bool scanRecursively() const      { return m_step1->scanRecursively(); }
-    QString getDestinationDir() const { return m_step1->getDestinationDir(); }
-
-    void setProjectName(const QString &name)   { m_step1->setProjectName(name); }
-    void setProjectNumber(const QString &num)  { m_step1->setProjectNumber(num); }
-    void setSourceDir(const QString &dir)      { m_step1->setSourceDir(dir); }
-    void setRecursiveScan(bool enable)         { m_step1->setRecursiveScan(enable); }
-    void setDestinationDir(const QString &dir) { m_step1->setDestinationDir(dir); }
-
-    // step2
-    bool extractAll() const       { return m_step2->extractAll();       }
-    bool crossReferencing() const { return m_step2->crossReferencing(); }
-    OptLang optimizeFor() const   { return m_step2->optimizeFor();      }
-
-    void setExtractAll(bool enable)       { m_step2->setExtractAll(enable);       }
-    void setCrossReferencing(bool enable) { m_step2->setCrossReferencing(enable); }
-    void setOptimizeFor(OptLang lang)     { m_step2->setOptimizeFor(lang);        }
-    
-    // step3
-    bool htmlEnabled() const      { return m_step3->htmlEnabled();   }
-    bool latexEnabled() const     { return m_step3->latexEnabled();  }
-    bool manEnabled() const       { return m_step3->manEnabled();    }
-    bool rtfEnabled() const       { return m_step3->rtfEnabled();    }
-    bool xmlEnabled() const       { return m_step3->xmlEnabled();    }
-    bool searchEnabled() const    { return m_step3->searchEnabled(); }
-    HtmlStyle htmlStyle() const   { return m_step3->htmlStyle();     }
-    TexStyle texStyle() const     { return m_step3->texStyle();      }
-
-    void setHtmlEnabled(bool enable)   { m_step3->setHtmlEnabled(enable);   }
-    void setLatexEnabled(bool enable)  { m_step3->setLatexEnabled(enable);  }
-    void setManEnabled(bool enable)    { m_step3->setManEnabled(enable);    }
-    void setRtfEnabled(bool enable)    { m_step3->setRtfEnabled(enable);    }
-    void setXmlEnabled(bool enable)    { m_step3->setXmlEnabled(enable);    }
-    void setSearchEnabled(bool enable) { m_step3->setSearchEnabled(enable); }
-    void setHtmlStyle(HtmlStyle style) { m_step3->setHtmlStyle(style);      }
-    void setTexStyle(TexStyle style)   { m_step3->setTexStyle(style);       }
-
-    // step4
-    DiagramMode diagramMode() const   { return m_step4->diagramMode(); }
-    bool classDiagram() const         { return m_step4->classDiagram(); }
-    bool collaborationDiagram() const { return m_step4->collaborationDiagram(); }
-    bool includeGraph() const         { return m_step4->includeGraph(); }
-    bool includedByGraph() const      { return m_step4->includedByGraph(); }
-    bool inheritanceGraph() const     { return m_step4->inheritanceGraph(); }
-    bool callGraph() const            { return m_step4->callGraph(); }
-    
-    void setDiagramMode(DiagramMode mode)     { m_step4->setDiagramMode(mode); }
-    void setClassDiagram(bool enable)         { m_step4->setClassDiagram(enable); }
-    void setCollaborationDiagram(bool enable) { m_step4->setCollaborationDiagram(enable); }
-    void setIncludeGraph(bool enable)         { m_step4->setIncludeGraph(enable); }
-    void setIncludedByGraph(bool enable)      { m_step4->setIncludedByGraph(enable); }
-    void setInheritanceGraph(bool enable)     { m_step4->setInheritanceGraph(enable); }
-    void setCallGraph(bool enable)            { m_step4->setCallGraph(enable); }
-
-  private:
-    Step1 *m_step1;
-    Step2 *m_step2;
-    Step3 *m_step3;
-    Step4 *m_step4;
-};
-
-class MainWidget : public QMainWindow
-{
-    Q_OBJECT
-  public:
-    MainWidget(QWidget *parent=0);
-   ~MainWidget();
-    void loadConfigFromFile(const QString &);
+    static MainWindow &instance();
+    void loadConfigFromFile(const QString &fileName);
+    void loadSettings();
+    void saveSettings();
+    void closeEvent(QCloseEvent *event);
+    QString configFileName() const { return m_fileName; }
+    void updateTitle();
+
+  public slots:
+    void manual();
+    void about();
+    void openConfig();
+    bool saveConfig();
+    bool saveConfigAs();
+    void makeDefaults();
+    void resetToDefaults();
+    void selectTab(int);
+    void quit();
 
   private slots:
-    void launchWizard();
-    void launchExpert();
-    void loadConfigFile();
+    void openRecent(QAction *action);
     void selectWorkingDir();
-    void updateRunnable(const QString &newDirName);
-    void saveDefaults();
-    void saveConfigFile();
+    void updateWorkingDir();
     void runDoxygen();
     void readStdout();
     void runComplete();
-    void about();
-    void manual();
-    void resetConfig();
-    void openRecent(int);
-    void quit();
+    void showHtmlOutput();
     void saveLog();
+    void showSettings();
+    void configChanged();
     
   private:
-    void setConfigSaved(bool);
-    void addRecentFile(const QString &);
-
-    QPushButton *m_wizard;
-    QPushButton *m_expert;
-    QPushButton *m_load;
-    QPushButton *m_save;
-    QPushButton *m_defaults;
-    QLineEdit   *m_workingDir;
+    MainWindow();
+    void saveConfig(const QString &fileName);
+    void addRecentFile(const QString &fileName);
+    void updateConfigFileName(const QString &fileName);
+    void setWorkingDir(const QString &dirName);
+    void updateLaunchButtonState();
+    bool discardUnsavedChanges(bool saveOption=true);
+
+    QLineEdit *m_workingDir;
     QPushButton *m_selWorkingDir;
     QPushButton *m_run;
     QPushButton *m_saveLog;
-    QLabel      *m_runStatus;
-    QProcess    *m_runProcess;
-    QLabel      *m_saveStatus;
-    QLabel      *m_outputHeading;
-    QTextEdit   *m_outputLog;
-    QTimer      *m_timer;
-    QSettings    m_settings;
-    QPopupMenu  *m_recentMenu;
-    bool m_configSaved;
+    QPushButton *m_launchHtml;
+    QPushButton *m_launchPdf;
+    QTextEdit *m_outputLog;
+    QLabel *m_runStatus;
+    Expert *m_expert;
+    Wizard *m_wizard;
+    QString m_fileName;
+    QSettings m_settings;
+    QMenu *m_recentMenu;
+    QStringList m_recentFiles;
+    QProcess *m_runProcess;
+    QTimer *m_timer;
     bool m_running;
-    QString      m_configFileName;
-    QStringList  m_recentFiles;
+    bool m_modified;
 };
 
 #endif
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index 5d26a83..2967d29 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -1,64 +1,23 @@
-#
-# 
-#
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby
-# granted. No representations are made about the suitability of this software
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#
-# project file for the doxywizard project
-
-# special template configuration file because we use flex
-TEMPLATE    =	doxywizard.t
-
-# executable to generate
-TARGET      =   ../../bin/doxywizard
-
-# we do not use the debug features in this copy of portable.cpp
-DEFINES     = NODEBUG
-
-# configure options
-CONFIG      =	qt warn_on $extraopts
-
-# header file for the project
-HEADERS     =	doxywizard.h \
-                version.h \
-                inputstring.h \
-                inputbool.h \
-		inputstrlist.h \
-		inputint.h \
-                expert.h  \
-                config.h \
-                portable.h 
-
-# source flle for the project
-SOURCES     =	doxywizard.cpp \
-                version.cpp \
-		inputstring.cpp \
-		inputbool.cpp \
-		inputstrlist.cpp \
-		inputint.cpp \
-                expert.cpp \ 
-                config.cpp \
-                portable.cpp
-
-# where to put the objects
-OBJECTS_DIR =   obj
-
-# where to put the intermediate moc stuff
-MOC_DIR     =   moc
-
-# extra C++ compiler options
-INCLUDEPATH             += ../../src
-win32:TMAKE_CXXFLAGS    += -DQT_DLL
-win32:INCLUDEPATH       += .
-macosx-c++:LIBS+=-framework CoreFoundation -framework ApplicationServices
-
-# extra link options
-win32:TMAKE_LFLAGS = /NODEFAULTLIB:msvcrt.lib doxywizard.res
-win32:TMAKE_LIBS = $(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\qt-mt332.lib user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib 
-win32:TMAKE_LIBS_QT = 
-
+######################################################################
+# Automatically generated by qmake (2.01a) zo okt 19 12:50:02 2008
+######################################################################
+
+TEMPLATE     = app
+DESTDIR      = ../../bin
+TARGET       = 
+DEPENDPATH  += .
+INCLUDEPATH += .
+QT          += xml
+CONFIG      += $extraopts
+OBJECTS_DIR  = obj
+MOC_DIR      = moc
+RCC_DIR      = rcc
+DEFINES     += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
+
+# Input
+HEADERS     += doxywizard.h version.h expert.h config.h helplabel.h \
+               inputbool.h inputstring.h inputint.h inputstrlist.h wizard.h
+SOURCES     += doxywizard.cpp ../../src/version.cpp expert.cpp wizard.cpp \
+               inputbool.cpp inputstring.cpp inputint.cpp inputstrlist.cpp
+LEXSOURCES  += config.l
+RESOURCES   += doxywizard.qrc
diff --git a/addon/doxywizard/doxywizard.qrc b/addon/doxywizard/doxywizard.qrc
new file mode 100644
index 0000000..dd23c5d
--- /dev/null
+++ b/addon/doxywizard/doxywizard.qrc
@@ -0,0 +1,10 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file alias="config.xml">../../src/config.xml</file>
+  <file>images/add.png</file>
+  <file>images/del.png</file>
+  <file>images/file.png</file>
+  <file>images/folder.png</file>
+  <file>images/refresh.png</file>
+</qresource>
+</RCC>
diff --git a/addon/doxywizard/doxywizard.res b/addon/doxywizard/doxywizard.res
deleted file mode 100755
index 283b8bb..0000000
--- a/addon/doxywizard/doxywizard.res
+++ /dev/null
diff --git a/addon/doxywizard/doxywizard.t b/addon/doxywizard/doxywizard.t
deleted file mode 100644
index f094b7d..0000000
--- a/addon/doxywizard/doxywizard.t
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# 
-#
-# Copyright (C) 1997-2008 by Dimitri van Heesch.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation under the terms of the GNU General Public License is hereby
-# granted. No representations are made about the suitability of this software
-# for any purpose. It is provided "as is" without express or implied warranty.
-# See the GNU General Public License for more details.
-#!
-#! wizard.t: This is a custom template for building doxywizard
-#!
-#$ IncludeTemplate("app.t");
-
-LEX     =   flex
-YACC    =   bison
-
-#${
-sub GenerateDep {
-    my($obj,$src,$dep) = @_;
-    my(@objv,$srcv,$i,$s,$o,$d,$c);
-    @objv = split(/\s+/,$obj);
-    @srcv = split(/\s+/,$src);
-    for $i ( 0..$#objv ) {
-        $s = $srcv[$i];
-        $o = $objv[$i];
-        next if $s eq "";
-        $text .= $o . ": " . $s;
-	$text .= " ${linebreak}\n\t\t" . $dep if $dep ne "";
-        if ( $moc_output{$s} ne "" ) {
-            $text .= " ${linebreak}\n\t\t" . $moc_output{$s};
-        }
-        $d = &make_depend($s);
-        $text .= " ${linebreak}\n\t\t" . $d if $d ne "";
-	$text .= "\n";
-    }
-    chop $text;
-}
-#$} 
-
-####################
-
-#$ GenerateDep("config.cpp","config.l");
-	$(LEX) -PconfigYY -t config.l >config.cpp 
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index ce0760e..1e0adb1 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -1,276 +1,553 @@
-/******************************************************************************
- *
- * 
- *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <qmainwindow.h>
-#include <qpopupmenu.h>
-#include <qfileinfo.h>
-#include <qmenubar.h>
-#include <qstatusbar.h>
-#include <qfiledialog.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qtabwidget.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qscrollview.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-
 #include "expert.h"
 #include "inputbool.h"
 #include "inputstring.h"
-#include "inputstrlist.h"
 #include "inputint.h"
+#include "inputstring.h"
+#include "inputstrlist.h"
+#include <QtGui>
+#include <QtXml>
 #include "config.h"
 #include "version.h"
 
-//-------------------------------------------------------------------------
+#undef  SA
+#define SA(x) QString::fromAscii(x)
+
+static QString convertToComment(const QString &s)
+{
+  if (s.isEmpty()) 
+  {
+    return QString();
+  }
+  else
+  {
+    return SA("# ")+
+           s.trimmed().replace(SA("\n"),SA("\n# "))+
+           SA("\n");
+  }
+}
+
+//------------------------------------------------------------------------------------
 
-Expert::Expert( QWidget *parent ) : QTabDialog( parent )
+Expert::Expert()
 {
+  m_treeWidget = new QTreeWidget;
+  m_treeWidget->setColumnCount(1);
+  m_topicStack = new QStackedWidget;
 
-  m_dependencies = new QDict< QList<IInput> >(257);
-  m_dependencies->setAutoDelete(TRUE);
-  m_inputWidgets = new QDict< IInput >;
-  m_switches = new QDict< QObject >;
-  m_changed = FALSE;
-
-  setHelpButton();
-  
-  QListIterator<ConfigOption> options = Config::instance()->iterator();
-  QVBoxLayout *pageLayout = 0;
-  QFrame *page = 0;
-  ConfigOption *option = 0;
-  for (options.toFirst();(option=options.current());++options)
+  QFile file(SA(":/config.xml"));
+  QString err;
+  int errLine,errCol;
+  QDomDocument configXml;
+  if (file.open(QIODevice::ReadOnly))
   {
-    switch(option->kind())
+    if (!configXml.setContent(&file,false,&err,&errLine,&errCol))
     {
-      case ConfigOption::O_Info:
-        {
-          if (pageLayout) pageLayout->addStretch(1);
-          QScrollView *view = new QScrollView(this);
-          view->setVScrollBarMode(QScrollView::Auto);
-          view->setHScrollBarMode(QScrollView::AlwaysOff);
-          view->setResizePolicy(QScrollView::AutoOneFit);
-          page = new QFrame( view->viewport(), option->name() );
-          pageLayout = new QVBoxLayout(page);
-          pageLayout->setMargin(10);
-          view->addChild(page);
-          addTab(view,option->name());
-          QWhatsThis::add(page, option->docs().simplifyWhiteSpace() );
-          QToolTip::add(page, option->docs() );
-        }
-        break;
-      case ConfigOption::O_String:
-        {
-          ASSERT(page!=0);
-          InputString::StringMode sm=InputString::StringFree;
-          switch(((ConfigString *)option)->widgetType())
-          {
-            case ConfigString::String: sm=InputString::StringFree; break;
-            case ConfigString::File:   sm=InputString::StringFile; break;
-            case ConfigString::Dir:    sm=InputString::StringDir;  break;
-          }
-          InputString *inputString = new InputString( 
-                         option->name(),                        // name
-                         page,                                  // widget
-                         *((ConfigString *)option)->valueRef(), // variable 
-                         sm                                     // type
-                       ); 
-          pageLayout->addWidget(inputString);
-          QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace() );
-          QToolTip::add(inputString,option->docs());
-          connect(inputString,SIGNAL(changed()),SLOT(changed()));
-          m_inputWidgets->insert(option->name(),inputString);
-          addDependency(m_switches,option->dependsOn(),option->name());
-        }
-        break;
-      case ConfigOption::O_Enum:
-        {
-          ASSERT(page!=0);
-          InputString *inputString = new InputString( 
-                         option->name(),                        // name
-                         page,                                  // widget
-                         *((ConfigEnum *)option)->valueRef(),   // variable 
-                         InputString::StringFixed               // type
-                       ); 
-          pageLayout->addWidget(inputString);
-          QStrListIterator sli=((ConfigEnum *)option)->iterator();
-          for (sli.toFirst();sli.current();++sli)
-          {
-            inputString->addValue(sli.current());
-          }
-          inputString->init();
-          QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace() );
-          QToolTip::add(inputString, option->docs());
-          connect(inputString,SIGNAL(changed()),SLOT(changed()));
-          m_inputWidgets->insert(option->name(),inputString);
-          addDependency(m_switches,option->dependsOn(),option->name());
-        }
-        break;
-      case ConfigOption::O_List:
-        {
-          ASSERT(page!=0);
-          InputStrList::ListMode lm=InputStrList::ListString;
-          switch(((ConfigList *)option)->widgetType())
-          {
-            case ConfigList::String:     lm=InputStrList::ListString;  break;
-            case ConfigList::File:       lm=InputStrList::ListFile;    break;
-            case ConfigList::Dir:        lm=InputStrList::ListDir;     break;
-            case ConfigList::FileAndDir: lm=InputStrList::ListFileDir; break;
-          }
-          InputStrList *inputStrList = new InputStrList(
-                          option->name(),                         // name
-                          page,                                   // widget
-                          *((ConfigList *)option)->valueRef(),    // variable
-                          lm                                      // type
-                        );
-          pageLayout->addWidget(inputStrList);
-          QWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace() );
-          QToolTip::add(inputStrList, option->docs());
-          connect(inputStrList,SIGNAL(changed()),SLOT(changed()));
-          m_inputWidgets->insert(option->name(),inputStrList);
-          addDependency(m_switches,option->dependsOn(),option->name());
-        }
-        break;
-        break;
-      case ConfigOption::O_Bool:
-        {
-          ASSERT(page!=0);
-          InputBool *inputBool = new InputBool(
-                          option->name(),                         // name
-                          page,                                   // widget
-                          *((ConfigBool *)option)->valueRef()     // variable
-                        );
-          pageLayout->addWidget(inputBool);
-          QWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace() );
-          QToolTip::add(inputBool, option->docs() );
-          connect(inputBool,SIGNAL(changed()),SLOT(changed()));
-          m_inputWidgets->insert(option->name(),inputBool);
-          addDependency(m_switches,option->dependsOn(),option->name());
-        }
-        break;
-      case ConfigOption::O_Int:
-        {
-          ASSERT(page!=0);
-          InputInt *inputInt = new InputInt(
-                          option->name(),                         // name
-                          page,                                   // widget
-                          *((ConfigInt *)option)->valueRef(),     // variable
-                          ((ConfigInt *)option)->minVal(),        // min value
-                          ((ConfigInt *)option)->maxVal()         // max value
-                        );
-          pageLayout->addWidget(inputInt);
-          QWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace() );
-          QToolTip::add(inputInt, option->docs() );
-          connect(inputInt,SIGNAL(changed()),SLOT(changed()));
-          m_inputWidgets->insert(option->name(),inputInt);
-          addDependency(m_switches,option->dependsOn(),option->name());
-        }
-        break;
-      case ConfigOption::O_Obsolete:
-        break;
-    } 
+      QString msg = tr("Error parsing internal config.xml at line %1 column %2.\n%3").
+                  arg(errLine).arg(errCol).arg(err);
+      QMessageBox::warning(this, tr("Error"), msg);
+      exit(1);
+    }
   }
-  if (pageLayout) pageLayout->addStretch(1);
+  m_rootElement = configXml.documentElement();
+
+  createTopics(m_rootElement);
+  m_helper = new QTextEdit;
+  m_helper->setReadOnly(true);
+  m_splitter = new QSplitter(Qt::Vertical);
+  m_splitter->addWidget(m_treeWidget);
+  m_splitter->addWidget(m_helper);
+
+  QWidget *rightSide = new QWidget;
+  QGridLayout *grid = new QGridLayout(rightSide);
+  m_prev = new QPushButton(tr("Previous"));
+  m_prev->setEnabled(false);
+  m_next = new QPushButton(tr("Next"));
+  grid->addWidget(m_topicStack,0,0,1,2);
+  grid->addWidget(m_prev,1,0,Qt::AlignLeft);
+  grid->addWidget(m_next,1,1,Qt::AlignRight);
+  grid->setColumnStretch(0,1);
+  grid->setRowStretch(0,1);
+
+  addWidget(m_splitter);
+  addWidget(rightSide);
+  connect(m_next,SIGNAL(clicked()),SLOT(nextTopic()));
 
-  QDictIterator<QObject> di(*m_switches);
-  QObject *obj = 0;
-  for (di.toFirst();(obj=di.current());++di)
+  connect(m_prev,SIGNAL(clicked()),SLOT(prevTopic()));
+}
+
+Expert::~Expert()
+{
+  QHashIterator<QString,Input*> i(m_options);
+  while (i.hasNext()) 
   {
-    connect(obj,SIGNAL(toggle(const char *,bool)),SLOT(toggle(const char *,bool)));
-    // UGLY HACK: assumes each item depends on a boolean without checking!
-    emit toggle(di.currentKey(),((InputBool *)obj)->getState());
+    i.next();
+    delete i.value();
   }
+}
 
-  connect(this,SIGNAL(helpButtonPressed()),this,SLOT(handleHelp()));
-  
+void Expert::createTopics(const QDomElement &rootElem)
+{
+  QList<QTreeWidgetItem*> items;
+  QDomElement childElem = rootElem.firstChildElement();
+  while (!childElem.isNull())
+  {
+    if (childElem.tagName()==SA("group"))
+    {
+      QString name = childElem.attribute(SA("name"));
+      items.append(new QTreeWidgetItem((QTreeWidget*)0,QStringList(name)));
+      QWidget *widget = createTopicWidget(childElem);
+      m_topics[name] = widget;
+      m_topicStack->addWidget(widget);
+    }
+    childElem = childElem.nextSiblingElement();
+  }
+  m_treeWidget->setHeaderLabels(QStringList() << SA("Topics"));
+  m_treeWidget->insertTopLevelItems(0,items);
+  connect(m_treeWidget,
+          SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
+          this,
+          SLOT(activateTopic(QTreeWidgetItem *,QTreeWidgetItem *)));
 }
 
-Expert::~Expert()
+
+QWidget *Expert::createTopicWidget(QDomElement &elem)
+{
+  QScrollArea *area   = new QScrollArea;
+  QWidget     *topic  = new QWidget;
+  QGridLayout *layout = new QGridLayout(topic);
+  QDomElement child   = elem.firstChildElement();
+  int row=0;
+  while (!child.isNull())
+  {
+    QString type = child.attribute(SA("type"));
+    if (type==SA("bool"))
+    {
+      InputBool *boolOption = 
+          new InputBool(
+            layout,row,
+            child.attribute(SA("id")),
+            child.attribute(SA("defval"))==SA("1"),
+            child.attribute(SA("docs"))
+           );
+      m_options.insert(
+          child.attribute(SA("id")),
+          boolOption
+         );
+      connect(boolOption,SIGNAL(showHelp(Input*)),SLOT(showHelp(Input*)));
+      connect(boolOption,SIGNAL(changed()),SIGNAL(changed()));
+    }
+    else if (type==SA("string"))
+    {
+      InputString::StringMode mode;
+      QString format = child.attribute(SA("format"));
+      if (format==SA("dir"))
+      {
+        mode = InputString::StringDir;
+      }
+      else if (format==SA("file"))
+      {
+        mode = InputString::StringFile;
+      }
+      else // format=="string"
+      {
+        mode = InputString::StringFree;
+      }
+      InputString *stringOption = 
+          new InputString(
+            layout,row,
+            child.attribute(SA("id")),
+            child.attribute(SA("defval")),
+            mode,
+            child.attribute(SA("docs"))
+           );
+      m_options.insert(
+          child.attribute(SA("id")),
+          stringOption
+         );
+      connect(stringOption,SIGNAL(showHelp(Input*)),SLOT(showHelp(Input*)));
+      connect(stringOption,SIGNAL(changed()),SIGNAL(changed()));
+    }
+    else if (type==SA("enum"))
+    {
+      InputString *enumList = new InputString(
+            layout,row,
+            child.attribute(SA("id")),
+            child.attribute(SA("defval")),
+            InputString::StringFixed,
+            child.attribute(SA("docs"))
+           );
+      QDomElement enumVal = child.firstChildElement();
+      while (!enumVal.isNull())
+      {
+        enumList->addValue(enumVal.attribute(SA("name")));
+        enumVal = enumVal.nextSiblingElement();
+      }
+      enumList->setDefault();
+
+      m_options.insert(child.attribute(SA("id")),enumList);
+      connect(enumList,SIGNAL(showHelp(Input*)),SLOT(showHelp(Input*)));
+      connect(enumList,SIGNAL(changed()),SIGNAL(changed()));
+    }
+    else if (type==SA("int"))
+    {
+      InputInt *intOption = 
+          new InputInt(
+            layout,row,
+            child.attribute(SA("id")),
+            child.attribute(SA("defval")).toInt(),
+            child.attribute(SA("minval")).toInt(),
+            child.attribute(SA("maxval")).toInt(),
+            child.attribute(SA("docs"))
+          );
+      m_options.insert(
+          child.attribute(SA("id")),
+          intOption
+        );
+      connect(intOption,SIGNAL(showHelp(Input*)),SLOT(showHelp(Input*)));
+      connect(intOption,SIGNAL(changed()),SIGNAL(changed()));
+    }
+    else if (type==SA("list"))
+    {
+      InputStrList::ListMode mode;
+      QString format = child.attribute(SA("format"));
+      if (format==SA("dir"))
+      {
+        mode = InputStrList::ListDir;
+      }
+      else if (format==SA("file"))
+      {
+        mode = InputStrList::ListFile;
+      }
+      else if (format==SA("filedir"))
+      {
+        mode = InputStrList::ListFileDir;
+      }
+      else // format=="string"
+      {
+        mode = InputStrList::ListString;
+      }
+      QStringList sl;
+      QDomElement listVal = child.firstChildElement();
+      while (!listVal.isNull())
+      {
+        sl.append(listVal.attribute(SA("name")));
+        listVal = listVal.nextSiblingElement();
+      }
+      InputStrList *listOption = 
+          new InputStrList(
+            layout,row,
+            child.attribute(SA("id")),
+            sl,
+            mode,
+            child.attribute(SA("docs"))
+          );
+      m_options.insert(
+          child.attribute(SA("id")),
+          listOption
+        );
+      connect(listOption,SIGNAL(showHelp(Input*)),SLOT(showHelp(Input*)));
+      connect(listOption,SIGNAL(changed()),SIGNAL(changed()));
+    }
+    else if (type==SA("obsolete"))
+    {
+      // ignore
+    }
+    else // should not happen
+    {
+      printf("Unsupported type %s\n",qPrintable(child.attribute(SA("type"))));
+    }
+    child = child.nextSiblingElement();
+  }
+
+  // compute dependencies between options
+  child = elem.firstChildElement();
+  while (!child.isNull())
+  {
+    QString dependsOn = child.attribute(SA("depends"));
+    QString id        = child.attribute(SA("id"));
+    if (!dependsOn.isEmpty())
+    {
+       Input *parentOption = m_options[dependsOn];
+       Input *thisOption   = m_options[id];
+       Q_ASSERT(parentOption);
+       Q_ASSERT(thisOption);
+       if (parentOption && thisOption)
+       {
+         //printf("Adding dependency '%s' (%p)->'%s' (%p)\n",
+         //  qPrintable(dependsOn),parentOption,
+         //  qPrintable(id),thisOption);
+         parentOption->addDependency(thisOption);
+       }
+    }
+    child = child.nextSiblingElement();
+  }
+
+  // set initial dependencies
+  QHashIterator<QString,Input*> i(m_options);
+  while (i.hasNext()) 
+  {
+    i.next();
+    if (i.value())
+    {
+      i.value()->updateDependencies();
+    }
+  }
+
+  layout->setRowStretch(row,1);
+  layout->setColumnStretch(1,2);
+  layout->setSpacing(5);
+  topic->setLayout(layout);
+  area->setWidget(topic);
+  area->setWidgetResizable(true);
+  return area;
+}
+
+void Expert::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *)
+{
+  if (item)
+  {
+    QWidget *w = m_topics[item->text(0)];
+    m_topicStack->setCurrentWidget(w);
+    m_prev->setEnabled(m_topicStack->currentIndex()!=0); 
+    m_next->setEnabled(m_topicStack->currentIndex()!=m_topicStack->count()-1); 
+  }
+}
+
+void Expert::loadSettings(QSettings *s)
+{
+  QHashIterator<QString,Input*> i(m_options);
+  while (i.hasNext()) 
+  {
+    i.next();
+    QVariant var = s->value(SA("config/")+i.key());
+    //printf("Loading key %s: type=%d\n",qPrintable(i.key()),var.type());
+    if (i.value())
+    {
+      i.value()->value() = var;
+      i.value()->update();
+    }
+  }
+}
+
+void Expert::saveSettings(QSettings *s)
 {
-  delete m_dependencies;
-  delete m_inputWidgets;
-  delete m_switches;
+  QHashIterator<QString,Input*> i(m_options);
+  while (i.hasNext()) 
+  {
+    i.next();
+    if (i.value())
+    {
+      s->value(SA("config/")+i.key(),i.value()->value());
+    }
+  }
 }
 
-void Expert::handleHelp()
+void Expert::loadConfig(const QString &fileName)
 {
-  QWhatsThis::enterWhatsThisMode();
+  //printf("Expert::loadConfig(%s)\n",qPrintable(fileName));
+  parseConfig(fileName,m_options);
 }
 
-void Expert::addDependency(QDict<QObject> *switches,
-                               const QCString &dep,const QCString &name)
+void Expert::saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec,
+                       bool brief)
 {
-  if (!dep.isEmpty())
+  // write group header
+  t << endl;
+  t << "#---------------------------------------------------------------------------" << endl;
+  t << "# " << elem.attribute(SA("docs")) << endl;
+  t << "#---------------------------------------------------------------------------" << endl;
+
+  // write options...
+  QDomElement childElem = elem.firstChildElement();
+  while (!childElem.isNull())
   {
-    //printf("Expert::addDependency(%s)\n",name.data());
-    IInput *parent = m_inputWidgets->find(dep);
-    ASSERT(parent!=0);
-    IInput *child = m_inputWidgets->find(name);
-    ASSERT(child!=0);
-    if (switches->find(dep)==0)
+    QString type = childElem.attribute(SA("type"));
+    QString name = childElem.attribute(SA("id"));
+    QHash<QString,Input*>::const_iterator i = m_options.find(name);
+    if (i!=m_options.end())
     {
-      switches->insert(dep,parent->qobject());
+      Input *option = i.value();
+      if (!brief)
+      {
+        t << endl;
+        t << convertToComment(childElem.attribute(SA("docs")));
+        t << endl;
+      }
+      t << name.leftJustified(23) << "= ";
+      if (option)
+      {
+        option->writeValue(t,codec);
+      }
+      t << endl;
     }
-    QList<IInput> *list = m_dependencies->find(dep);
-    if (list==0)
+    childElem = childElem.nextSiblingElement();
+  }
+
+}
+
+bool Expert::writeConfig(QTextStream &t,bool brief)
+{
+  if (!brief)
+  {
+    // write global header
+    t << "# Doxyfile " << versionString << endl << endl; // TODO: add version
+    t << "# This file describes the settings to be used by the documentation system\n";
+    t << "# doxygen (www.doxygen.org) for a project\n";
+    t << "#\n";
+    t << "# All text after a hash (#) is considered a comment and will be ignored\n";
+    t << "# The format is:\n";
+    t << "#       TAG = value [value, ...]\n";
+    t << "# For lists items can also be appended using:\n";
+    t << "#       TAG += value [value, ...]\n";
+    t << "# Values that contain spaces should be placed between quotes (\" \")\n";
+  }
+
+  QTextCodec *codec = 0;
+  Input *option = m_options[QString::fromAscii("DOXYFILE_ENCODING")];
+  if (option)
+  {
+    codec = QTextCodec::codecForName(option->value().toString().toAscii());
+    if (codec==0) // fallback: use UTF-8
     {
-      list = new QList<IInput>;
-      m_dependencies->insert(dep,list);
+      codec = QTextCodec::codecForName("UTF-8");
     }
-    list->append(child);
   }
+  QDomElement childElem = m_rootElement.firstChildElement();
+  while (!childElem.isNull())
+  {
+    saveTopic(t,childElem,codec,brief);
+    childElem = childElem.nextSiblingElement();
+  }
+  return true;
 }
 
-void Expert::toggle(const char *name,bool state)
+QByteArray Expert::saveInnerState () const
 {
-  QList<IInput> *inputs = m_dependencies->find(name);
-  ASSERT(inputs!=0);
-  IInput *input = inputs->first();
-  while (input)
+  return m_splitter->saveState();
+}
+
+bool Expert::restoreInnerState ( const QByteArray & state )
+{
+  return m_splitter->restoreState(state);
+}
+
+void Expert::showHelp(Input *option)
+{
+  m_helper->setText(
+           QString::fromAscii("<qt><b>")+option->id()+
+           QString::fromAscii("</b><br>")+
+           option->docs().
+           replace(QChar::fromAscii('\n'),QChar::fromAscii(' '))+
+           QString::fromAscii("<qt>")
+          );
+}
+
+void Expert::nextTopic()
+{
+  m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1);
+  m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1);
+  m_prev->setEnabled(m_topicStack->currentIndex()!=0);
+  m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex()));
+}
+
+void Expert::prevTopic()
+{
+  m_topicStack->setCurrentIndex(m_topicStack->currentIndex()-1);
+  m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1);
+  m_prev->setEnabled(m_topicStack->currentIndex()!=0);
+  m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex()));
+}
+
+void Expert::resetToDefaults()
+{
+  //printf("Expert::makeDefaults()\n");
+  QHashIterator<QString,Input*> i(m_options);
+  while (i.hasNext()) 
   {
-    input->setEnabled(state);
-    input = inputs->next();
+    i.next();
+    if (i.value())
+    {
+      i.value()->reset();
+    }
   }
 }
 
-void Expert::init()
+static bool stringVariantToBool(const QVariant &v)
+{
+  QString s = v.toString().toLower();
+  return s==QString::fromAscii("yes") || s==QString::fromAscii("true") || s==QString::fromAscii("1");
+} 
+
+static bool getBoolOption(
+    const QHash<QString,Input*>&model,const QString &name)
+{
+  Input *option = model[name];
+  Q_ASSERT(option!=0);
+  return stringVariantToBool(option->value());
+} 
+
+static QString getStringOption(
+    const QHash<QString,Input*>&model,const QString &name)
+{
+  Input *option = model[name];
+  Q_ASSERT(option!=0);
+  return option->value().toString();
+}
+
+
+bool Expert::htmlOutputPresent(const QString &workingDir) const
+{
+  bool generateHtml = getBoolOption(m_options,QString::fromAscii("GENERATE_HTML"));
+  if (!generateHtml) return false;
+  QString indexFile = getHtmlOutputIndex(workingDir);
+  QFileInfo fi(indexFile);
+  return fi.exists() && fi.isFile();
+}
+
+QString Expert::getHtmlOutputIndex(const QString &workingDir) const
 {
-  QDictIterator<IInput> di(*m_inputWidgets);
-  IInput *input = 0;
-  for (di.toFirst();(input=di.current());++di)
+  QString outputDir = getStringOption(m_options,QString::fromAscii("OUTPUT_DIRECTORY"));
+  QString htmlOutputDir = getStringOption(m_options,QString::fromAscii("HTML_OUTPUT"));
+  //printf("outputDir=%s\n",qPrintable(outputDir));
+  //printf("htmlOutputDir=%s\n",qPrintable(htmlOutputDir));
+  QString indexFile = workingDir;
+  if (QFileInfo(outputDir).isAbsolute()) // override
   {
-    input->init();
+    indexFile = outputDir;
   }
-  QDictIterator<QObject> dio(*m_switches);
-  QObject *obj = 0;
-  for (dio.toFirst();(obj=dio.current());++dio)
+  else // append
+  { 
+    indexFile += QString::fromAscii("/")+outputDir;
+  }
+  if (QFileInfo(htmlOutputDir).isAbsolute()) // override
+  {
+    indexFile = htmlOutputDir;
+  }
+  else // append
   {
-    connect(obj,SIGNAL(toggle(const char *,bool)),SLOT(toggle(const char *,bool)));
-    // UGLY HACK: assumes each item depends on a boolean without checking!
-    emit toggle(dio.currentKey(),((InputBool *)obj)->getState());
+    indexFile += QString::fromAscii("/")+htmlOutputDir;
   }
-  
+  indexFile+=QString::fromAscii("/index.html");
+  return indexFile;
 }
 
-void Expert::changed()
+bool Expert::pdfOutputPresent(const QString &workingDir) const
 {
-  m_changed=TRUE;  
+  bool generateLatex = getBoolOption(m_options,QString::fromAscii("GENERATE_LATEX"));
+  bool pdfLatex = getBoolOption(m_options,QString::fromAscii("USE_PDFLATEX"));
+  if (!generateLatex || !pdfLatex) return false;
+  QString latexOutput = getStringOption(m_options,QString::fromAscii("LATEX_OUTPUT"));
+  QString indexFile;
+  if (QFileInfo(latexOutput).isAbsolute())
+  {
+    indexFile = latexOutput+QString::fromAscii("/refman.pdf");
+  }
+  else
+  {
+    indexFile = workingDir+QString::fromAscii("/")+
+                latexOutput+QString::fromAscii("/refman.pdf");
+  }
+  QFileInfo fi(indexFile);
+  return fi.exists() && fi.isFile();
 }
 
diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h
index 7c92b4c..3372ae6 100644
--- a/addon/doxywizard/expert.h
+++ b/addon/doxywizard/expert.h
@@ -1,82 +1,64 @@
-/******************************************************************************
- *
- * 
- *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- */
-
 #ifndef EXPERT_H
 #define EXPERT_H
 
-#include <qtabdialog.h>
-#include <qlist.h>
-#include <qdict.h>
-
-class IInput;
-class QWidget;
-class QObject;
-class InputBool;
-class InputString;
-class InputStrList;
-class InputFile;
-class InputDir;
-class InputInt;
+#include <QSplitter>
+#include <QDomElement>
+#include <QHash>
 
-class ConfigWidget
-{
-  public:
-    enum Kind { Int, String, StrList, Bool };
-    
-    ConfigWidget(QWidget *w,Kind k) : m_widget(w), m_kind(k) {}
-    
-    Kind kind() const { return m_kind; }
-    
-    InputString *getString() const 
-    { return m_kind==String ? (InputString *)m_widget : 0; }
-    
-    InputBool *getBool() const 
-    { return m_kind==Bool ? (InputBool *)m_widget : 0; }
-    
-    InputStrList *getStrList() const 
-    { return m_kind==StrList ? (InputStrList *)m_widget : 0; }
-    
-    InputInt *getInt() const 
-    { return m_kind==Int ? (InputInt *)m_widget : 0; }
-    
-  private:
-    QWidget *m_widget;
-    Kind m_kind;
-};
+class QTreeWidget;
+class QTreeWidgetItem;
+class QStackedWidget;
+class QSettings;
+class QTextEdit;
+class QTextCodec;
+class QPushButton;
+class Input;
 
-class Expert : public QTabDialog
+class Expert : public QSplitter
 {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
-    Expert(QWidget *parent=0);
-    ~Expert();
-    void init();
-    void addDependency(QDict<QObject> *switches,
-                       const QCString &dep,const QCString &name);
-    bool hasChanged() const { return m_changed; }
+    Expert();
+   ~Expert();
+    void loadSettings(QSettings *);
+    void saveSettings(QSettings *);
+    void loadConfig(const QString &fileName);
+    bool writeConfig(QTextStream &t,bool brief);
+    QByteArray saveInnerState () const;
+    bool restoreInnerState ( const QByteArray & state );
+    const QHash<QString,Input*> &modelData() const { return m_options; }
+    void resetToDefaults();
+    bool htmlOutputPresent(const QString &workingDir) const;
+    bool pdfOutputPresent(const QString &workingDir) const;
+    QString getHtmlOutputIndex(const QString &workingDir) const;
+  
+  public slots:
+    void activateTopic(QTreeWidgetItem *,QTreeWidgetItem *);
+    QWidget *createTopicWidget(QDomElement &elem);
 
   private slots:
-    void toggle(const char *,bool);
-    void handleHelp();
+    void showHelp(Input *);
+    void nextTopic();
+    void prevTopic();
+
+  signals:
     void changed();
 
   private:
-    QDict<IInput>          *m_inputWidgets;
-    QDict< QList<IInput> > *m_dependencies;
-    QDict<QObject>         *m_switches;
-    bool                    m_changed;
+    void createTopics(const QDomElement &);
+    void saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec,bool brief);
+
+    QSplitter               *m_splitter;
+    QTextEdit               *m_helper;
+    QTreeWidget             *m_treeWidget;
+    QStackedWidget          *m_topicStack;
+    QHash<QString,QWidget *> m_topics;
+    QHash<QString,QObject *> m_optionWidgets;
+    QHash<QString,Input *>   m_options;
+    QPushButton             *m_next;
+    QPushButton             *m_prev;
+    QDomElement              m_rootElement;
 };
 
 #endif
diff --git a/addon/doxywizard/helplabel.h b/addon/doxywizard/helplabel.h
new file mode 100644
index 0000000..07e2932
--- /dev/null
+++ b/addon/doxywizard/helplabel.h
@@ -0,0 +1,33 @@
+#ifndef HELPLABEL_H
+#define HELPLABEL_H
+
+#include <QLabel>
+#include <QMenu>
+
+class HelpLabel : public QLabel
+{
+    Q_OBJECT
+  public:
+    HelpLabel(const QString &text) : QLabel(text) 
+    { setContextMenuPolicy(Qt::CustomContextMenu); 
+      connect(this,SIGNAL(customContextMenuRequested(const QPoint&)),
+              this,SLOT(showMenu(const QPoint&)));
+    }
+  signals:
+    void enter();
+    void reset();
+  private slots:
+    void showMenu(const QPoint &p)
+    {
+      QMenu menu(this);
+      QAction *a = menu.addAction(tr("Reset to default"));
+      if (menu.exec(mapToGlobal(p))==a)
+      {
+        reset();
+      }
+    }
+  protected:
+    void enterEvent( QEvent * event ) { enter(); QLabel::enterEvent(event); }
+};
+
+#endif
diff --git a/addon/doxywizard/images/add.png b/addon/doxywizard/images/add.png
new file mode 100644
index 0000000..30a7090
--- /dev/null
+++ b/addon/doxywizard/images/add.png
diff --git a/addon/doxywizard/images/del.png b/addon/doxywizard/images/del.png
new file mode 100644
index 0000000..ceb6a60
--- /dev/null
+++ b/addon/doxywizard/images/del.png
diff --git a/addon/doxywizard/images/file.png b/addon/doxywizard/images/file.png
new file mode 100644
index 0000000..e204f67
--- /dev/null
+++ b/addon/doxywizard/images/file.png
diff --git a/addon/doxywizard/images/folder.png b/addon/doxywizard/images/folder.png
new file mode 100644
index 0000000..2e420e0
--- /dev/null
+++ b/addon/doxywizard/images/folder.png
diff --git a/addon/doxywizard/images/refresh.png b/addon/doxywizard/images/refresh.png
new file mode 100644
index 0000000..fd6d565
--- /dev/null
+++ b/addon/doxywizard/images/refresh.png
diff --git a/addon/doxywizard/input.h b/addon/doxywizard/input.h
index 9f23e17..dd1773c 100644
--- a/addon/doxywizard/input.h
+++ b/addon/doxywizard/input.h
@@ -1,15 +1,34 @@
-#ifndef _INPUT_H
-#define _INPUT_H
+#ifndef INPUT_H
+#define INPUT_H
 
-class QObject;
+#include <QVariant>
 
-class IInput
+class QTextStream;
+class QTextCodec;
+
+class Input
 {
   public:
-    virtual ~IInput() {}
-    virtual void init() = 0;
+    enum Kind
+    {
+      Bool,
+      Int,
+      String,
+      StrList,
+      Obsolete
+    };
+    virtual ~Input() {}
+    virtual QVariant &value() = 0;
+    virtual void update() = 0;
+    virtual Kind kind() const = 0;
+    virtual QString docs() const = 0;
+    virtual QString id() const = 0;
+    virtual void addDependency(Input *option) = 0;
     virtual void setEnabled(bool) = 0;
-    virtual QObject *qobject() = 0;
+    virtual void updateDependencies() = 0;
+    virtual void reset() = 0;
+    virtual void writeValue(QTextStream &t,QTextCodec *codec) = 0;
 };
 
+
 #endif
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index fef7b9d..8dbedb1 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -13,47 +13,98 @@
  */
 
 #include "inputbool.h"
-//#if QT_VERSION >= 300
-//#include <qstylefactory.h>
-//#else
-//#include <qwindowsstyle.h>
-//#endif
-#include <qlayout.h>
+#include "helplabel.h"
+#include <QtGui>
 
-InputBool::InputBool( const QString & text, QWidget * parent, bool &flag )
-  : QWidget(parent), state(flag)
+InputBool::InputBool( QGridLayout *layout, int &row, 
+                      const QString &id, bool checked,
+                      const QString &docs )
+  : m_default(checked), m_docs(docs), m_id(id)
 {
-  QBoxLayout *layout = new QHBoxLayout(this);
-  cb = new QCheckBox(text,this);
-  layout->addWidget(cb);
-  layout->addStretch(10);
-
-//#if QT_VERSION >= 300
-//  QStyle *winStyle = QStyleFactory::create("windows");
-//#else
-//  QWindowsStyle *winStyle = new QWindowsStyle();
-//#endif
-  cb->setChecked( flag );
-//  if (winStyle) cb->setStyle( winStyle );
-  cb->setMinimumSize( sizeHint() );
+  m_lab = new HelpLabel(id);
+  m_cb = new QCheckBox;
+  layout->addWidget(m_lab,row, 0);
+  layout->addWidget(m_cb,row, 1);
+  m_enabled = true;
+  m_state=!checked; // force update
+  setValue(checked);
+  connect( m_cb, SIGNAL(toggled(bool)), SLOT(setValue(bool)) );
+  connect( m_lab, SIGNAL(enter()), SLOT(help()) );
+  connect( m_lab, SIGNAL(reset()), SLOT(reset()) );
+  row++;
+}
 
-  connect( cb, SIGNAL(toggled(bool)), SLOT(setState(bool)) );
+void InputBool::help()
+{
+  showHelp(this);
+}
 
-  layout->activate();
+void InputBool::setEnabled(bool b)
+{ 
+  m_enabled = b;
+  m_cb->setEnabled(b); 
+  updateDependencies();
 }
 
-void InputBool::init()
+void InputBool::updateDependencies()
 {
-  cb->setChecked(state);
+  for (int i=0;i<m_dependencies.count();i++)
+  {
+    m_dependencies[i]->setEnabled(m_enabled && m_state);
+  }
 }
 
-void InputBool::setState( bool s )
+void InputBool::setValue( bool s )
 {
-  if (state!=s) 
+  if (m_state!=s) 
   {
+    m_state=s;
+    updateDefault();
+    updateDependencies();
+    m_cb->setChecked( s );
+    m_value = m_state;
     emit changed();
-    emit toggle(cb->text(),s);
   }
-  state=s;
+}
+
+void InputBool::updateDefault()
+{
+  if (m_state==m_default)
+  {
+    m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
+  }
+  else
+  {
+    m_lab->setText(QString::fromAscii("<qt><font color='red'>")+m_id+QString::fromAscii("</font></qt>"));
+  }
+}
+
+QVariant &InputBool::value()
+{
+  return m_value;
+}
+
+void InputBool::update()
+{
+  QString v = m_value.toString().toLower();
+  m_state = (v==QString::fromAscii("yes")  || 
+             v==QString::fromAscii("true") || 
+             v==QString::fromAscii("1"));
+  m_cb->setChecked( m_state );
+  updateDefault();
+  updateDependencies();
+}
+
+void InputBool::reset()
+{
+  setValue(m_default);
+}
+
+void InputBool::writeValue(QTextStream &t,QTextCodec *codec)
+{
+  if (m_state) 
+    t << codec->fromUnicode(QString::fromAscii("YES")); 
+  else 
+    t << codec->fromUnicode(QString::fromAscii("NO"));
 }
 
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index 3101551..5ec8998 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -15,35 +15,55 @@
 #ifndef _INPUTBOOL_H
 #define _INPUTBOOL_H
 
-#include <qwidget.h>
-#include <qcheckbox.h>
-
 #include "input.h"
+#include <QObject>
 
-class PageWidget;
+class QCheckBox;
+class QGridLayout;
+class QLabel;
 
-class InputBool : public QWidget, /*QCheckBox,*/ public IInput
+class InputBool : public QObject, public Input
 {
   Q_OBJECT
 
   public:
-    InputBool( const QString &text, QWidget *parent, bool &flag );
-    ~InputBool(){};
-    void init();
-    void setEnabled(bool b) { cb->setEnabled(b); }
-    QObject *qobject() { return this; }
-    bool getState() const { return state; }
+    InputBool(QGridLayout *layout,int &row,const QString &id, 
+              bool enabled, const QString &docs );
+
+    // Input
+    QVariant &value();
+    void update();
+    Kind kind() const { return Bool; }
+    QString docs() const { return m_docs; }
+    QString id() const { return m_id; }
+    void addDependency(Input *option) { m_dependencies+=option; }
+    void setEnabled(bool);
+    void updateDependencies();
+    void writeValue(QTextStream &t,QTextCodec *codec);
+
+  public slots:
+    void reset();
+    void setValue(bool);
 
   signals:
     void changed();
-    void toggle(const char *,bool);
+    void toggle(QString,bool);
+    void showHelp(Input *);
 
   private slots:
-    void setState(bool);
+    void help();
 
   private:
-    bool &state;
-    QCheckBox *cb;
+    void updateDefault();
+    bool m_state;
+    bool m_default;
+    bool m_enabled;
+    QVariant m_value;
+    QCheckBox *m_cb;
+    QString m_docs;
+    QList<Input*> m_dependencies;
+    QString m_id;
+    QLabel *m_lab;
 
 };
 
diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp
index 69628d8..cb9846b 100644
--- a/addon/doxywizard/inputint.cpp
+++ b/addon/doxywizard/inputint.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -13,53 +13,84 @@
  */
 
 #include "inputint.h"
+#include "helplabel.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwindowsstyle.h>
-#include <qspinbox.h>
+#include <QtGui>
 
-InputInt::InputInt( const QString & label, QWidget *parent, int &val, int minVal,int maxVal )
-  : QWidget( parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
+InputInt::InputInt( QGridLayout *layout,int &row,
+                    const QString & id, 
+                    int defVal, int minVal,int maxVal,
+                    const QString & docs )
+  : m_default(defVal), m_minVal(minVal), m_maxVal(maxVal), m_docs(docs), m_id(id)
 {
-  QHBoxLayout *layout = new QHBoxLayout( this, 5 );
+  m_lab = new HelpLabel(id);
+  m_sp  = new QSpinBox;
+  m_sp->setMinimum(minVal);
+  m_sp->setMaximum(maxVal);
+  m_sp->setSingleStep(1);
+  m_val=defVal-1; // force update
+  setValue(defVal);
 
-  lab = new QLabel( label, this );
-  lab->setMinimumSize( lab->sizeHint() );
+  layout->addWidget( m_lab, row, 0 );
+  layout->addWidget( m_sp, row, 1 );
 
-  sp = new QSpinBox( minVal,maxVal,1,this );
-  sp->setMinimumSize( sp->sizeHint() );
+  connect(m_sp, SIGNAL(valueChanged(int)), 
+          this, SLOT(setValue(int)) );
+  connect( m_lab, SIGNAL(enter()), SLOT(help()) );
+  connect( m_lab, SIGNAL(reset()), SLOT(reset()) );
+  row++;
+}
 
-  init();
-  
-  layout->addWidget( lab );
-  layout->addWidget( sp );
-  layout->addStretch(1);
-  layout->activate();
-  setMinimumSize( sizeHint() );
+void InputInt::help()
+{
+  showHelp(this);
+}
 
-  connect(sp,   SIGNAL(valueChanged(int)), 
-          this, SLOT(valueChanged(int)) );
 
+void InputInt::setValue(int val)
+{
+  val = qMax(m_minVal,val);
+  val = qMin(m_maxVal,val);
+  if (val!=m_val) 
+  {
+    m_val = val;
+    m_sp->setValue(val);
+    m_value = m_val;
+    if (m_val==m_default)
+    {
+      m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
+    }
+    else
+    {
+      m_lab->setText(QString::fromAscii("<qt><font color='red'>")+m_id+QString::fromAscii("</font></qt>"));
+    }
+    emit changed(); 
+  }
 }
 
-void InputInt::valueChanged(int val)
+void InputInt::setEnabled(bool state)
 {
-  if (val!=m_val) emit changed(); 
-  m_val = val;
+  m_lab->setEnabled(state);
+  m_sp->setEnabled(state);
 }
 
-void InputInt::setEnabled(bool state)
+QVariant &InputInt::value() 
 {
-  lab->setEnabled(state);
-  sp->setEnabled(state);
+  return m_value;
 }
 
-void InputInt::init()
+void InputInt::update()
 {
-  m_val = QMAX(m_minVal,m_val);
-  m_val = QMIN(m_maxVal,m_val);
-  sp->setValue(m_val);
+  setValue(m_value.toInt());
 }
+
+void InputInt::reset()
+{
+  setValue(m_default);
+}
+
+void InputInt::writeValue(QTextStream &t,QTextCodec *)
+{
+  t << m_val;
+}
+
diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h
index b5f38ee..73100ae 100644
--- a/addon/doxywizard/inputint.h
+++ b/addon/doxywizard/inputint.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -15,39 +15,56 @@
 #ifndef _INPUTINT_H
 #define _INPUTINT_H
 
-#include <qwidget.h>
-#include <qstring.h>
-
 #include "input.h"
+#include <QObject>
 
+class QGridLayout;
 class QLabel;
 class QSpinBox;
 
-class InputInt : public QWidget, public IInput
+class InputInt : public QObject, public Input
 {
   Q_OBJECT
 
   public:
-    InputInt( const QString &text, QWidget *parent, int &val, 
-              int minVal, int maxVal );
+    InputInt( QGridLayout *layout,int &row,
+              const QString &id, int defVal, 
+              int minVal, int maxVal,
+              const QString &docs );
     ~InputInt(){};
+
+    // Input
+    QVariant &value();
+    void update();
+    Kind kind() const { return Int; }
+    QString docs() const { return m_docs; }
+    QString id() const { return m_id; }
+    void addDependency(Input *) { Q_ASSERT(false); }
     void setEnabled(bool);
-    void init();
-    QObject *qobject() { return this; }
+    void updateDependencies() {}
+    void writeValue(QTextStream &t,QTextCodec *codec);
 
-  private:
-    QLabel *lab;
-    QSpinBox *sp;
-    int &m_val;
-    int m_minVal;
-    int m_maxVal;
+  public slots:
+    void reset();
+    void setValue(int val); 
+
+  private slots:
+    void help();
 
   signals:
     void changed();
+    void showHelp(Input *);
 
-  private slots:
-    void valueChanged(int val); 
-
+  private:
+    QLabel   *m_lab;
+    QSpinBox *m_sp;
+    int       m_val;
+    int       m_default;
+    int       m_minVal;
+    int       m_maxVal;
+    QVariant  m_value;
+    QString   m_docs;
+    QString   m_id;
 };
 
 #endif
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index 03f7098..d3441c1 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -13,178 +13,179 @@
  */
 
 #include "inputstring.h"
-//#include "pixmaps.h"
-
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qwindowsstyle.h>
-#include <qcstring.h>
-#include <qpushbutton.h>
-#include <qfiledialog.h>
-#include <qcombobox.h>
-#include <qtooltip.h>
-
-
-InputString::InputString( const QString & label, 
-                          QWidget *parent, QCString &s, StringMode m )
-  : QWidget( parent ), str(s), sm(m), m_values(0), m_index(0)
+#include "helplabel.h"
+#include "doxywizard.h"
+#include "config.h"
+
+#include <QtGui>
+
+InputString::InputString( QGridLayout *layout,int &row,
+                          const QString & id, const QString &s, 
+                          StringMode m, const QString &docs )
+  : m_default(s), m_sm(m), m_index(0), m_docs(docs), m_id(id)
 {
+  m_lab = new HelpLabel(id);
   if (m==StringFixed)
   {
-    QHBoxLayout *layout = new QHBoxLayout( this, 5);
-    lab = new QLabel( label, this );
-    lab->setMinimumSize( lab->sizeHint() );
-    layout->addWidget( lab );
-    com = new QComboBox( this ); 
-    com->setMinimumSize(com->sizeHint());
-    layout->addWidget( com );
-    layout->addStretch( 1 );
-    le=0;
-    br=0;
-    layout->activate();
-    setMinimumSize( sizeHint() );
+    layout->addWidget( m_lab, row, 0 );
+    m_com = new QComboBox; 
+    layout->addWidget( m_com, row, 1, 1, 3, Qt::AlignLeft );
+    m_le=0;
+    m_br=0;
+    row++;
   }
   else
   {
-    QGridLayout *layout = new QGridLayout( this, 1, m==StringFree ? 1 : 3, 5 );
-    lab = new QLabel( label, this );
-    lab->setMinimumSize( lab->sizeHint() );
-    layout->addWidget( lab,0,0 );
-    le = new QLineEdit( this );
-    le->setMinimumSize( le->sizeHint() );
-    le->setText( s );
-    layout->addWidget( le,0,1 );
+    layout->addWidget( m_lab, row, 0 );
+    m_le = new QLineEdit;
+    m_le->setText( s );
+    //layout->setColumnMinimumWidth(2,150);
     if (m==StringFile || m==StringDir)
     {
-      //QPixmap pixmap = QPixmap(m==StringFile ? 
-      //                         file_xpm :
-      //                         folder_xpm );
-      br = new QPushButton( this );
-      br->setMinimumSize( br->sizeHint() );  
+      layout->addWidget( m_le, row, 1 );
+      m_br = new QToolBar;
+      m_br->setIconSize(QSize(24,24));
       if (m==StringFile) 
       {
-        br->setText("File...");
-        QToolTip::add(br,"Browse to a file");
+        QAction *file = m_br->addAction(QIcon(QString::fromAscii(":/images/file.png")),QString(),this,SLOT(browse()));
+        file->setToolTip(tr("Browse to a file"));
       }
       else 
       {
-        br->setText("Folder...");
-        QToolTip::add(br,"Browse to a folder");
+        QAction *dir = m_br->addAction(QIcon(QString::fromAscii(":/images/folder.png")),QString(),this,SLOT(browse()));
+        dir->setToolTip(tr("Browse to a folder"));
       }
-      layout->addWidget( br,0,2 );
+      layout->addWidget( m_br,row,2 );
     }
     else
     {
-      br=0;
+      layout->addWidget( m_le, row, 1, 1, 2 );
+      m_br=0;
     }
-    com=0;
-    layout->activate();
-    setMinimumSize( sizeHint() );
+    m_com=0;
+    row++;
   }
 
-  if (le)  connect( le,   SIGNAL(textChanged(const QString&)), 
-                    this, SLOT(textChanged(const QString&)) );
-  if (br)  connect( br,   SIGNAL(clicked()), this, SLOT(browse()) );
-  if (com) connect( com,  SIGNAL(activated(const QString &)), 
-                    this, SLOT(textChanged(const QString &)) );
+  if (m_le)  connect( m_le,   SIGNAL(textChanged(const QString&)), 
+                      this,   SLOT(setValue(const QString&)) );
+  if (m_com) connect( m_com,  SIGNAL(activated(const QString &)), 
+                      this,   SLOT(setValue(const QString &)) );
+  m_str = s+QChar::fromAscii('!'); // force update
+  setValue(s);
+  connect( m_lab, SIGNAL(enter()), SLOT(help()) );
+  connect( m_lab, SIGNAL(reset()), SLOT(reset()) );
+}
+
+void InputString::help()
+{
+  showHelp(this);
 }
 
+
 InputString::~InputString()
 {
-  if (m_values) delete m_values;
 }
 
 
-void InputString::textChanged(const QString &s)
+void InputString::setValue(const QString &s)
 {
-  if (str!=(const char *)s)
+  if (m_str!=s)
   {
-    str = s;
+    m_str = s;
+    m_value = m_str;
+    if (m_str==m_default)
+    {
+      m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
+    }
+    else
+    {
+      m_lab->setText(QString::fromAscii("<qt><font color='red'>")+m_id+QString::fromAscii("</font></qt>"));
+    }
+    if (m_le) m_le->setText( m_str );
     emit changed();
   }
 }
 
 void InputString::setEnabled(bool state)
 {
-  lab->setEnabled(state);
-  if (le) le->setEnabled(state);
-  if (br) br->setEnabled(state);
-  if (com) com->setEnabled(state);
+  m_lab->setEnabled(state);
+  if (m_le)  m_le->setEnabled(state);
+  if (m_br)  m_br->setEnabled(state);
+  if (m_com) m_com->setEnabled(state);
 }
 
 void InputString::browse()
 {
-  if (sm==StringFile)
+  QString path = QFileInfo(MainWindow::instance().configFileName()).path();
+  if (m_sm==StringFile)
   {
-    QString fileName = QFileDialog::getOpenFileName();
-
+    QString fileName = QFileDialog::getOpenFileName(&MainWindow::instance(),
+        tr("Select file"),path);
     if (!fileName.isNull()) 
     {
-      le->setText( fileName );
-      if (str!=(const char *)le->text())
+      QDir dir(path);
+      if (!MainWindow::instance().configFileName().isEmpty() && dir.exists())
       {
-        str = le->text(); 
-        emit changed();
+        fileName = dir.relativeFilePath(fileName);
       }
+      setValue(fileName);
     }
   }
   else // sm==StringDir
   {
-    QString dirName = QFileDialog::getExistingDirectory();
-
+    QString dirName = QFileDialog::getExistingDirectory(&MainWindow::instance(),
+        tr("Select directory"),path);
     if (!dirName.isNull())
     {
-      le->setText( dirName ); 	
-      if (str!=(const char *)le->text())
+      QDir dir(path);
+      if (!MainWindow::instance().configFileName().isEmpty() && dir.exists())
       {
-        str = le->text();
-        emit changed();
+        dirName = dir.relativeFilePath(dirName);
       }
+      setValue(dirName);
     }	
   }
 }
 
 void InputString::clear()
 {
-  le->setText("");
-  if (!str.isEmpty())
-  {
-    emit changed();
-    str = "";
-  }
+  setValue(QString());
 }
 
-void InputString::addValue(const char *s)
+void InputString::addValue(QString s)
 {
-  if (sm==StringFixed)
+  if (m_sm==StringFixed)
   {
-    if (m_values==0) m_values = new QDict<int>;
-    m_values->setAutoDelete(TRUE);
-    m_values->insert(s,new int(m_index++));
-    com->insertItem(s);
+    m_values.append(s);
+    m_com->addItem(s);
   }
 }
 
-void InputString::init()
+void InputString::setDefault()
 {
-  if (sm==StringFixed)
-  {
-    if (m_values)
-    {
-      int *itemIndex = m_values->find(str);
-      if (itemIndex)
-      {
-        com->setCurrentItem(*itemIndex);
-      } 
-      else
-      {
-        com->setCurrentItem(0);
-      }
-    }
-  }
-  else
-  {
-    le->setText(str);
-  }
+  int index = m_values.indexOf(m_str);
+  if (index!=-1 && m_com) m_com->setCurrentIndex(index);
 }
+
+QVariant &InputString::value() 
+{
+  return m_value;
+}
+
+void InputString::update()
+{
+  setValue(m_value.toString().trimmed());
+  setDefault();
+}
+
+void InputString::reset()
+{
+  setValue(m_default);
+  setDefault();
+}
+
+void InputString::writeValue(QTextStream &t,QTextCodec *codec)
+{
+  writeStringValue(t,codec,m_str);
+}
+
diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h
index cf00d2d..13efb44 100644
--- a/addon/doxywizard/inputstring.h
+++ b/addon/doxywizard/inputstring.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -15,19 +15,19 @@
 #ifndef _INPUTSTRING_H
 #define _INPUTSTRING_H
 
-#include <qwidget.h>
-#include <qstring.h>
-#include <qdict.h>
-
-#include "qtbc.h"
 #include "input.h"
 
+#include <QObject>
+#include <QMap>
+#include <QStringList>
+
 class QLabel;
 class QLineEdit;
-class QPushButton;
+class QToolBar;
 class QComboBox;
+class QGridLayout;
 
-class InputString : public QWidget, public IInput
+class InputString : public QObject, public Input
 {
   Q_OBJECT
 
@@ -38,32 +38,51 @@ class InputString : public QWidget, public IInput
                       StringFixed=3
                     };
 
-    InputString( const QString &text, QWidget *parent, QCString &s, 
-                 StringMode m=StringFree );
+    InputString( QGridLayout *layout,int &row,
+                 const QString &id, const QString &s, 
+                 StringMode m,
+                 const QString &docs );
     ~InputString();
+    void addValue(QString s);
+    void setDefault();
+
+    // Input
+    QVariant &value();
+    void update();
+    Kind kind() const { return String; }
+    QString docs() const { return m_docs; }
+    QString id() const { return m_id; }
+    void addDependency(Input *) { Q_ASSERT(false); }
     void setEnabled(bool);
-    void addValue(const char *s);
-    void init();
-    QObject *qobject() { return this; }
+    void updateDependencies() {}
+    void writeValue(QTextStream &t,QTextCodec *codec);
 
-  private:
-    QLabel *lab;
-    QLineEdit *le;
-    QPushButton *br;
-    QComboBox *com;
-    QCString &str;
-    StringMode sm;
-    QDict<int> *m_values;
-    int m_index; 
+  public slots:
+    void reset();
+    void setValue(const QString&);
 
   signals:
     void changed();
+    void showHelp(Input *);
 
   private slots:
-    void textChanged(const QString&);
     void browse();
     void clear();
+    void help();
 
+  private:
+    QLabel       *m_lab;
+    QLineEdit    *m_le;
+    QToolBar     *m_br;
+    QComboBox    *m_com;
+    QString       m_str;
+    QString       m_default;
+    StringMode    m_sm;
+    QStringList   m_values;
+    int           m_index; 
+    QVariant      m_value;
+    QString       m_docs;
+    QString       m_id;
 };
 
 #endif
diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp
index 9d98f9a..d0ebdc7 100644
--- a/addon/doxywizard/inputstrlist.cpp
+++ b/addon/doxywizard/inputstrlist.cpp
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -13,162 +13,139 @@
  */
 
 #include "inputstrlist.h"
-//#include "pixmaps.h"
-
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlistbox.h>
-#include <qstrlist.h>
-#include <qstringlist.h>
-#include <qfiledialog.h>
-#include <qtooltip.h>
-
-InputStrList::InputStrList( const QString & label, 
-                            QWidget *parent, QStrList &sl, ListMode lm)
-  : QWidget(parent), strList(sl)
+#include "helplabel.h"
+#include "doxywizard.h"
+#include "config.h"
+
+#include <QtGui>
+
+InputStrList::InputStrList( QGridLayout *layout,int &row,
+                            const QString & id, 
+                            const QStringList &sl, ListMode lm,
+                            const QString & docs)
+  : m_default(sl), m_strList(sl), m_docs(docs), m_id(id)
 {
-  QGridLayout *layout = new QGridLayout( this, 2, 2, 5 );
-  lab = new QLabel( label, this );
-  lab->setMinimumSize( lab->sizeHint() );
-  layout->addWidget( lab,0,0 );
-
-  QWidget *dw = new QWidget(this); /* dummy widget used for layouting */
-  QHBoxLayout *boxlayout = new QHBoxLayout( dw, 0, 5 );
-  le  = new QLineEdit( dw );
-  le->setMinimumSize( le->sizeHint() );
-  boxlayout->addWidget( le, 1 );
-
-  add = new QPushButton( dw );
-  //add->setPixmap( QPixmap( add_xpm ));
-  add->setText( "+" );
-  add->setMinimumSize( add->sizeHint() );
-  QToolTip::add(add,"Add item");
-  boxlayout->addWidget( add );
-
-  del = new QPushButton( dw );
-  //del->setPixmap( QPixmap( del_xpm ));
-  del->setText( "-" );
-  del->setMinimumSize( del->sizeHint() );
-  QToolTip::add(del,"Delete selected item");
-  boxlayout->addWidget( del );
-
-  upd = new QPushButton( dw ); 
-  //upd->setPixmap( QPixmap( update_xpm ));
-  upd->setText( "*" );
-  upd->setMinimumSize( upd->sizeHint() );
-  QToolTip::add(upd,"Update selected item");
-  boxlayout->addWidget( upd );
-
-  lb  = new QListBox( this );
-  lb->setMinimumSize(400,100);
-  init();
-  lb->setVScrollBarMode(QScrollView::Auto);
-  lb->setHScrollBarMode(QScrollView::Auto);
-
-  brFile=0;
-  brDir=0;
+  m_lab = new HelpLabel( id );
+
+  m_le  = new QLineEdit;
+  m_le->clear();
+
+  QToolBar *toolBar = new QToolBar;
+  toolBar->setIconSize(QSize(24,24));
+  m_add = toolBar->addAction(QIcon(QString::fromAscii(":/images/add.png")),QString(),
+                             this,SLOT(addString()));
+  m_add->setToolTip(tr("Add item"));
+  m_del = toolBar->addAction(QIcon(QString::fromAscii(":/images/del.png")),QString(),
+                             this,SLOT(delString()));
+  m_del->setToolTip(tr("Delete selected item"));
+  m_upd = toolBar->addAction(QIcon(QString::fromAscii(":/images/refresh.png")),QString(),
+                             this,SLOT(updateString()));
+  m_upd->setToolTip(tr("Update selected item"));
+
+  m_lb  = new QListWidget;
+  //m_lb->setMinimumSize(400,100);
+  foreach (QString s, m_strList) m_lb->addItem(s);
+  
+  m_brFile=0;
+  m_brDir=0;
   if (lm!=ListString)
   {
     if (lm&ListFile)
     {
-      brFile = new QPushButton(dw);
-      //brFile->setPixmap( QPixmap(file_xpm) );
-      brFile->setText("Select...");
-      brFile->setMinimumSize(brFile->sizeHint());
-      QToolTip::add(brFile,"Browse to a file");
-      boxlayout->addWidget( brFile );
+      m_brFile = toolBar->addAction(QIcon(QString::fromAscii(":/images/file.png")),QString(),
+                                    this,SLOT(browseFiles()));
+      m_brFile->setToolTip(tr("Browse to a file"));
     } 
     if (lm&ListDir)
     {
-      brDir = new QPushButton(dw);
-      //brDir->setPixmap( QPixmap(folder_xpm) );
-      brDir->setText("Select...");
-      brDir->setMinimumSize(brDir->sizeHint());
-      QToolTip::add(brDir,"Browse to a folder");
-      boxlayout->addWidget( brDir );
+      m_brDir = toolBar->addAction(QIcon(QString::fromAscii(":/images/folder.png")),QString(),
+                                   this,SLOT(browseDir()));
+      m_brDir->setToolTip(tr("Browse to a folder"));
     }
   }
-  layout->addWidget( dw, 0,1 );
-  layout->addWidget( lb,1,1 );
-  layout->activate();
-  setMinimumSize( sizeHint() );
+  QHBoxLayout *rowLayout = new QHBoxLayout;
+  rowLayout->addWidget( m_le );
+  rowLayout->addWidget( toolBar );
+  layout->addWidget( m_lab,      row,0 );
+  layout->addLayout( rowLayout,  row,1,1,2 );
+  layout->addWidget( m_lb,       row+1,1,1,2 );
+  row+=2;
 
-  connect(le,   SIGNAL(returnPressed()), 
-          this, SLOT(addString()) );
-  connect(add,  SIGNAL(clicked()), 
+  m_value = m_strList;
+
+  connect(m_le,   SIGNAL(returnPressed()), 
           this, SLOT(addString()) );
-  connect(del,  SIGNAL(clicked()), 
-          this, SLOT(delString()) );
-  connect(upd,  SIGNAL(clicked()), 
-          this, SLOT(updateString()) );
-  if (brFile)
-  {
-    connect(brFile, SIGNAL(clicked()),
-            this, SLOT(browseFiles()));
-  }
-  if (brDir)
-  {
-    connect(brDir, SIGNAL(clicked()),
-            this, SLOT(browseDir()));
-  }
-  connect(lb,   SIGNAL(selected(const QString &)), 
+  connect(m_lb,   SIGNAL(currentTextChanged(const QString &)), 
           this, SLOT(selectText(const QString &)));
+  connect( m_lab, SIGNAL(enter()), SLOT(help()) );
+  connect( m_lab, SIGNAL(reset()), SLOT(reset()) );
+}
+
+void InputStrList::help()
+{
+  showHelp(this);
 }
 
+
 void InputStrList::addString()
 {
-  if (!le->text().isEmpty())
+  if (!m_le->text().isEmpty())
   {
-    lb->insertItem(le->text());
-    strList.append(le->text());
+    m_lb->addItem(m_le->text());
+    m_strList.append(m_le->text());
+    m_value = m_strList;
+    updateDefault();
     emit changed();
-    le->clear();
+    m_le->clear();
   }
 }
 
 void InputStrList::delString()
 {
-  if (lb->currentItem()!=-1)
+  if (m_lb->currentRow()!=-1)
   {
-    int itemIndex = lb->currentItem();
-    lb->removeItem(itemIndex);
-    strList.remove(itemIndex);
+    int itemIndex = m_lb->currentRow();
+    delete m_lb->currentItem();
+    m_strList.removeAt(itemIndex);
+    m_value = m_strList;
+    updateDefault();
     emit changed();
   }
 }
 
 void InputStrList::updateString()
 {
-  if (lb->currentItem()!=-1 && !le->text().isEmpty())
+  if (m_lb->currentRow()!=-1 && !m_le->text().isEmpty())
   {
-    lb->changeItem(le->text(),lb->currentItem());
-    strList.insert(lb->currentItem(),le->text());
-    strList.remove(lb->currentItem()+1);
+    m_lb->currentItem()->setText(m_le->text());
+    m_strList.insert(m_lb->currentRow(),m_le->text());
+    m_strList.removeAt(m_lb->currentRow()+1);
+    m_value = m_strList;
+    updateDefault();
     emit changed();
   }
 }
 
 void InputStrList::selectText(const QString &s)
 {
-  le->setText(s);
+  m_le->setText(s);
 }
 
 void InputStrList::setEnabled(bool state)
 {
-  lab->setEnabled(state);
-  le->setEnabled(state);
-  add->setEnabled(state);
-  del->setEnabled(state);
-  upd->setEnabled(state);
-  lb->setEnabled(state);
-  if (brFile) brFile->setEnabled(state);
-  if (brDir)  brDir->setEnabled(state);
+  m_lab->setEnabled(state);
+  m_le->setEnabled(state);
+  m_add->setEnabled(state);
+  m_del->setEnabled(state);
+  m_upd->setEnabled(state);
+  m_lb->setEnabled(state);
+  if (m_brFile) m_brFile->setEnabled(state);
+  if (m_brDir)  m_brDir->setEnabled(state);
 }
 
 void InputStrList::browseFiles()
 {
+  QString path = QFileInfo(MainWindow::instance().configFileName()).path();
   QStringList fileNames = QFileDialog::getOpenFileNames();	
 
   if (!fileNames.isEmpty()) 
@@ -176,35 +153,102 @@ void InputStrList::browseFiles()
     QStringList::Iterator it;
     for ( it= fileNames.begin(); it != fileNames.end(); ++it )
     {
-      lb->insertItem(*it);
-      strList.append(*it);
+      QString fileName;
+      QDir dir(path);
+      if (!MainWindow::instance().configFileName().isEmpty() && dir.exists())
+      {
+        fileName = dir.relativeFilePath(*it);
+      }
+      if (fileName.isEmpty())
+      {
+        fileName = *it;
+      }
+      m_lb->addItem(fileName);
+      m_strList.append(fileName);
+      m_value = m_strList;
+      updateDefault();
       emit changed();
     }
-    le->setText(*fileNames.begin());
+    m_le->setText(m_strList[0]);
   }
 }
 
 void InputStrList::browseDir()
 {	
+  QString path = QFileInfo(MainWindow::instance().configFileName()).path();
   QString dirName = QFileDialog::getExistingDirectory();	
 
   if (!dirName.isNull()) 
   {
-    lb->insertItem(dirName);
-    strList.append(dirName);
+    QDir dir(path);
+    if (!MainWindow::instance().configFileName().isEmpty() && dir.exists())
+    {
+      dirName = dir.relativeFilePath(dirName);
+    }
+    if (dirName.isEmpty())
+    {
+      dirName=QString::fromAscii(".");
+    }
+    m_lb->addItem(dirName);
+    m_strList.append(dirName);
+    m_value = m_strList;
+    updateDefault();
     emit changed();
-    le->setText(dirName);
+    m_le->setText(dirName);
+  }
+}
+
+void InputStrList::setValue(const QStringList &sl)
+{
+  m_le->clear();
+  m_lb->clear();
+  m_strList = sl;
+  for (int i=0;i<m_strList.size();i++)
+  {
+    m_lb->addItem(m_strList[i].trimmed());
+  }
+  updateDefault();
+}
+
+QVariant &InputStrList::value()
+{
+  return m_value;
+}
+
+void InputStrList::update()
+{
+  setValue(m_value.toStringList());
+}
+
+void InputStrList::updateDefault()
+{
+  if (m_strList==m_default)
+  {
+    m_lab->setText(QString::fromAscii("<qt>")+m_id+QString::fromAscii("</qt"));
   }
+  else
+  {
+    m_lab->setText(QString::fromAscii("<qt><font color='red'>")+m_id+QString::fromAscii("</font></qt>"));
+  }
+}
+
+void InputStrList::reset()
+{
+  setValue(m_default);
 }
 
-void InputStrList::init()
+void InputStrList::writeValue(QTextStream &t,QTextCodec *codec)
 {
-  le->clear();
-  lb->clear();
-  char *s = strList.first();
-  while (s)
+  bool first=TRUE;
+  foreach (QString s, m_strList) 
   {
-    lb->insertItem(s);
-    s = strList.next();
+    if (!first) 
+    {
+      t << " \\" << endl;
+      t << "                         ";
+    }
+    first=FALSE;
+    writeStringValue(t,codec,s);
   }
 }
+
diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h
index 0ba48c5..912f441 100644
--- a/addon/doxywizard/inputstrlist.h
+++ b/addon/doxywizard/inputstrlist.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -15,48 +15,51 @@
 #ifndef _INPUTSTRLIST_H
 #define _INPUTSTRLIST_H
 
-#include <qwidget.h>
-#include <qstring.h>
-
 #include "input.h"
 
+#include <QObject>
+#include <QStringList>
+
 class QLabel;
 class QLineEdit;
 class QPushButton;
-class QListBox;
-class QStrList;
+class QListWidget;
+class QStringList;
+class QGridLayout;
+class QAction;
 
-class InputStrList : public QWidget, public IInput
+class InputStrList : public QObject, public Input
 {
   Q_OBJECT
 
   public:
-    enum ListMode { ListString=0, 
-                    ListFile=1, 
-                    ListDir=2, 
-                    ListFileDir=ListFile|ListDir 
+    enum ListMode { ListString  = 0, 
+                    ListFile    = 1, 
+                    ListDir     = 2, 
+                    ListFileDir = ListFile | ListDir 
                   };
     
-    InputStrList( const QString &text, QWidget *parent, 
-                  QStrList &sl, ListMode v=ListString );
-    ~InputStrList() {};
+    InputStrList( QGridLayout *layout,int &row,
+                  const QString &id, const QStringList &sl, 
+                  ListMode v, const QString &docs);
+    void setValue(const QStringList &sl);
+
+    QVariant &value();
+    void update();
+    Kind kind() const { return StrList; }
+    QString docs() const { return m_docs; }
+    QString id() const { return m_id; }
+    void addDependency(Input *) { Q_ASSERT(false); }
     void setEnabled(bool);
-    void init();
-    QObject *qobject() { return this; }
+    void updateDependencies() {}
+    void writeValue(QTextStream &t,QTextCodec *codec);
 
-  private:
-    QLabel *lab;
-    QLineEdit *le;
-    QPushButton *add;
-    QPushButton *del;
-    QPushButton *upd;
-    QPushButton *brFile;
-    QPushButton *brDir;
-    QListBox *lb;
-    QStrList &strList;
+  public slots:
+    void reset();
 
   signals:
     void changed();
+    void showHelp(Input *);
 
   private slots:
     void addString(); 
@@ -65,6 +68,23 @@ class InputStrList : public QWidget, public IInput
     void selectText(const QString &s);
     void browseFiles();
     void browseDir();
+    void help();
+
+  private:
+    void updateDefault();
+    QLabel       *m_lab;
+    QLineEdit    *m_le;
+    QAction      *m_add;
+    QAction      *m_del;
+    QAction      *m_upd;
+    QAction      *m_brFile;
+    QAction      *m_brDir;
+    QListWidget  *m_lb;
+    QStringList   m_default;
+    QStringList   m_strList;
+    QVariant      m_value;
+    QString       m_docs;
+    QString       m_id;
 
 };
 
diff --git a/addon/doxywizard/qtbc.h b/addon/doxywizard/qtbc.h
deleted file mode 100644
index 22ab1d5..0000000
--- a/addon/doxywizard/qtbc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- *
- * 
- *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- * Documents produced by Doxygen are derivative works derived from the
- * input used in their production; they are not affected by this license.
- *
- */
-
-#ifndef QTBC_H
-#define QTBC_H
-
-/*! This file contains some hacks to make Doxygen work with 
- *  Qt version 2.00 and Qt version 1.xx 
- */
-
-#include <qglobal.h>
-
-#if QT_VERSION >= 200
-
-#include <locale.h>
-
-#define GCI QCollection::Item
-
-#include <qcstring.h>
-#include <qstring.h>
-inline QCString convertToQCString(const QString &s) { return s.latin1(); }
-
-#else /* QT_VERSION < 200 */
-
-#include <qstring.h>
-#define QCString QString
-inline QCString convertToQCString(const QCString &s) { return s; }
-
-#endif
-
-#endif
diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h
index e336930..a040af7 100644
--- a/addon/doxywizard/version.h
+++ b/addon/doxywizard/version.h
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/wizard.cpp b/addon/doxywizard/wizard.cpp
new file mode 100644
index 0000000..7346bd2
--- /dev/null
+++ b/addon/doxywizard/wizard.cpp
@@ -0,0 +1,896 @@
+#include "wizard.h"
+#include "input.h"
+#include "doxywizard.h"
+
+#include <QtGui>
+
+// step1 options
+#define STR_PROJECT_NAME          QString::fromAscii("PROJECT_NAME")
+#define STR_INPUT                 QString::fromAscii("INPUT")
+#define STR_OUTPUT_DIRECTORY      QString::fromAscii("OUTPUT_DIRECTORY")
+#define STR_PROJECT_NUMBER        QString::fromAscii("PROJECT_NUMBER")
+#define STR_RECURSIVE             QString::fromAscii("RECURSIVE")
+#define STR_OPTIMIZE_OUTPUT_FOR_C QString::fromAscii("OPTIMIZE_OUTPUT_FOR_C")
+#define STR_OPTIMIZE_OUTPUT_JAVA  QString::fromAscii("OPTIMIZE_OUTPUT_JAVA")
+#define STR_OPTIMIZE_FOR_FORTRAN  QString::fromAscii("OPTIMIZE_FOR_FORTRAN")
+#define STR_OPTIMIZE_OUTPUT_VHDL  QString::fromAscii("OPTIMIZE_OUTPUT_VHDL")
+#define STR_CPP_CLI_SUPPORT       QString::fromAscii("CPP_CLI_SUPPORT")
+#define STR_HIDE_SCOPE_NAMES      QString::fromAscii("HIDE_SCOPE_NAMES")
+#define STR_EXTRACT_ALL           QString::fromAscii("EXTRACT_ALL")
+#define STR_SOURCE_BROWSER        QString::fromAscii("SOURCE_BROWSER")
+#define STR_GENERATE_HTML         QString::fromAscii("GENERATE_HTML")
+#define STR_GENERATE_LATEX        QString::fromAscii("GENERATE_LATEX")
+#define STR_GENERATE_MAN          QString::fromAscii("GENERATE_MAN")
+#define STR_GENERATE_RTF          QString::fromAscii("GENERATE_RTF")
+#define STR_GENERATE_XML          QString::fromAscii("GENERATE_XML")
+#define STR_GENERATE_HTMLHELP     QString::fromAscii("GENERATE_HTMLHELP")
+#define STR_GENERATE_TREEVIEW     QString::fromAscii("GENERATE_TREEVIEW")
+#define STR_USE_PDFLATEX          QString::fromAscii("USE_PDFLATEX")
+#define STR_PDF_HYPERLINKS        QString::fromAscii("PDF_HYPERLINKS")
+#define STR_SEARCHENGINE          QString::fromAscii("SEARCHENGINE")
+#define STR_HAVE_DOT              QString::fromAscii("HAVE_DOT")
+#define STR_CLASS_DIAGRAMS        QString::fromAscii("CLASS_DIAGRAMS")
+#define STR_CLASS_GRAPH           QString::fromAscii("CLASS_GRAPH")
+#define STR_COLLABORATION_GRAPH   QString::fromAscii("COLLABORATION_GRAPH")
+#define STR_GRAPHICAL_HIERARCHY   QString::fromAscii("GRAPHICAL_HIERARCHY")
+#define STR_INCLUDE_GRAPH         QString::fromAscii("INCLUDE_GRAPH")
+#define STR_INCLUDED_BY_GRAPH     QString::fromAscii("INCLUDED_BY_GRAPH")
+#define STR_CALL_GRAPH            QString::fromAscii("CALL_GRAPH")
+#define STR_CALLER_GRAPH          QString::fromAscii("CALLER_GRAPH")
+
+
+static bool g_optimizeMapping[6][6] = 
+{
+  // A: OPTIMIZE_OUTPUT_FOR_C
+  // B: OPTIMIZE_OUTPUT_JAVA
+  // C: OPTIMIZE_FOR_FORTRAN
+  // D: OPTIMIZE_OUTPUT_VHDL
+  // E: CPP_CLI_SUPPORT
+  // F: HIDE_SCOPE_NAMES
+  // A     B     C     D     E      F
+  { false,false,false,false,false,false }, // 0: C++
+  { false,false,false,false,true, false }, // 1: C++/CLI
+  { false,true, false,false,false,false }, // 2: C#/Java
+  { true, false,false,false,false,true  }, // 3: C/PHP 
+  { false,false,true, false,false,false }, // 4: Fortran
+  { false,false,false,true, false,false }, // 5: VHDL
+};
+
+static QString g_optimizeOptionNames[6] =
+{
+  STR_OPTIMIZE_OUTPUT_FOR_C,
+  STR_OPTIMIZE_OUTPUT_JAVA,
+  STR_OPTIMIZE_FOR_FORTRAN,
+  STR_OPTIMIZE_OUTPUT_VHDL,
+  STR_CPP_CLI_SUPPORT,
+  STR_HIDE_SCOPE_NAMES
+};
+
+//==========================================================================
+
+static bool stringVariantToBool(const QVariant &v)
+{
+  QString s = v.toString().toLower();
+  return s==QString::fromAscii("yes") || s==QString::fromAscii("true") || s==QString::fromAscii("1");
+} 
+
+static bool getBoolOption(
+    const QHash<QString,Input*>&model,const QString &name)
+{
+  Input *option = model[name];
+  Q_ASSERT(option!=0);
+  return stringVariantToBool(option->value());
+} 
+
+static QString getStringOption(
+    const QHash<QString,Input*>&model,const QString &name)
+{
+  Input *option = model[name];
+  Q_ASSERT(option!=0);
+  return option->value().toString();
+}
+
+static void updateBoolOption(
+    const QHash<QString,Input*>&model,const QString &name,bool bNew)
+{
+  Input *option = model[name];
+  Q_ASSERT(option!=0);
+  bool bOld = stringVariantToBool(option->value());
+  if (bOld!=bNew)
+  {
+    option->value()=QString::fromAscii(bNew ? "true" : "false");
+    option->update();
+  }
+}
+
+static void updateStringOption(
+    const QHash<QString,Input*>&model,const QString &name,const QString &s)
+{
+  Input *option = model[name];
+  Q_ASSERT(option!=0);
+  if (option->value().toString()!=s)
+  {
+    option->value() = s;
+    option->update();
+  }
+}
+
+//==========================================================================
+
+Step1::Step1(Wizard *wizard,const QHash<QString,Input*> &modelData) : m_wizard(wizard), m_modelData(modelData)
+{
+  QVBoxLayout *layout = new QVBoxLayout(this);
+  layout->setMargin(4);
+  layout->setSpacing(8);
+  QLabel *l = new QLabel(this);
+  l->setText(tr("Provide some information "
+              "about the project you are documenting"));
+  layout->addWidget(l);
+  QWidget *w      = new QWidget( this );
+  QHBoxLayout *bl = new QHBoxLayout(w);
+  bl->setSpacing(10);
+
+  QWidget *col1 = new QWidget;
+  QVBoxLayout *col1Layout = new QVBoxLayout(col1);
+  col1Layout->setSpacing(8);
+  QLabel *projName = new QLabel(this);
+  projName->setText(tr("Project name:"));
+  projName->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+  QLabel *projVersion = new QLabel(this);
+  projVersion->setText(tr("Project version or id:"));
+  projVersion->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+  col1Layout->addWidget(projName);
+  col1Layout->addWidget(projVersion);
+
+  QWidget *col2 = new QWidget;
+  QVBoxLayout *col2Layout = new QVBoxLayout(col2);
+  col2Layout->setSpacing(8);
+  m_projName = new QLineEdit;
+  m_projNumber = new QLineEdit;
+  col2Layout->addWidget(m_projName);
+  col2Layout->addWidget(m_projNumber);
+
+  bl->addWidget(col1);
+  bl->addWidget(col2);
+  w->setLayout(bl);
+
+  layout->addWidget(w);
+
+  //---------------------------------------------------
+  QFrame *f = new QFrame( this );
+  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+  layout->addWidget(f);
+  
+  l = new QLabel(this);
+  l->setText(tr("Specify the directory to scan for source code"));
+  layout->addWidget(l);
+  QWidget *row = new QWidget;
+  QHBoxLayout *rowLayout = new QHBoxLayout(row);
+  rowLayout->setSpacing(10);
+  l = new QLabel(this);
+  l->setText(tr("Source code directory:"));
+  rowLayout->addWidget(l);
+  m_sourceDir = new QLineEdit;
+  m_srcSelectDir = new QPushButton(this);
+  m_srcSelectDir->setText(tr("Select..."));
+  rowLayout->addWidget(m_sourceDir);
+  rowLayout->addWidget(m_srcSelectDir);
+  layout->addWidget(row);
+
+  m_recursive = new QCheckBox(this);
+  m_recursive->setText(tr("Scan recursively"));
+  m_recursive->setChecked(TRUE);
+  layout->addWidget(m_recursive);
+
+  //---------------------------------------------------
+  f = new QFrame( this );
+  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+  layout->addWidget(f);
+
+  l = new QLabel(this);
+  l->setText(tr("Specify the directory where doxygen should "
+              "put the generated documentation"));
+  layout->addWidget(l);
+  row = new QWidget;
+  rowLayout = new QHBoxLayout(row);
+  rowLayout->setSpacing(10);
+  l = new QLabel(this);
+  l->setText(tr("Destination directory:"));
+  rowLayout->addWidget(l);
+  m_destDir = new QLineEdit;
+  m_dstSelectDir = new QPushButton(this);
+  m_dstSelectDir->setText(tr("Select..."));
+  rowLayout->addWidget(m_destDir);
+  rowLayout->addWidget(m_dstSelectDir);
+  layout->addWidget(row);
+  layout->addStretch(1);
+  setLayout(layout);
+
+  connect(m_srcSelectDir,SIGNAL(clicked()),
+          this,SLOT(selectSourceDir()));
+  connect(m_dstSelectDir,SIGNAL(clicked()),
+          this,SLOT(selectDestinationDir()));
+  connect(m_projName,SIGNAL(textChanged(const QString &)),SLOT(setProjectName(const QString &)));
+  connect(m_projNumber,SIGNAL(textChanged(const QString &)),SLOT(setProjectNumber(const QString &)));
+  connect(m_sourceDir,SIGNAL(textChanged(const QString &)),SLOT(setSourceDir(const QString &)));
+  connect(m_recursive,SIGNAL(stateChanged(int)),SLOT(setRecursiveScan(int)));
+  connect(m_destDir,SIGNAL(textChanged(const QString &)),SLOT(setDestinationDir(const QString &)));
+}
+
+void Step1::selectSourceDir()
+{
+  QString path = QFileInfo(MainWindow::instance().configFileName()).path();
+  QString dirName = QFileDialog::getExistingDirectory(this,
+        tr("Select source directory"),path);
+  QDir dir(path);
+  if (!MainWindow::instance().configFileName().isEmpty() && dir.exists())
+  {
+    dirName = dir.relativeFilePath(dirName);
+  }
+  if (dirName.isEmpty())
+  {
+    dirName=QString::fromAscii(".");
+  }
+  m_sourceDir->setText(dirName);
+}
+
+void Step1::selectDestinationDir()
+{
+  QString path = QFileInfo(MainWindow::instance().configFileName()).path();
+  QString dirName = QFileDialog::getExistingDirectory(this,
+        tr("Select destination directory"),path);
+  QDir dir(path);
+  if (!MainWindow::instance().configFileName().isEmpty() && dir.exists())
+  {
+    dirName = dir.relativeFilePath(dirName);
+  }
+  if (dirName.isEmpty())
+  {
+    dirName=QString::fromAscii(".");
+  }
+  m_destDir->setText(dirName);
+}
+
+void Step1::setProjectName(const QString &name)
+{
+  updateStringOption(m_modelData,STR_PROJECT_NAME,name);
+}
+
+void Step1::setProjectNumber(const QString &num)
+{
+  updateStringOption(m_modelData,STR_PROJECT_NUMBER,num);
+}
+
+void Step1::setSourceDir(const QString &dir)
+{
+  Input *option = m_modelData[STR_INPUT];
+  if (option->value().toStringList().count()>0)
+  {
+    QStringList sl = option->value().toStringList();
+    if (sl[0]!=dir)
+    {
+      sl[0] = dir;
+      option->value() = sl;
+      option->update();
+    }
+  }
+  else
+  {
+    option->value() = QStringList() << dir;
+    option->update();
+  }
+}
+
+void Step1::setDestinationDir(const QString &dir)
+{
+  updateStringOption(m_modelData,STR_OUTPUT_DIRECTORY,dir);
+}
+
+void Step1::setRecursiveScan(int s)
+{
+  updateBoolOption(m_modelData,STR_RECURSIVE,s==Qt::Checked);
+}
+
+void Step1::init()
+{
+  Input *option;
+  m_projName->setText(getStringOption(m_modelData,STR_PROJECT_NAME));
+  m_projNumber->setText(getStringOption(m_modelData,STR_PROJECT_NUMBER));
+  option = m_modelData[STR_INPUT];
+  if (option->value().toStringList().count()>0)
+  {
+    m_sourceDir->setText(option->value().toStringList().first());
+  }
+  m_recursive->setChecked(
+      getBoolOption(m_modelData,STR_RECURSIVE) ? Qt::Checked : Qt::Unchecked);
+  m_destDir->setText(getStringOption(m_modelData,STR_OUTPUT_DIRECTORY));
+}
+
+
+//==========================================================================
+
+Step2::Step2(Wizard *wizard,const QHash<QString,Input*> &modelData) 
+  : m_wizard(wizard), m_modelData(modelData)
+{
+  QRadioButton *r;
+  QVBoxLayout *layout = new QVBoxLayout(this);
+
+  //---------------------------------------------------
+  m_extractModeGroup = new QButtonGroup(this);
+  m_extractMode = new QGroupBox(this);
+  m_extractMode->setTitle(tr("Select the desired extraction mode:"));
+  QGridLayout *gbox = new QGridLayout( m_extractMode );
+  r = new QRadioButton(tr("Documented entities only"));
+  r->setChecked(true);
+  m_extractModeGroup->addButton(r, 0);
+  gbox->addWidget(r,1,0);
+  // 1 -> EXTRACT_ALL = NO
+  r = new QRadioButton(tr("All Entities"));
+  m_extractModeGroup->addButton(r, 1);
+  gbox->addWidget(r,2,0);
+  // 2 -> EXTRACT_ALL = YES
+  m_crossRef = new QCheckBox(m_extractMode);
+  m_crossRef->setText(tr("Include cross-referenced source code in the output"));
+  // m_crossRef -> SOURCE_BROWSER = YES/NO
+  gbox->addWidget(m_crossRef,3,0);
+  layout->addWidget(m_extractMode);
+  
+  //---------------------------------------------------
+  QFrame *f = new QFrame( this );
+  f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+  layout->addWidget(f);
+
+  m_optimizeLangGroup = new QButtonGroup(this);
+  m_optimizeLang = new QGroupBox(this);
+  m_optimizeLang->setTitle(tr("Select programming language to optimize the results for"));
+  gbox = new QGridLayout( m_optimizeLang ); 
+  
+  r = new QRadioButton(m_optimizeLang);
+  r->setText(tr("Optimize for C++ output"));
+  r->setChecked(true);
+  m_optimizeLangGroup->addButton(r, 0);
+  // 0 -> OPTIMIZE_OUTPUT_FOR_C = NO
+  //      OPTIMIZE_OUTPUT_JAVA  = NO
+  //      OPTIMIZE_FOR_FORTRAN  = NO
+  //      OPTIMIZE_OUTPUT_VHDL  = NO
+  //      CPP_CLI_SUPPORT       = NO
+  //      HIDE_SCOPE_NAMES      = NO
+  gbox->addWidget(r,0,0);
+  r = new QRadioButton(tr("Optimize for C++/CLI output"));
+  gbox->addWidget(r,1,0);
+  m_optimizeLangGroup->addButton(r, 1);
+  // 1 -> OPTIMIZE_OUTPUT_FOR_C = NO
+  //      OPTIMIZE_OUTPUT_JAVA  = NO
+  //      OPTIMIZE_FOR_FORTRAN  = NO
+  //      OPTIMIZE_OUTPUT_VHDL  = NO
+  //      CPP_CLI_SUPPORT       = YES
+  //      HIDE_SCOPE_NAMES      = NO
+  r = new QRadioButton(tr("Optimize for Java or C# output"));
+  m_optimizeLangGroup->addButton(r, 2);
+  // 2 -> OPTIMIZE_OUTPUT_FOR_C = NO
+  //      OPTIMIZE_OUTPUT_JAVA  = YES
+  //      OPTIMIZE_FOR_FORTRAN  = NO
+  //      OPTIMIZE_OUTPUT_VHDL  = NO
+  //      CPP_CLI_SUPPORT       = NO
+  //      HIDE_SCOPE_NAMES      = NO
+  gbox->addWidget(r,2,0);
+  r = new QRadioButton(tr("Optimize for C or PHP output"));
+  m_optimizeLangGroup->addButton(r, 3);
+  // 3 -> OPTIMIZE_OUTPUT_FOR_C = YES
+  //      OPTIMIZE_OUTPUT_JAVA  = NO
+  //      OPTIMIZE_FOR_FORTRAN  = NO
+  //      OPTIMIZE_OUTPUT_VHDL  = NO
+  //      CPP_CLI_SUPPORT       = NO
+  //      HIDE_SCOPE_NAMES      = YES
+  gbox->addWidget(r,3,0);
+  r = new QRadioButton(tr("Optimize for Fortran output"));
+  m_optimizeLangGroup->addButton(r, 4);
+  // 4 -> OPTIMIZE_OUTPUT_FOR_C = NO
+  //      OPTIMIZE_OUTPUT_JAVA  = NO
+  //      OPTIMIZE_FOR_FORTRAN  = YES
+  //      OPTIMIZE_OUTPUT_VHDL  = NO
+  //      CPP_CLI_SUPPORT       = NO
+  //      HIDE_SCOPE_NAMES      = NO
+  gbox->addWidget(r,4,0);
+  r = new QRadioButton(tr("Optimize for VHDL output"));
+  m_optimizeLangGroup->addButton(r, 5);
+  // 5 -> OPTIMIZE_OUTPUT_FOR_C = NO
+  //      OPTIMIZE_OUTPUT_JAVA  = NO
+  //      OPTIMIZE_FOR_FORTRAN  = NO
+  //      OPTIMIZE_OUTPUT_VHDL  = YES
+  //      CPP_CLI_SUPPORT       = NO
+  //      HIDE_SCOPE_NAMES      = NO
+  gbox->addWidget(r,5,0);
+
+  layout->addWidget(m_optimizeLang);
+  layout->addStretch(1);
+
+  connect(m_crossRef,SIGNAL(stateChanged(int)),
+          SLOT(changeCrossRefState(int)));
+  connect(m_optimizeLangGroup,SIGNAL(buttonClicked(int)),
+          SLOT(optimizeFor(int)));
+  connect(m_extractModeGroup,SIGNAL(buttonClicked(int)),
+          SLOT(extractMode(int)));
+}
+
+
+void Step2::optimizeFor(int choice)
+{
+  for (int i=0;i<6;i++)
+  {
+    updateBoolOption(m_modelData,
+                     g_optimizeOptionNames[i],
+                     g_optimizeMapping[choice][i]);
+  }
+}
+
+void Step2::extractMode(int choice)
+{
+  updateBoolOption(m_modelData,STR_EXTRACT_ALL,choice==1);
+}
+
+void Step2::changeCrossRefState(int choice)
+{
+  updateBoolOption(m_modelData,STR_SOURCE_BROWSER,choice==Qt::Checked);
+}
+
+void Step2::init()
+{
+  m_extractModeGroup->button(
+      getBoolOption(m_modelData,STR_EXTRACT_ALL) ? 1 : 0)->setChecked(true);
+  m_crossRef->setChecked(getBoolOption(m_modelData,STR_SOURCE_BROWSER));
+
+  int x=0;
+  if (getBoolOption(m_modelData,STR_CPP_CLI_SUPPORT))            x=1;
+  else if (getBoolOption(m_modelData,STR_OPTIMIZE_OUTPUT_JAVA))  x=2;
+  else if (getBoolOption(m_modelData,STR_OPTIMIZE_OUTPUT_FOR_C)) x=3;
+  else if (getBoolOption(m_modelData,STR_OPTIMIZE_FOR_FORTRAN))  x=4;
+  else if (getBoolOption(m_modelData,STR_OPTIMIZE_OUTPUT_VHDL))  x=5;
+  m_optimizeLangGroup->button(x)->setChecked(true);
+}
+
+//==========================================================================
+
+Step3::Step3(Wizard *wizard,const QHash<QString,Input*> &modelData) 
+  : m_wizard(wizard), m_modelData(modelData)
+{
+  QVBoxLayout *vbox = 0;
+  QRadioButton *r   = 0;
+
+  QGridLayout *gbox = new QGridLayout( this );
+  gbox->addWidget(new QLabel(tr("Select the output format(s) to generate")),0,0);
+  {
+    m_htmlOptions = new QGroupBox(tr("HTML"));
+    m_htmlOptions->setCheckable(true);
+    // GENERATE_HTML
+    m_htmlOptionsGroup = new QButtonGroup(m_htmlOptions);
+    QRadioButton *r = new QRadioButton(tr("plain HTML"));
+    r->setChecked(true);
+    m_htmlOptionsGroup->addButton(r, 0);
+    vbox = new QVBoxLayout;
+    vbox->addWidget(r);
+    r = new QRadioButton(tr("with frames and a navigation tree"));
+    m_htmlOptionsGroup->addButton(r, 1);
+    // GENERATE_TREEVIEW
+    vbox->addWidget(r);
+    r = new QRadioButton(tr("prepare for compressed HTML (.chm)"));
+    m_htmlOptionsGroup->addButton(r, 2);
+    // GENERATE_HTMLHELP
+    vbox->addWidget(r);
+    m_searchEnabled=new QCheckBox(tr("With search function (requires PHP enabled web server)"));
+    vbox->addWidget(m_searchEnabled);
+    // SEARCH_ENGINE
+    m_htmlOptions->setLayout(vbox);
+    m_htmlOptions->setChecked(true);
+  }
+  gbox->addWidget(m_htmlOptions,1,0);
+
+  {
+    m_texOptions = new QGroupBox(tr("LaTeX"));
+    m_texOptions->setCheckable(true);
+    // GENERATE_LATEX
+    m_texOptionsGroup = new QButtonGroup(m_texOptions);
+    vbox = new QVBoxLayout;
+    r = new QRadioButton(tr("as intermediate format for hyperlinked PDF"));
+    m_texOptionsGroup->addButton(r, 0);
+    // PDF_HYPERLINKS = YES
+    r->setChecked(true);
+    vbox->addWidget(r);
+    r = new QRadioButton(tr("as intermediate format for PDF"));
+    m_texOptionsGroup->addButton(r, 1);
+    // PDF_HYPERLINKS = NO, USE_PDFLATEX = YES
+    vbox->addWidget(r);
+    r = new QRadioButton(tr("as intermediate format for PostScript"));
+    m_texOptionsGroup->addButton(r, 2);
+    // USE_PDFLATEX = NO
+    vbox->addWidget(r);
+    vbox->addStretch(1);
+    m_texOptions->setLayout(vbox);
+    m_texOptions->setChecked(true);
+  }
+  gbox->addWidget(m_texOptions,2,0);
+
+  m_manEnabled=new QCheckBox(tr("Man pages"));
+  // GENERATE_MAN
+  m_rtfEnabled=new QCheckBox(tr("Rich Text Format (RTF)"));
+  // GENERATE_RTF
+  m_xmlEnabled=new QCheckBox(tr("XML"));
+  // GENERATE_XML
+  gbox->addWidget(m_manEnabled,3,0);
+  gbox->addWidget(m_rtfEnabled,4,0);
+  gbox->addWidget(m_xmlEnabled,5,0);
+
+  gbox->setRowStretch(6,1);
+  connect(m_htmlOptions,SIGNAL(toggled(bool)),SLOT(setHtmlEnabled(bool)));
+  connect(m_texOptions,SIGNAL(toggled(bool)),SLOT(setLatexEnabled(bool)));
+  connect(m_manEnabled,SIGNAL(stateChanged(int)),SLOT(setManEnabled(int)));
+  connect(m_rtfEnabled,SIGNAL(stateChanged(int)),SLOT(setRtfEnabled(int)));
+  connect(m_xmlEnabled,SIGNAL(stateChanged(int)),SLOT(setXmlEnabled(int)));
+  connect(m_searchEnabled,SIGNAL(stateChanged(int)),SLOT(setSearchEnabled(int)));
+  connect(m_htmlOptionsGroup,SIGNAL(buttonClicked(int)),
+          SLOT(setHtmlOptions(int)));
+  connect(m_texOptionsGroup,SIGNAL(buttonClicked(int)),
+          SLOT(setLatexOptions(int)));
+}
+
+void Step3::setHtmlEnabled(bool b)
+{
+  updateBoolOption(m_modelData,STR_GENERATE_HTML,b);
+}
+
+void Step3::setLatexEnabled(bool b)
+{
+  updateBoolOption(m_modelData,STR_GENERATE_LATEX,b);
+}
+
+void Step3::setManEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_GENERATE_MAN,state==Qt::Checked);
+}
+
+void Step3::setRtfEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_GENERATE_RTF,state==Qt::Checked);
+}
+
+void Step3::setXmlEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_GENERATE_XML,state==Qt::Checked);
+}
+
+void Step3::setSearchEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_SEARCHENGINE,state==Qt::Checked);
+}
+
+void Step3::setHtmlOptions(int id)
+{
+  if (id==0) // plain HTML
+  {
+    updateBoolOption(m_modelData,STR_GENERATE_HTMLHELP,false);
+    updateStringOption(m_modelData,STR_GENERATE_TREEVIEW,QString::fromAscii("NONE"));
+  }
+  else if (id==1) // with navigation tree
+  {
+    updateBoolOption(m_modelData,STR_GENERATE_HTMLHELP,false);
+    updateStringOption(m_modelData,STR_GENERATE_TREEVIEW,QString::fromAscii("ALL"));
+  }
+  else if (id==2) // with compiled help
+  {
+    updateBoolOption(m_modelData,STR_GENERATE_HTMLHELP,true);
+    updateStringOption(m_modelData,STR_GENERATE_TREEVIEW,QString::fromAscii("NONE"));
+  }
+}
+
+void Step3::setLatexOptions(int id)
+{
+  if (id==0) // hyperlinked PDF
+  {
+    updateBoolOption(m_modelData,STR_USE_PDFLATEX,true);
+    updateBoolOption(m_modelData,STR_PDF_HYPERLINKS,true);
+  }
+  else if (id==1) // PDF
+  {
+    updateBoolOption(m_modelData,STR_USE_PDFLATEX,true);
+    updateBoolOption(m_modelData,STR_PDF_HYPERLINKS,false);
+  }
+  else if (id==2) // PostScript
+  {
+    updateBoolOption(m_modelData,STR_USE_PDFLATEX,false);
+    updateBoolOption(m_modelData,STR_PDF_HYPERLINKS,false);
+  }
+}
+
+void Step3::init()
+{
+  m_htmlOptions->setChecked(getBoolOption(m_modelData,STR_GENERATE_HTML));
+  m_texOptions->setChecked(getBoolOption(m_modelData,STR_GENERATE_LATEX));
+  m_manEnabled->setChecked(getBoolOption(m_modelData,STR_GENERATE_MAN));
+  m_rtfEnabled->setChecked(getBoolOption(m_modelData,STR_GENERATE_RTF));
+  m_xmlEnabled->setChecked(getBoolOption(m_modelData,STR_GENERATE_XML));
+  m_searchEnabled->setChecked(getBoolOption(m_modelData,STR_SEARCHENGINE));
+  if (getBoolOption(m_modelData,STR_GENERATE_HTMLHELP))
+  {
+    m_htmlOptionsGroup->button(2)->setChecked(true); // compiled help
+  }
+  else if (getBoolOption(m_modelData,STR_GENERATE_TREEVIEW))
+  {
+    m_htmlOptionsGroup->button(1)->setChecked(true); // navigation tree
+  }
+  else
+  {
+    m_htmlOptionsGroup->button(0)->setChecked(true); // plain HTML
+  }
+  if (!getBoolOption(m_modelData,STR_USE_PDFLATEX))
+  {
+    m_texOptionsGroup->button(2)->setChecked(true); // PostScript
+  }
+  else if (!getBoolOption(m_modelData,STR_PDF_HYPERLINKS))
+  {
+    m_texOptionsGroup->button(1)->setChecked(true); // Plain PDF
+  }
+  else
+  {
+    m_texOptionsGroup->button(0)->setChecked(true); // PDF with hyperlinks
+  }
+}
+
+//==========================================================================
+
+Step4::Step4(Wizard *wizard,const QHash<QString,Input*> &modelData) 
+  : m_wizard(wizard), m_modelData(modelData)
+{
+  m_diagramModeGroup = new QButtonGroup(this);
+  QGridLayout *gbox = new QGridLayout( this );
+  gbox->addWidget(new QLabel(tr("Diagrams to generate")),0,0);
+
+  QRadioButton *rb = new QRadioButton(tr("No diagrams"));
+  m_diagramModeGroup->addButton(rb, 0);
+  gbox->addWidget(rb,1,0);
+  // CLASS_DIAGRAMS = NO, HAVE_DOT = NO
+  rb->setChecked(true);
+  rb = new QRadioButton(tr("Use built-in class diagram generator"));
+  m_diagramModeGroup->addButton(rb, 1);
+  // CLASS_DIAGRAMS = YES, HAVE_DOT = NO
+  gbox->addWidget(rb,2,0);
+  rb = new QRadioButton(tr("Use dot tool from the GraphViz package"));
+  m_diagramModeGroup->addButton(rb, 2);
+  gbox->addWidget(rb,3,0);
+  // CLASS_DIAGRAMS = NO, HAVE_DOT = YES
+
+  m_dotGroup = new QGroupBox(tr("Dot graphs to generate"));
+    QVBoxLayout *vbox = new QVBoxLayout;
+    m_dotClass=new QCheckBox(tr("Class diagrams"));
+    // CLASS_GRAPH
+    m_dotCollaboration=new QCheckBox(tr("Collaboration diagrams"));
+    // COLLABORATION_GRAPH
+    m_dotInheritance=new QCheckBox(tr("Overall Class hierarchy"));
+    // GRAPHICAL_HIERARCHY
+    m_dotInclude=new QCheckBox(tr("Include dependency graphs"));
+    // INCLUDE_GRAPH
+    m_dotIncludedBy=new QCheckBox(tr("Included by dependency graphs"));
+    // INCLUDED_BY_GRAPH
+    m_dotCall=new QCheckBox(tr("Call graphs"));
+    // CALL_GRAPH
+    m_dotCaller=new QCheckBox(tr("Called by graphs"));
+    // CALLER_GRAPH
+    vbox->addWidget(m_dotClass);
+    vbox->addWidget(m_dotCollaboration);
+    vbox->addWidget(m_dotInheritance);
+    vbox->addWidget(m_dotInclude);
+    vbox->addWidget(m_dotIncludedBy);
+    vbox->addWidget(m_dotCall);
+    vbox->addWidget(m_dotCaller);
+    vbox->addStretch(1);
+    m_dotGroup->setLayout(vbox);
+    m_dotClass->setChecked(true);
+    m_dotGroup->setEnabled(false);
+  gbox->addWidget(m_dotGroup,4,0);
+
+  m_dotInclude->setChecked(true);
+  m_dotCollaboration->setChecked(true);
+  gbox->setRowStretch(5,1);
+
+  connect(m_diagramModeGroup,SIGNAL(buttonClicked(int)),
+          this,SLOT(diagramModeChanged(int)));
+  connect(m_dotClass,SIGNAL(stateChanged(int)),
+          this,SLOT(setClassGraphEnabled(int)));
+  connect(m_dotCollaboration,SIGNAL(stateChanged(int)),
+          this,SLOT(setCollaborationGraphEnabled(int)));
+  connect(m_dotInheritance,SIGNAL(stateChanged(int)),
+          this,SLOT(setGraphicalHierarchyEnabled(int)));
+  connect(m_dotInclude,SIGNAL(stateChanged(int)),
+          this,SLOT(setIncludeGraphEnabled(int)));
+  connect(m_dotIncludedBy,SIGNAL(stateChanged(int)),
+          this,SLOT(setIncludedByGraphEnabled(int)));
+  connect(m_dotCall,SIGNAL(stateChanged(int)),
+          this,SLOT(setCallGraphEnabled(int)));
+  connect(m_dotCaller,SIGNAL(stateChanged(int)),
+          this,SLOT(setCallerGraphEnabled(int)));
+}
+
+void Step4::diagramModeChanged(int id)
+{
+  if (id==0) // no diagrams
+  {
+    updateBoolOption(m_modelData,STR_HAVE_DOT,false);
+    updateBoolOption(m_modelData,STR_CLASS_DIAGRAMS,false);
+  }
+  else if (id==1) // builtin diagrams
+  {
+    updateBoolOption(m_modelData,STR_HAVE_DOT,false);
+    updateBoolOption(m_modelData,STR_CLASS_DIAGRAMS,true);
+  }
+  else if (id==2) // dot diagrams
+  {
+    updateBoolOption(m_modelData,STR_HAVE_DOT,true);
+    updateBoolOption(m_modelData,STR_CLASS_DIAGRAMS,false);
+  }
+  m_dotGroup->setEnabled(id==2);
+}
+
+void Step4::setClassGraphEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_CLASS_GRAPH,state==Qt::Checked);
+}
+
+void Step4::setCollaborationGraphEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_COLLABORATION_GRAPH,state==Qt::Checked);
+}
+
+void Step4::setGraphicalHierarchyEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_GRAPHICAL_HIERARCHY,state==Qt::Checked);
+}
+
+void Step4::setIncludeGraphEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_INCLUDE_GRAPH,state==Qt::Checked);
+}
+
+void Step4::setIncludedByGraphEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_INCLUDED_BY_GRAPH,state==Qt::Checked);
+}
+
+void Step4::setCallGraphEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_CALL_GRAPH,state==Qt::Checked);
+}
+
+void Step4::setCallerGraphEnabled(int state)
+{
+  updateBoolOption(m_modelData,STR_CALLER_GRAPH,state==Qt::Checked);
+}
+
+void Step4::init()
+{
+  if (getBoolOption(m_modelData,STR_HAVE_DOT))
+  {
+    m_diagramModeGroup->button(2)->setChecked(true); // Dot
+  }
+  else if (getBoolOption(m_modelData,STR_CLASS_DIAGRAMS))
+  {
+    m_diagramModeGroup->button(1)->setChecked(true); // Builtin diagrams
+  }
+  else
+  {
+    m_diagramModeGroup->button(0)->setChecked(true); // no diagrams
+  }
+  m_dotClass->setChecked(getBoolOption(m_modelData,STR_CLASS_GRAPH));
+  m_dotCollaboration->setChecked(getBoolOption(m_modelData,STR_COLLABORATION_GRAPH));
+  m_dotInheritance->setChecked(getBoolOption(m_modelData,STR_GRAPHICAL_HIERARCHY));
+  m_dotInclude->setChecked(getBoolOption(m_modelData,STR_INCLUDE_GRAPH));
+  m_dotIncludedBy->setChecked(getBoolOption(m_modelData,STR_INCLUDED_BY_GRAPH));
+  m_dotCall->setChecked(getBoolOption(m_modelData,STR_CALL_GRAPH));
+  m_dotCaller->setChecked(getBoolOption(m_modelData,STR_CALLER_GRAPH));
+}
+
+//==========================================================================
+
+Wizard::Wizard(const QHash<QString,Input*> &modelData, QWidget *parent) : 
+  QSplitter(parent), m_modelData(modelData)
+{
+  m_treeWidget = new QTreeWidget;
+  m_treeWidget->setColumnCount(1);
+  m_treeWidget->setHeaderLabels(QStringList() << QString::fromAscii("Topics"));
+  QList<QTreeWidgetItem*> items;
+  items.append(new QTreeWidgetItem((QTreeWidget*)0,QStringList(tr("Project"))));
+  items.append(new QTreeWidgetItem((QTreeWidget*)0,QStringList(tr("Mode"))));
+  items.append(new QTreeWidgetItem((QTreeWidget*)0,QStringList(tr("Output"))));
+  items.append(new QTreeWidgetItem((QTreeWidget*)0,QStringList(tr("Diagrams"))));
+  m_treeWidget->insertTopLevelItems(0,items);
+
+  m_topicStack = new QStackedWidget;
+  m_step1 = new Step1(this,modelData);
+  m_step2 = new Step2(this,modelData);
+  m_step3 = new Step3(this,modelData);
+  m_step4 = new Step4(this,modelData);
+  m_topicStack->addWidget(m_step1);
+  m_topicStack->addWidget(m_step2);
+  m_topicStack->addWidget(m_step3);
+  m_topicStack->addWidget(m_step4);
+
+  QWidget *rightSide = new QWidget;
+  QGridLayout *grid = new QGridLayout(rightSide);
+  m_prev = new QPushButton(tr("Previous"));
+  m_prev->setEnabled(false);
+  m_next = new QPushButton(tr("Next"));
+  grid->addWidget(m_topicStack,0,0,1,2);
+  grid->addWidget(m_prev,1,0,Qt::AlignLeft);
+  grid->addWidget(m_next,1,1,Qt::AlignRight);
+  grid->setColumnStretch(0,1);
+  grid->setRowStretch(0,1);
+  addWidget(m_treeWidget);
+  addWidget(rightSide);
+
+  connect(m_treeWidget,
+          SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
+          SLOT(activateTopic(QTreeWidgetItem *,QTreeWidgetItem *)));
+  connect(m_next,SIGNAL(clicked()),SLOT(nextTopic()));
+  connect(m_prev,SIGNAL(clicked()),SLOT(prevTopic()));
+
+  refresh();
+}
+
+Wizard::~Wizard()
+{
+}
+
+void Wizard::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *)
+{
+  if (item)
+  {
+    
+    QString label = item->text(0);
+    if (label==tr("Project"))
+    {
+      m_topicStack->setCurrentWidget(m_step1);
+      m_prev->setEnabled(false);
+      m_next->setEnabled(true);
+    }
+    else if (label==tr("Mode"))
+    {
+      m_topicStack->setCurrentWidget(m_step2);
+      m_prev->setEnabled(true);
+      m_next->setEnabled(true);
+    }
+    else if (label==tr("Output"))
+    {
+      m_topicStack->setCurrentWidget(m_step3);
+      m_prev->setEnabled(true);
+      m_next->setEnabled(true);
+    }
+    else if (label==tr("Diagrams"))
+    {
+      m_topicStack->setCurrentWidget(m_step4);
+      m_prev->setEnabled(true);
+      m_next->setEnabled(false);
+    }
+  }
+}
+
+void Wizard::nextTopic()
+{
+  m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1);
+  m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1);
+  m_prev->setEnabled(m_topicStack->currentIndex()!=0);
+  m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex()));
+}
+
+void Wizard::prevTopic()
+{
+  m_topicStack->setCurrentIndex(m_topicStack->currentIndex()-1);
+  m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1);
+  m_prev->setEnabled(m_topicStack->currentIndex()!=0);
+  m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex()));
+}
+
+void Wizard::refresh()
+{
+  m_step1->init();
+  m_step2->init();
+  m_step3->init();
+  m_step4->init();
+}
diff --git a/addon/doxywizard/wizard.h b/addon/doxywizard/wizard.h
new file mode 100644
index 0000000..d482db9
--- /dev/null
+++ b/addon/doxywizard/wizard.h
@@ -0,0 +1,182 @@
+/******************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2007 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
+#ifndef WIZARD_H
+#define WIZARD_H
+
+#include <QSplitter>
+#include <QHash>
+
+class Input;
+class QTreeWidget;
+class QTreeWidgetItem;
+class QStackedWidget;
+class QCheckBox;
+class QLineEdit;
+class QPushButton;
+class QRadioButton;
+class QGroupBox;
+class QButtonGroup;
+class Wizard;
+
+enum OptLang     { Lang_Cpp, Lang_C, Lang_Java, Lang_CS };
+enum HtmlStyle   { HS_Plain, HS_TreeView, HS_CHM };
+enum TexStyle    { TS_PDFHyper, TS_PDF, TS_PS };
+enum DiagramMode { DM_None, DM_Builtin, DM_Dot };
+
+class Step1 : public QWidget
+{
+    Q_OBJECT
+
+  public:
+    Step1(Wizard *parent,const QHash<QString,Input*> &modelData);
+    void init();
+
+  private slots:
+    void selectSourceDir(); 
+    void selectDestinationDir(); 
+    void setProjectName(const QString &name);
+    void setProjectNumber(const QString &num);
+    void setSourceDir(const QString &dir);
+    void setDestinationDir(const QString &dir);
+    void setRecursiveScan(int);
+
+  private:
+    QLineEdit *m_projName;
+    QLineEdit *m_projNumber;
+    QLineEdit *m_sourceDir;
+    QLineEdit *m_destDir;
+    QCheckBox *m_recursive;
+    QPushButton *m_srcSelectDir;
+    QPushButton *m_dstSelectDir;
+    Wizard    *m_wizard;
+    const QHash<QString,Input *> &m_modelData;
+};
+
+class Step2 : public QWidget
+{
+    Q_OBJECT
+  public:
+    Step2(Wizard *parent,const QHash<QString,Input*> &modelData);
+    void init();
+
+  private slots:
+    void optimizeFor(int choice);
+    void extractMode(int choice);
+    void changeCrossRefState(int choice);
+
+  private:
+    QGroupBox    *m_extractMode;
+    QGroupBox    *m_optimizeLang;
+    QButtonGroup *m_extractModeGroup;
+    QButtonGroup *m_optimizeLangGroup;
+    QCheckBox    *m_crossRef;
+    Wizard       *m_wizard;
+    const QHash<QString,Input *> &m_modelData;
+};
+
+class Step3 : public QWidget
+{
+    Q_OBJECT
+
+  public:
+    Step3(Wizard *parent,const QHash<QString,Input*> &modelData);
+    void init();
+
+  private slots:
+    void setHtmlEnabled(bool);
+    void setLatexEnabled(bool);
+    void setManEnabled(int);
+    void setRtfEnabled(int);
+    void setXmlEnabled(int);
+    void setSearchEnabled(int);
+    void setHtmlOptions(int);
+    void setLatexOptions(int);
+
+  private:
+    QGroupBox *m_texOptions;
+    QButtonGroup *m_texOptionsGroup;
+    QGroupBox *m_htmlOptions;
+    QButtonGroup *m_htmlOptionsGroup;
+    QCheckBox *m_htmlEnabled;
+    QCheckBox *m_latexEnabled;
+    QCheckBox *m_manEnabled;
+    QCheckBox *m_rtfEnabled;
+    QCheckBox *m_xmlEnabled;
+    QCheckBox *m_searchEnabled;
+    Wizard    *m_wizard;
+    const QHash<QString,Input *> &m_modelData;
+};
+
+class Step4 : public QWidget
+{
+    Q_OBJECT
+
+  public:
+    Step4(Wizard *parent,const QHash<QString,Input*> &modelData);
+    void init();
+
+  private slots:
+    void diagramModeChanged(int);
+    void setClassGraphEnabled(int state);
+    void setCollaborationGraphEnabled(int state);
+    void setGraphicalHierarchyEnabled(int state);
+    void setIncludeGraphEnabled(int state);
+    void setIncludedByGraphEnabled(int state);
+    void setCallGraphEnabled(int state);
+    void setCallerGraphEnabled(int state);
+
+  private:
+    QGroupBox *m_diagramMode;
+    QButtonGroup *m_diagramModeGroup;
+    QGroupBox *m_dotGroup;
+    QCheckBox *m_dotClass;
+    QCheckBox *m_dotCollaboration;
+    QCheckBox *m_dotInclude;
+    QCheckBox *m_dotIncludedBy;
+    QCheckBox *m_dotInheritance;
+    QCheckBox *m_dotCall;
+    QCheckBox *m_dotCaller;
+    Wizard    *m_wizard;
+    const QHash<QString,Input *> &m_modelData;
+};
+
+class Wizard : public QSplitter
+{
+    Q_OBJECT
+  public:
+    Wizard(const QHash<QString,Input*> &modelData, QWidget *parent=0);
+   ~Wizard();
+
+  public slots:
+    void refresh();
+
+  private slots:
+    void activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *);
+    void nextTopic();
+    void prevTopic();
+
+  private:
+    const QHash<QString,Input *> &m_modelData;
+    QTreeWidget    *m_treeWidget;
+    QStackedWidget *m_topicStack;
+    Step1          *m_step1;
+    Step2          *m_step2;
+    Step3          *m_step3;
+    Step4          *m_step4;
+    QPushButton    *m_next;
+    QPushButton    *m_prev;
+};
+
+#endif
diff --git a/configure b/configure
index 1941a2e..6ca8cab 100755
--- a/configure
+++ b/configure
@@ -20,7 +20,7 @@ doxygen_version_minor=5
 doxygen_version_revision=7.1
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=20081103
+doxygen_version_mmn=NO
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 
@@ -38,7 +38,7 @@ f_app=NO
 f_thread=NO
 f_flex=NO
 f_bison=NO
-f_langs=nl,se,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa,vi
+f_langs=nl,se,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa,vi,tr
 
 while test -n "$1";  do
   case $1 in
@@ -263,13 +263,12 @@ fi
 
 #- check for qt --------------------------------------------------------------
  
-LIBDIR=lib
 if test "$f_wizard" = YES; then
   if test -z "$QTDIR"; then
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
-    for d in /usr/{lib,share,qt}/{qt-3,qt3,qt,qt*,3}; do
-      if test -d "$d/lib" -a -d "$d/include" -a -x "$d/bin/moc"; then
+    for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+      if test -x "$d/bin/qmake"; then
         QTDIR=$d
       fi
     done
@@ -280,30 +279,9 @@ if test "$f_wizard" = YES; then
   if test -z "$QTDIR"; then
     echo "QTDIR not set and Qt not found at standard locations!"
     echo
-    echo "tmake requires the QTDIR environment variable to be set."
+    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
     echo "check the Qt installation instructions!"
     exit 2
-  else
-    if test ! -d "$QTDIR/lib"; then
-      if test ! -d "$QTDIR/lib64"; then
-        echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!"
-        exit 2
-      fi
-      LIBDIR=lib64
-    fi
-    if test ! -d "$QTDIR/include"; then
-      echo "QTDIR is set to $QTDIR, but include directory $QTDIR/include does not exist!"
-      exit 2
-    fi
-    if test ! -x "$QTDIR/bin/moc"; then
-      echo "QTDIR is set to $QTDIR, but the moc tool could not be found in $QTDIR/bin!"
-      exit 2
-    fi
-    echo " headers $QTDIR/include,"
-    echo "                     libraries $QTDIR/$LIBDIR"  
-    if test -n "`ls $QTDIR/$LIBDIR/* | grep qt-mt`"; then
-      f_thread=YES
-    fi
   fi
 fi
    
@@ -654,9 +632,9 @@ EOF
      else
        realopts="debug"
      fi
-     if test "$f_thread" = YES; then
-       realopts="$realopts thread"
-     fi
+     #if test "$f_thread" = YES; then
+     #  realopts="$realopts thread"
+     #fi
      cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" >> $DST
      echo "  Created $DST from $SRC..."
 done
@@ -669,7 +647,7 @@ fi
 echo -n "  Generating src/lang_cfg.h..."
 echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>); 
         chomp @l; 
-	@allowed=(split(/,/,"NL,SE,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,MK,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA,SC,VI"));
+	@allowed=(split(/,/,"NL,SE,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,MK,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA,SC,VI,TR"));
 	foreach my $elem (@l){ 
 	     $elem =~ tr/a-z/A-Z/;
 	     $r=0;
diff --git a/doc/config.doc b/doc/config.doc
index 0df3524..6e0958a 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -1118,7 +1118,7 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
  If the \c REFERENCES_LINK_SOURCE tag is set to \c YES (the default)
  and SOURCE_BROWSER tag is set to \c YES, then the hyperlinks from 
  functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
- link to the source code.  Otherwise they will link to the documentstion.
+ link to the source code.  Otherwise they will link to the documentation.
 
 \anchor cfg_verbatim_headers
 <dt>\c VERBATIM_HEADERS <dd>
diff --git a/doc/install.doc b/doc/install.doc
index 77530fa..60885d1 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -390,7 +390,7 @@ Download the zip extract it to e.g. <code>c:\\tools\\unxutils</code>.
 Now you need to add/adjust the following environment variables 
 (via Control Panel/System/Advanced/Environment Variables):
 - add <code>c:\\tools\\unxutils\\usr\\local\\wbin;</code> to the start of <code>PATH</code>
-- set <code>BISON_SIMPLE</code> to <code>c:\\tools\\unxutils\\usr\\share\\bison.simple</code>
+- set <code>BISON_SIMPLE</code> to <code>c:\\tools\\unxutils\\usr\\local\\share\\bison.simple</code>
 
 Download doxygen's source tarball and put it somewhere (e.g use <code>c:\\tools</code>)
 
diff --git a/doc/language.doc b/doc/language.doc
index 623be4b..65311ff 100644
--- a/doc/language.doc
+++ b/doc/language.doc
@@ -23,14 +23,14 @@ text fragments, generated by doxygen, can be produced in languages other
 than English (the default). The output language is chosen through the
 configuration file (with default name and known as Doxyfile).
 
-Currently (version 1.5.7.1), 36 languages 
+Currently (version 1.5.7.1), 37 languages 
 are supported (sorted alphabetically):
 Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
 Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
 German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
 (+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese,
 Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish,
-Swedish, Ukrainian, and Vietnamese..
+Swedish, Turkish, Ukrainian, and Vietnamese..
 
 The table of information related to the supported languages follows.
 It is sorted by language alphabetically.  The <b>Status</b> column
@@ -268,6 +268,12 @@ when the translator was updated.
     <td>1.4.6</td>
   </tr>
   <tr bgcolor="#ffffff">
+    <td>Turkish</td>
+    <td>Emin Ilker Cetinbas</td>
+    <td>niw3 at yahoo dot com</td>
+    <td>up-to-date</td>
+  </tr>
+  <tr bgcolor="#ffffff">
     <td>Ukrainian</td>
     <td>Olexij Tkatchenko</td>
     <td>olexij.tkatchenko at parcs dot de</td>
@@ -380,6 +386,8 @@ when the translator was updated.
   \hline
   Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.4.6 \\
   \hline
+  Turkish & Emin Ilker Cetinbas & {\tt\tiny niw3@yahoo.com} & up-to-date \\
+  \hline
   Ukrainian & Olexij Tkatchenko & {\tt\tiny olexij.tkatchenko@parcs.de} & 1.4.1 \\
   \hline
   Vietnamese & Dang Minh Tuan & {\tt\tiny tuanvietkey@gmail.com} & up-to-date \\
@@ -408,16 +416,14 @@ Just follow these steps:
 <li>Create a copy of translator_en.h and name it 
     translator_\<your_2_letter_country_code\>.h
     I'll use xx in the rest of this document.
-<li>Add definition of the symbol for your language into lang_cfg.h:
-\verbatim
-#define LANG_xx
-\endverbatim
-    Use capital letters for your \c xx (to be consistent).  The \c lang_cfg.h
-    defines which language translators will be compiled into doxygen
-    executable.  It is a kind of configuration file.  If you are sure that
-    you do not need some of the languages, you can remove (comment out)
-    definitions of symbols for the languages, or you can say \c \#undef
-    instead of \c \#define for them.
+<li>Add definition of the symbol for your language in the configure 
+at two places in the script:
+  <ol>
+  <li>After the <code>f_langs=</code> is statement, in lower case.
+  <li>In the string that following <code>@allowed=</code> in upper case.
+  </ol>
+The rerun the configure script such that is generates src/lang_cfg.h.
+This file should now contain a #define for your language code.
 <li>Edit language.cpp:
     Add a 
 \verbatim
diff --git a/doc/language.tpl b/doc/language.tpl
index dea2252..f15fa00 100644
--- a/doc/language.tpl
+++ b/doc/language.tpl
@@ -58,16 +58,14 @@ Just follow these steps:
 <li>Create a copy of translator_en.h and name it 
     translator_\<your_2_letter_country_code\>.h
     I'll use xx in the rest of this document.
-<li>Add definition of the symbol for your language into lang_cfg.h:
-\verbatim
-#define LANG_xx
-\endverbatim
-    Use capital letters for your \c xx (to be consistent).  The \c lang_cfg.h
-    defines which language translators will be compiled into doxygen
-    executable.  It is a kind of configuration file.  If you are sure that
-    you do not need some of the languages, you can remove (comment out)
-    definitions of symbols for the languages, or you can say \c \#undef
-    instead of \c \#define for them.
+<li>Add definition of the symbol for your language in the configure 
+at two places in the script:
+  <ol>
+  <li>After the <code>f_langs=</code> is statement, in lower case.
+  <li>In the string that following <code>@allowed=</code> in upper case.
+  </ol>
+The rerun the configure script such that is generates src/lang_cfg.h.
+This file should now contain a #define for your language code.
 <li>Edit language.cpp:
     Add a 
 \verbatim
diff --git a/doc/maintainers.txt b/doc/maintainers.txt
index 3ad583f..9c61314 100644
--- a/doc/maintainers.txt
+++ b/doc/maintainers.txt
@@ -130,3 +130,7 @@ Olexij Tkatchenko: olexij.tkatchenko@parcs.de
 
 TranslatorVietnamese
 Dang Minh Tuan: tuanvietkey@gmail.com
+
+TranslatorTurkish
+Emin Ilker Cetinbas: niw3@yahoo.com
+
diff --git a/doc/translator_report.txt b/doc/translator_report.txt
index 9379fd6..9f1f670 100644
--- a/doc/translator_report.txt
+++ b/doc/translator_report.txt
@@ -1,15 +1,15 @@
 (1.5.7.1)
 
-Doxygen supports the following 36 languages (sorted alphabetically):
+Doxygen supports the following 37 languages (sorted alphabetically):
 
 Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
 Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
 German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
 (+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese,
 Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish,
-Swedish, Ukrainian, and Vietnamese.
+Swedish, Turkish, Ukrainian, and Vietnamese.
 
-Of them, 19 translators are up-to-date, 17 translators are based on
+Of them, 20 translators are up-to-date, 17 translators are based on
 some adapter class, and 2 are English based.
 
 ----------------------------------------------------------------------
@@ -36,6 +36,7 @@ still may be some details listed even for them:
   TranslatorSerbianCyrilic
   TranslatorSerbian
   TranslatorSpanish -- Change the base class to Translator.
+  TranslatorTurkish
   TranslatorVietnamese
 
 ----------------------------------------------------------------------
diff --git a/src/config.h b/src/config.h
index e2cf96b..f87b2ba 100644
--- a/src/config.h
+++ b/src/config.h
@@ -342,7 +342,8 @@ class ConfigBool : public ConfigOption
 class ConfigObsolete : public ConfigOption
 {
   public:
-    ConfigObsolete(OptionType t) : ConfigOption(t)  {}
+    ConfigObsolete(const char *name,OptionType t) : ConfigOption(t)  
+    { m_name = name; }
     void writeTemplate(QTextStream &,bool,bool) {}
     void substEnvVars() {}
     void writeXML(QTextStream&);
@@ -523,7 +524,7 @@ class Config
     /*! Adds an option that has become obsolete. */
     ConfigOption *addObsolete(const char *name)
     {
-      ConfigObsolete *option = new ConfigObsolete(ConfigOption::O_Obsolete);
+      ConfigObsolete *option = new ConfigObsolete(name,ConfigOption::O_Obsolete);
       m_dict->insert(name,option);
       m_obsolete->append(option);
       return option;
diff --git a/src/config.l b/src/config.l
index 0b07236..1f72fe6 100644
--- a/src/config.l
+++ b/src/config.l
@@ -284,7 +284,9 @@ void ConfigInt::writeXML(QTextStream& t)
        "docs='\n" << convertToXML(docs()) << "' "
        "minval='" << m_minVal << "' "
        "maxval='" << m_maxVal << "' "
-       "defval='" << m_defValue << "'/>" << endl;
+       "defval='" << m_defValue << "'";
+  if (!m_dependency.isEmpty()) t << " depends='" << m_dependency << "'";
+  t << "/>" << endl;
 }
 
 void ConfigBool::writeXML(QTextStream& t)
@@ -292,7 +294,9 @@ void ConfigBool::writeXML(QTextStream& t)
   t << "    <option type='bool' "
        "id='" << convertToXML(name()) << "' "
        "docs='\n" << convertToXML(docs()) << "' "
-       "defval='" << m_defValue << "'/>" << endl;
+       "defval='" << m_defValue << "'";
+  if (!m_dependency.isEmpty()) t << " depends='" << m_dependency << "'";
+  t << "/>" << endl;
 }
 
 void ConfigString::writeXML(QTextStream& t)
@@ -308,7 +312,9 @@ void ConfigString::writeXML(QTextStream& t)
        "id='" << convertToXML(name()) << "' "
        "format='" << format << "' "
        "docs='\n" << convertToXML(docs()) << "' "
-       "defval='" << convertToXML(m_defValue) << "'/>" << endl;
+       "defval='" << convertToXML(m_defValue) << "'";
+  if (!m_dependency.isEmpty()) t << " depends='" << m_dependency << "'";
+  t << "/>" << endl;
 }
 
 void ConfigEnum::writeXML(QTextStream &t)
@@ -316,7 +322,9 @@ void ConfigEnum::writeXML(QTextStream &t)
   t << "    <option type='enum' "
        "id='" << convertToXML(name()) << "' "
        "defval='" << convertToXML(m_defValue) << "' "
-       "docs='\n" << convertToXML(docs()) << "'>" << endl;
+       "docs='\n" << convertToXML(docs()) << "'";
+  if (!m_dependency.isEmpty()) t << " depends='" << m_dependency << "'";
+  t << ">" << endl;
 
   char *enumVal = m_valueRange.first();
   while (enumVal)
@@ -341,7 +349,9 @@ void ConfigList::writeXML(QTextStream &t)
   t << "    <option type='list' "
        "id='" << convertToXML(name()) << "' "
        "format='" << format << "' "
-       "docs='\n" << convertToXML(docs()) << "'>" << endl;
+       "docs='\n" << convertToXML(docs()) << "'";
+  if (!m_dependency.isEmpty()) t << " depends='" << m_dependency << "'";
+  t << ">" << endl;
   char *enumVal = m_value.first();
   while (enumVal)
   {
@@ -355,8 +365,7 @@ void ConfigList::writeXML(QTextStream &t)
 void ConfigObsolete::writeXML(QTextStream &t)
 {
   t << "    <option type='obsolete' "
-       "id='" << convertToXML(name()) << "' "
-       "docs='" << convertToXML(docs()) << "'/>" << endl;
+       "id='" << convertToXML(name()) << "'/>" << endl;
 }
 
 
@@ -815,8 +824,8 @@ void Config::writeTemplate(QTextStream &t,bool sl,bool upd)
 void Config::writeXML(QTextStream &t)
 {
   t << "<doxygenconfig>" << endl;
-  ConfigOption *option = m_options->first();
   bool first=TRUE;
+  ConfigOption *option = m_options->first();
   while (option)
   {
     if (option->kind()==ConfigOption::O_Info)
@@ -832,6 +841,12 @@ void Config::writeXML(QTextStream &t)
     }
     option = m_options->next();
   }
+  option = m_obsolete->first();
+  while (option)
+  {
+    option->writeXML(t);
+    option = m_obsolete->next();
+  }
   if (!first) t << "  </group>" << endl;
   t << "</doxygenconfig>" << endl;
 }
@@ -1337,29 +1352,26 @@ void Config::check()
   // check QHP creation requirements
   if (Config_getBool("GENERATE_QHP"))
   {
-    bool quit = false;
+    bool qhp=TRUE;
     if (!Config_getBool("GENERATE_HTML"))
     {
-      config_err("Warning: GENERATE_QHP=YES requires GENERATE_HTML=YES.\n");
-      quit = true;
+      config_err("Error: GENERATE_QHP=YES requires GENERATE_HTML=YES. Disabling QHP output.\n");
+      qhp=FALSE;
     }
 
     if (Config_getString("QHP_NAMESPACE").isEmpty())
     {
-      config_err("Warning: GENERATE_QHP=YES requires QHP_NAMESPACE to be set.\n");
-      quit = true;
+      config_err("Error: GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Disabling QHP output.\n");
+      qhp=FALSE;
     }
 
     if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty())
     {
-      config_err("Warning: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set.\n");
-      quit = true;
+      config_err("Error: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Disabling QHP output.\n");
+      qhp=FALSE;
     }
 
-    if (quit)
-    {
-      exit(1);
-    }
+    Config_getBool("GENERATE_QHP")=qhp;
   }
 
   // check QCH creation requirements
diff --git a/src/config.xml b/src/config.xml
new file mode 100644
index 0000000..90b77b2
--- /dev/null
+++ b/src/config.xml
@@ -0,0 +1,1383 @@
+<doxygenconfig>
+  <group name='Project' docs='Project related configuration options'>
+    <option type='string' id='DOXYFILE_ENCODING' format='string' docs='
+This tag specifies the encoding used for all characters in the config file 
+that follow. The default is UTF-8 which is also the encoding used for all 
+text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+iconv built into libc) for the transcoding. See 
+http://www.gnu.org/software/libiconv for the list of possible encodings. 
+' defval='UTF-8'/>
+    <option type='string' id='PROJECT_NAME' format='string' docs='
+The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+by quotes) that should identify the project. ' defval=''/>
+    <option type='string' id='PROJECT_NUMBER' format='string' docs='
+The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+This could be handy for archiving the generated documentation or 
+if some version control system is used. 
+' defval=''/>
+    <option type='string' id='OUTPUT_DIRECTORY' format='dir' docs='
+The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+base path where the generated documentation will be put. 
+If a relative path is entered, it will be relative to the location 
+where doxygen was started. If left blank the current directory will be used. 
+' defval=''/>
+    <option type='bool' id='CREATE_SUBDIRS' docs='
+If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+4096 sub-directories (in 2 levels) under the output directory of each output 
+format and will distribute the generated files over these directories. 
+Enabling this option can be useful when feeding doxygen a huge amount of 
+source files, where putting all generated files in the same directory would 
+otherwise cause performance problems for the file system. 
+' defval='0'/>
+    <option type='enum' id='OUTPUT_LANGUAGE' defval='English' docs='
+The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+documentation generated by doxygen is written. Doxygen will use this 
+information to generate all constant output in the proper language. 
+The default language is English, other supported languages are: 
+Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+Spanish, Swedish, and Ukrainian. 
+'>
+      <value name='Afrikaans'/>
+      <value name='Arabic'/>
+      <value name='Brazilian'/>
+      <value name='Catalan'/>
+      <value name='Chinese'/>
+      <value name='Chinese-Traditional'/>
+      <value name='Croatian'/>
+      <value name='Czech'/>
+      <value name='Danish'/>
+      <value name='Dutch'/>
+      <value name='English'/>
+      <value name='Finnish'/>
+      <value name='French'/>
+      <value name='German'/>
+      <value name='Greek'/>
+      <value name='Hungarian'/>
+      <value name='Italian'/>
+      <value name='Japanese'/>
+      <value name='Japanese-en'/>
+      <value name='Korean'/>
+      <value name='Korean-en'/>
+      <value name='Norwegian'/>
+      <value name='Farsi'/>
+      <value name='Persian'/>
+      <value name='Polish'/>
+      <value name='Portuguese'/>
+      <value name='Romanian'/>
+      <value name='Russian'/>
+      <value name='Serbian'/>
+      <value name='Slovak'/>
+      <value name='Slovene'/>
+      <value name='Spanish'/>
+      <value name='Swedish'/>
+      <value name='Ukrainian'/>
+    </option>
+    <option type='bool' id='BRIEF_MEMBER_DESC' docs='
+If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+include brief member descriptions after the members that are listed in 
+the file and class documentation (similar to JavaDoc). 
+Set to NO to disable this. 
+' defval='1'/>
+    <option type='bool' id='REPEAT_BRIEF' docs='
+If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+the brief description of a member or function before the detailed description. 
+Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+brief descriptions will be completely suppressed. 
+' defval='1'/>
+    <option type='list' id='ABBREVIATE_BRIEF' format='string' docs='
+This tag implements a quasi-intelligent brief description abbreviator 
+that is used to form the text in various listings. Each string 
+in this list, if found as the leading text of the brief description, will be 
+stripped from the text and the result after processing the whole list, is 
+used as the annotated text. Otherwise, the brief description is used as-is. 
+If left blank, the following values are used (&quot;$name&quot; is automatically 
+replaced with the name of the entity): &quot;The $name class&quot; &quot;The $name widget&quot; 
+&quot;The $name file&quot; &quot;is&quot; &quot;provides&quot; &quot;specifies&quot; &quot;contains&quot; 
+&quot;represents&quot; &quot;a&quot; &quot;an&quot; &quot;the&quot; 
+'>
+      <value name='The $name class'/>
+      <value name='The $name widget'/>
+      <value name='The $name file'/>
+      <value name='is'/>
+      <value name='provides'/>
+      <value name='specifies'/>
+      <value name='contains'/>
+      <value name='represents'/>
+      <value name='a'/>
+      <value name='an'/>
+      <value name='the'/>
+    </option>
+    <option type='bool' id='ALWAYS_DETAILED_SEC' docs='
+If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+Doxygen will generate a detailed section even if there is only a brief 
+description. 
+' defval='0'/>
+    <option type='bool' id='INLINE_INHERITED_MEMB' docs='
+If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+inherited members of a class in the documentation of that class as if those 
+members were ordinary class members. Constructors, destructors and assignment 
+operators of the base classes will not be shown. 
+' defval='0'/>
+    <option type='bool' id='FULL_PATH_NAMES' docs='
+If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+path before files name in the file list and in the header files. If set 
+to NO the shortest path that makes the file name unique will be used. 
+' defval='1'/>
+    <option type='list' id='STRIP_FROM_PATH' format='string' docs='
+If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+can be used to strip a user-defined part of the path. Stripping is 
+only done if one of the specified strings matches the left-hand part of 
+the path. The tag can be used to show relative paths in the file list. 
+If left blank the directory from which doxygen is run is used as the 
+path to strip. 
+' depends='FULL_PATH_NAMES'>
+      <value name='/Users/dimitri/doxygen/mail/1.5.7/doxywizard/'/>
+    </option>
+    <option type='list' id='STRIP_FROM_INC_PATH' format='string' docs='
+The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+the path mentioned in the documentation of a class, which tells 
+the reader which header file to include in order to use a class. 
+If left blank only the name of the header file containing the class 
+definition is used. Otherwise one should specify the include paths that 
+are normally passed to the compiler using the -I flag. 
+'>
+    </option>
+    <option type='bool' id='SHORT_NAMES' docs='
+If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+(but less readable) file names. This can be useful is your file systems 
+doesn&apos;t support long names like on DOS, Mac, or CD-ROM. 
+' defval='0'/>
+    <option type='bool' id='JAVADOC_AUTOBRIEF' docs='
+If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+will interpret the first line (until the first dot) of a JavaDoc-style 
+comment as the brief description. If set to NO, the JavaDoc 
+comments will behave just like regular Qt-style comments 
+(thus requiring an explicit @brief command for a brief description.) 
+' defval='0'/>
+    <option type='bool' id='QT_AUTOBRIEF' docs='
+If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+interpret the first line (until the first dot) of a Qt-style 
+comment as the brief description. If set to NO, the comments 
+will behave just like regular Qt-style comments (thus requiring 
+an explicit \brief command for a brief description.) 
+' defval='0'/>
+    <option type='bool' id='MULTILINE_CPP_IS_BRIEF' docs='
+The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+comments) as a brief description. This used to be the default behaviour. 
+The new default is to treat a multi-line C++ comment block as a detailed 
+description. Set this tag to YES if you prefer the old behaviour instead. 
+' defval='0'/>
+    <option type='bool' id='INHERIT_DOCS' docs='
+If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+member inherits the documentation from any documented member that it 
+re-implements. 
+' defval='1'/>
+    <option type='bool' id='SEPARATE_MEMBER_PAGES' docs='
+If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+a new page for each member. If set to NO, the documentation of a member will 
+be part of the file/class/namespace that contains it. 
+' defval='0'/>
+    <option type='int' id='TAB_SIZE' docs='
+The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+Doxygen uses this value to replace tabs by spaces in code fragments. 
+' minval='1' maxval='16' defval='8'/>
+    <option type='list' id='ALIASES' format='string' docs='
+This tag can be used to specify a number of aliases that acts 
+as commands in the documentation. An alias has the form &quot;name=value&quot;. 
+For example adding &quot;sideeffect=\par Side Effects:\n&quot; will allow you to 
+put the command \sideeffect (or @sideeffect) in the documentation, which 
+will result in a user-defined paragraph with heading &quot;Side Effects:&quot;. 
+You can put \n&apos;s in the value part of an alias to insert newlines. 
+'>
+    </option>
+    <option type='bool' id='OPTIMIZE_OUTPUT_FOR_C' docs='
+Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+sources only. Doxygen will then generate output that is more tailored for C. 
+For instance, some of the names that are used will be different. The list 
+of all members will be omitted, etc. 
+' defval='0'/>
+    <option type='bool' id='OPTIMIZE_OUTPUT_JAVA' docs='
+Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+sources only. Doxygen will then generate output that is more tailored for 
+Java. For instance, namespaces will be presented as packages, qualified 
+scopes will look different, etc. 
+' defval='0'/>
+    <option type='bool' id='OPTIMIZE_FOR_FORTRAN' docs='
+Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+sources only. Doxygen will then generate output that is more tailored for 
+Fortran. 
+' defval='0'/>
+    <option type='bool' id='OPTIMIZE_OUTPUT_VHDL' docs='
+Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+sources. Doxygen will then generate output that is tailored for 
+VHDL. 
+' defval='0'/>
+    <option type='list' id='EXTENSION_MAPPING' format='string' docs='
+Doxygen selects the parser to use depending on the extension of the files it parses. 
+With this tag you can assign which parser to use for a given extension. 
+Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+The format is ext=language, where ext is a file extension, and language is one of 
+the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+.inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+use: inc=Fortran f=C 
+'>
+    </option>
+    <option type='bool' id='BUILTIN_STL_SUPPORT' docs='
+If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+to include (a tag file for) the STL sources as input, then you should 
+set this tag to YES in order to let doxygen match functions declarations and 
+definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+func(std::string) {}). This also make the inheritance and collaboration 
+diagrams that involve STL classes more complete and accurate. 
+' defval='0'/>
+    <option type='bool' id='CPP_CLI_SUPPORT' docs='
+If you use Microsoft&apos;s C++/CLI language, you should set this option to YES to 
+enable parsing support. 
+' defval='0'/>
+    <option type='bool' id='SIP_SUPPORT' docs='
+Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+Doxygen will parse them like normal C++ but will assume all classes use public 
+instead of private inheritance when no explicit protection keyword is present. 
+' defval='0'/>
+    <option type='bool' id='IDL_PROPERTY_SUPPORT' docs='
+For Microsoft&apos;s IDL there are propget and propput attributes to indicate getter 
+and setter methods for a property. Setting this option to YES (the default) 
+will make doxygen to replace the get and set methods by a property in the 
+documentation. This will only work if the methods are indeed getting or 
+setting a simple type. If this is not the case, or you want to show the 
+methods anyway, you should set this option to NO. 
+' defval='1'/>
+    <option type='bool' id='DISTRIBUTE_GROUP_DOC' docs='
+If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+tag is set to YES, then doxygen will reuse the documentation of the first 
+member in the group (if any) for the other members of the group. By default 
+all members of a group must be documented explicitly. 
+' defval='0'/>
+    <option type='bool' id='SUBGROUPING' docs='
+Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+the same type (for instance a group of public functions) to be put as a 
+subgroup of that type (e.g. under the Public Functions section). Set it to 
+NO to prevent subgrouping. Alternatively, this can be done per class using 
+the \nosubgrouping command. 
+' defval='1'/>
+    <option type='bool' id='TYPEDEF_HIDES_STRUCT' docs='
+When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+is documented as struct, union, or enum with the name of the typedef. So 
+typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+with name TypeT. When disabled the typedef will appear as a member of a file, 
+namespace, or class. And the struct will be named TypeS. This can typically 
+be useful for C code in case the coding convention dictates that all compound 
+types are typedef&apos;ed and only the typedef is referenced, never the tag name. 
+' defval='0'/>
+    <option type='int' id='SYMBOL_CACHE_SIZE' docs='
+The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+determine which symbols to keep in memory and which to flush to disk. 
+When the cache is full, less often used symbols will be written to disk. 
+For small to medium size projects (&lt;1000 input files) the default value is 
+probably good enough. For larger projects a too small cache size can cause 
+doxygen to be busy swapping symbols to and from disk most of the time 
+causing a significant performance penality. 
+If the system has enough physical memory increasing the cache will improve the 
+performance by keeping more symbols in memory. Note that the value works on 
+a logarithmic scale so increasing the size by one will rougly double the 
+memory usage. The cache size is given by this formula: 
+2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+corresponding to a cache size of 2^16 = 65536 symbols 
+' minval='0' maxval='9' defval='0'/>
+  </group>
+  <group name='Build' docs='Build related configuration options'>
+    <option type='bool' id='EXTRACT_ALL' docs='
+If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+documentation are documented, even if no documentation was available. 
+Private class members and static file members will be hidden unless 
+the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES 
+' defval='0'/>
+    <option type='bool' id='EXTRACT_PRIVATE' docs='
+If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+will be included in the documentation. 
+' defval='0'/>
+    <option type='bool' id='EXTRACT_STATIC' docs='
+If the EXTRACT_STATIC tag is set to YES all static members of a file 
+will be included in the documentation. 
+' defval='0'/>
+    <option type='bool' id='EXTRACT_LOCAL_CLASSES' docs='
+If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+defined locally in source files will be included in the documentation. 
+If set to NO only classes defined in header files are included. 
+' defval='1'/>
+    <option type='bool' id='EXTRACT_LOCAL_METHODS' docs='
+This flag is only useful for Objective-C code. When set to YES local 
+methods, which are defined in the implementation section but not in 
+the interface are included in the documentation. 
+If set to NO (the default) only methods in the interface are included. 
+' defval='0'/>
+    <option type='bool' id='EXTRACT_ANON_NSPACES' docs='
+If this flag is set to YES, the members of anonymous namespaces will be 
+extracted and appear in the documentation as a namespace called 
+&apos;anonymous_namespace{file}&apos;, where file will be replaced with the base 
+name of the file that contains the anonymous namespace. By default 
+anonymous namespace are hidden. 
+' defval='0'/>
+    <option type='bool' id='HIDE_UNDOC_MEMBERS' docs='
+If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+undocumented members of documented classes, files or namespaces. 
+If set to NO (the default) these members will be included in the 
+various overviews, but no documentation section is generated. 
+This option has no effect if EXTRACT_ALL is enabled. 
+' defval='0'/>
+    <option type='bool' id='HIDE_UNDOC_CLASSES' docs='
+If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+undocumented classes that are normally visible in the class hierarchy. 
+If set to NO (the default) these classes will be included in the various 
+overviews. This option has no effect if EXTRACT_ALL is enabled. 
+' defval='0'/>
+    <option type='bool' id='HIDE_FRIEND_COMPOUNDS' docs='
+If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+friend (class|struct|union) declarations. 
+If set to NO (the default) these declarations will be included in the 
+documentation. 
+' defval='0'/>
+    <option type='bool' id='HIDE_IN_BODY_DOCS' docs='
+If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+documentation blocks found inside the body of a function. 
+If set to NO (the default) these blocks will be appended to the 
+function&apos;s detailed documentation block. 
+' defval='0'/>
+    <option type='bool' id='INTERNAL_DOCS' docs='
+The INTERNAL_DOCS tag determines if documentation 
+that is typed after a \internal command is included. If the tag is set 
+to NO (the default) then the documentation will be excluded. 
+Set it to YES to include the internal documentation. 
+' defval='0'/>
+    <option type='bool' id='CASE_SENSE_NAMES' docs='
+If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+file names in lower-case letters. If set to YES upper-case letters are also 
+allowed. This is useful if you have classes or files whose names only differ 
+in case and if your file system supports case sensitive file names. Windows 
+and Mac users are advised to set this option to NO. 
+' defval='0' altdefval='portable_fileSystemIsCaseSensitive()'/>
+    <option type='bool' id='HIDE_SCOPE_NAMES' docs='
+If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+will show members with their full class and namespace scopes in the 
+documentation. If set to YES the scope will be hidden. 
+' defval='0'/>
+    <option type='bool' id='SHOW_INCLUDE_FILES' docs='
+If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+will put a list of the files that are included by a file in the documentation 
+of that file. 
+' defval='1'/>
+    <option type='bool' id='INLINE_INFO' docs='
+If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+is inserted in the documentation for inline members. 
+' defval='1'/>
+    <option type='bool' id='SORT_MEMBER_DOCS' docs='
+If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+will sort the (detailed) documentation of file and class members 
+alphabetically by member name. If set to NO the members will appear in 
+declaration order. 
+' defval='1'/>
+    <option type='bool' id='SORT_BRIEF_DOCS' docs='
+If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+brief documentation of file, namespace and class members alphabetically 
+by member name. If set to NO (the default) the members will appear in 
+declaration order. 
+' defval='0'/>
+    <option type='bool' id='SORT_GROUP_NAMES' docs='
+If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+hierarchy of group names into alphabetical order. If set to NO (the default) 
+the group names will appear in their defined order. 
+' defval='0'/>
+    <option type='bool' id='SORT_BY_SCOPE_NAME' docs='
+If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+sorted by fully-qualified names, including namespaces. If set to 
+NO (the default), the class list will be sorted only by class name, 
+not including the namespace part. 
+Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+Note: This option applies only to the class list, not to the 
+alphabetical list. 
+' defval='0'/>
+    <option type='bool' id='GENERATE_TODOLIST' docs='
+The GENERATE_TODOLIST tag can be used to enable (YES) or 
+disable (NO) the todo list. This list is created by putting \todo 
+commands in the documentation. 
+' defval='1'/>
+    <option type='bool' id='GENERATE_TESTLIST' docs='
+The GENERATE_TESTLIST tag can be used to enable (YES) or 
+disable (NO) the test list. This list is created by putting \test 
+commands in the documentation. 
+' defval='1'/>
+    <option type='bool' id='GENERATE_BUGLIST' docs='
+The GENERATE_BUGLIST tag can be used to enable (YES) or 
+disable (NO) the bug list. This list is created by putting \bug 
+commands in the documentation. 
+' defval='1'/>
+    <option type='bool' id='GENERATE_DEPRECATEDLIST' docs='
+The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+disable (NO) the deprecated list. This list is created by putting 
+\deprecated commands in the documentation. 
+' defval='1'/>
+    <option type='list' id='ENABLED_SECTIONS' format='string' docs='
+The ENABLED_SECTIONS tag can be used to enable conditional 
+documentation sections, marked by \if sectionname ... \endif. 
+'>
+    </option>
+    <option type='int' id='MAX_INITIALIZER_LINES' docs='
+The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+the initial value of a variable or define consists of for it to appear in 
+the documentation. If the initializer consists of more lines than specified 
+here it will be hidden. Use a value of 0 to hide initializers completely. 
+The appearance of the initializer of individual variables and defines in the 
+documentation can be controlled using \showinitializer or \hideinitializer 
+command in the documentation regardless of this setting. 
+' minval='0' maxval='10000' defval='30'/>
+    <option type='bool' id='SHOW_USED_FILES' docs='
+Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+at the bottom of the documentation of classes and structs. If set to YES the 
+list will mention the files that were used to generate the documentation. 
+' defval='1'/>
+    <option type='bool' id='SHOW_DIRECTORIES' docs='
+If the sources in your project are distributed over multiple directories 
+then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+in the documentation. The default is NO. 
+' defval='0'/>
+    <option type='bool' id='SHOW_FILES' docs='
+Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+This will remove the Files entry from the Quick Index and from the 
+Folder Tree View (if specified). The default is YES. 
+' defval='1'/>
+    <option type='bool' id='SHOW_NAMESPACES' docs='
+Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+and from the Folder Tree View (if specified). The default is YES. 
+' defval='1'/>
+    <option type='string' id='FILE_VERSION_FILTER' format='file' docs='
+The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+doxygen should invoke to get the current version for each file (typically from 
+the version control system). Doxygen will invoke the program by executing (via 
+popen()) the command &lt;command&gt; &lt;input-file&gt;, where &lt;command&gt; is the value of 
+the FILE_VERSION_FILTER tag, and &lt;input-file&gt; is the name of an input file 
+provided by doxygen. Whatever the program writes to standard output 
+is used as the file version. See the manual for examples. 
+' defval=''/>
+    <option type='string' id='LAYOUT_FILE' format='file' docs='
+The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+doxygen. The layout file controls the global structure of the generated output files 
+in an output format independent way. The create the layout file that represents 
+doxygen&apos;s defaults, run doxygen with the -l option. You can optionally specify a 
+file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+of the layout file. 
+' defval=''/>
+  </group>
+  <group name='Messages' docs='configuration options related to warning and progress messages'>
+    <option type='bool' id='QUIET' docs='
+The QUIET tag can be used to turn on/off the messages that are generated 
+by doxygen. Possible values are YES and NO. If left blank NO is used. 
+' defval='0'/>
+    <option type='bool' id='WARNINGS' docs='
+The WARNINGS tag can be used to turn on/off the warning messages that are 
+generated by doxygen. Possible values are YES and NO. If left blank 
+NO is used. 
+' defval='1'/>
+    <option type='bool' id='WARN_IF_UNDOCUMENTED' docs='
+If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+automatically be disabled. 
+' defval='1'/>
+    <option type='bool' id='WARN_IF_DOC_ERROR' docs='
+If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+potential errors in the documentation, such as not documenting some 
+parameters in a documented function, or documenting parameters that 
+don&apos;t exist or using markup commands wrongly. 
+' defval='1'/>
+    <option type='bool' id='WARN_NO_PARAMDOC' docs='
+This WARN_NO_PARAMDOC option can be abled to get warnings for 
+functions that are documented, but have no documentation for their parameters 
+or return value. If set to NO (the default) doxygen will only warn about 
+wrong or incomplete parameter documentation, but not about the absence of 
+documentation. 
+' defval='0'/>
+    <option type='string' id='WARN_FORMAT' format='string' docs='
+The WARN_FORMAT tag determines the format of the warning messages that 
+doxygen can produce. The string should contain the $file, $line, and $text 
+tags, which will be replaced by the file and line number from which the 
+warning originated and the warning text. Optionally the format may contain 
+$version, which will be replaced by the version of the file (if it could 
+be obtained via FILE_VERSION_FILTER) 
+' defval='$file:$line: $text'/>
+    <option type='string' id='WARN_LOGFILE' format='file' docs='
+The WARN_LOGFILE tag can be used to specify a file to which warning 
+and error messages should be written. If left blank the output is written 
+to stderr. 
+' defval=''/>
+  </group>
+  <group name='Input' docs='configuration options related to the input files'>
+    <option type='list' id='INPUT' format='filedir' docs='
+The INPUT tag can be used to specify the files and/or directories that contain 
+documented source files. You may enter file names like &quot;myfile.cpp&quot; or 
+directories like &quot;/usr/src/myproject&quot;. Separate the files or directories 
+with spaces. 
+'>
+      <value name='/Users/dimitri/doxygen/mail/1.5.7/doxywizard'/>
+    </option>
+    <option type='string' id='INPUT_ENCODING' format='string' docs='
+This tag can be used to specify the character encoding of the source files 
+that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+also the default input encoding. Doxygen uses libiconv (or the iconv built 
+into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+the list of possible encodings. 
+' defval='UTF-8'/>
+    <option type='list' id='FILE_PATTERNS' format='string' docs='
+If the value of the INPUT tag contains directories, you can use the 
+FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+and *.h) to filter out the source-files in the directories. If left 
+blank the following patterns are tested: 
+*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+*.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 
+'>
+      <value name='*.c'/>
+      <value name='*.cc'/>
+      <value name='*.cxx'/>
+      <value name='*.cpp'/>
+      <value name='*.c++'/>
+      <value name='*.d'/>
+      <value name='*.java'/>
+      <value name='*.ii'/>
+      <value name='*.ixx'/>
+      <value name='*.ipp'/>
+      <value name='*.i++'/>
+      <value name='*.inl'/>
+      <value name='*.h'/>
+      <value name='*.hh'/>
+      <value name='*.hxx'/>
+      <value name='*.hpp'/>
+      <value name='*.h++'/>
+      <value name='*.idl'/>
+      <value name='*.odl'/>
+      <value name='*.cs'/>
+      <value name='*.php'/>
+      <value name='*.php3'/>
+      <value name='*.inc'/>
+      <value name='*.m'/>
+      <value name='*.mm'/>
+      <value name='*.dox'/>
+      <value name='*.py'/>
+      <value name='*.f90'/>
+      <value name='*.f'/>
+      <value name='*.vhd'/>
+      <value name='*.vhdl'/>
+    </option>
+    <option type='bool' id='RECURSIVE' docs='
+The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+should be searched for input files as well. Possible values are YES and NO. 
+If left blank NO is used. 
+' defval='0'/>
+    <option type='list' id='EXCLUDE' format='filedir' docs='
+The EXCLUDE tag can be used to specify files and/or directories that should 
+excluded from the INPUT source files. This way you can easily exclude a 
+subdirectory from a directory tree whose root is specified with the INPUT tag. 
+'>
+    </option>
+    <option type='bool' id='EXCLUDE_SYMLINKS' docs='
+The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+directories that are symbolic links (a Unix filesystem feature) are excluded 
+from the input. 
+' defval='0'/>
+    <option type='list' id='EXCLUDE_PATTERNS' format='string' docs='
+If the value of the INPUT tag contains directories, you can use the 
+EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+certain files from those directories. Note that the wildcards are matched 
+against the file with absolute path, so to exclude all test directories 
+for example use the pattern */test/* 
+'>
+    </option>
+    <option type='list' id='EXCLUDE_SYMBOLS' format='string' docs='
+The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+(namespaces, classes, functions, etc.) that should be excluded from the 
+output. The symbol name can be a fully qualified name, a word, or if the 
+wildcard * is used, a substring. Examples: ANamespace, AClass, 
+AClass::ANamespace, ANamespace::*Test 
+'>
+    </option>
+    <option type='list' id='EXAMPLE_PATH' format='dir' docs='
+The EXAMPLE_PATH tag can be used to specify one or more files or 
+directories that contain example code fragments that are included (see 
+the \include command). 
+'>
+    </option>
+    <option type='list' id='EXAMPLE_PATTERNS' format='string' docs='
+If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+and *.h) to filter out the source-files in the directories. If left 
+blank all files are included. 
+'>
+      <value name='*'/>
+    </option>
+    <option type='bool' id='EXAMPLE_RECURSIVE' docs='
+If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+searched for input files to be used with the \include or \dontinclude 
+commands irrespective of the value of the RECURSIVE tag. 
+Possible values are YES and NO. If left blank NO is used. 
+' defval='0'/>
+    <option type='list' id='IMAGE_PATH' format='dir' docs='
+The IMAGE_PATH tag can be used to specify one or more files or 
+directories that contain image that are included in the documentation (see 
+the \image command). 
+'>
+    </option>
+    <option type='string' id='INPUT_FILTER' format='file' docs='
+The INPUT_FILTER tag can be used to specify a program that doxygen should 
+invoke to filter for each input file. Doxygen will invoke the filter program 
+by executing (via popen()) the command &lt;filter&gt; &lt;input-file&gt;, where &lt;filter&gt; 
+is the value of the INPUT_FILTER tag, and &lt;input-file&gt; is the name of an 
+input file. Doxygen will then use the output that the filter program writes 
+to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+ignored. 
+' defval=''/>
+    <option type='list' id='FILTER_PATTERNS' format='file' docs='
+The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+basis.  Doxygen will compare the file name with each pattern and apply the 
+filter if there is a match.  The filters are a list of the form: 
+pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+is applied to all files. 
+'>
+    </option>
+    <option type='bool' id='FILTER_SOURCE_FILES' docs='
+If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+INPUT_FILTER) will be used to filter the input files when producing source 
+files to browse (i.e. when SOURCE_BROWSER is set to YES). 
+' defval='0'/>
+  </group>
+  <group name='Source Browser' docs='configuration options related to source browsing'>
+    <option type='bool' id='SOURCE_BROWSER' docs='
+If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+be generated. Documented entities will be cross-referenced with these sources. 
+Note: To get rid of all source code in the generated output, make sure also 
+VERBATIM_HEADERS is set to NO. 
+' defval='0'/>
+    <option type='bool' id='INLINE_SOURCES' docs='
+Setting the INLINE_SOURCES tag to YES will include the body 
+of functions and classes directly in the documentation. 
+' defval='0'/>
+    <option type='bool' id='STRIP_CODE_COMMENTS' docs='
+Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+doxygen to hide any special comment blocks from generated source code 
+fragments. Normal C and C++ comments will always remain visible. 
+' defval='1'/>
+    <option type='bool' id='REFERENCED_BY_RELATION' docs='
+If the REFERENCED_BY_RELATION tag is set to YES 
+then for each documented function all documented 
+functions referencing it will be listed. 
+' defval='0'/>
+    <option type='bool' id='REFERENCES_RELATION' docs='
+If the REFERENCES_RELATION tag is set to YES 
+then for each documented function all documented entities 
+called/used by that function will be listed. 
+' defval='0'/>
+    <option type='bool' id='REFERENCES_LINK_SOURCE' docs='
+If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+link to the source code.  Otherwise they will link to the documentation. 
+' defval='1'/>
+    <option type='bool' id='USE_HTAGS' docs='
+If the USE_HTAGS tag is set to YES then the references to source code 
+will point to the HTML generated by the htags(1) tool instead of doxygen 
+built-in source browser. The htags tool is part of GNU&apos;s global source 
+tagging system (see http://www.gnu.org/software/global/global.html). You 
+will need version 4.8.6 or higher. 
+' defval='0' depends='SOURCE_BROWSER'/>
+    <option type='bool' id='VERBATIM_HEADERS' docs='
+If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+will generate a verbatim copy of the header file for each class for 
+which an include is specified. Set to NO to disable this. 
+' defval='1'/>
+  </group>
+  <group name='Index' docs='configuration options related to the alphabetical class index'>
+    <option type='bool' id='ALPHABETICAL_INDEX' docs='
+If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+of all compounds will be generated. Enable this if the project 
+contains a lot of classes, structs, unions or interfaces. 
+' defval='0'/>
+    <option type='int' id='COLS_IN_ALPHA_INDEX' docs='
+If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+in which this list will be split (can be a number in the range [1..20]) 
+' minval='1' maxval='20' defval='5'/>
+    <option type='list' id='IGNORE_PREFIX' format='string' docs='
+In case all classes in a project start with a common prefix, all 
+classes will be put under the same header in the alphabetical index. 
+The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+should be ignored while generating the index headers. 
+'>
+    </option>
+  </group>
+  <group name='HTML' docs='configuration options related to the HTML output'>
+    <option type='bool' id='GENERATE_HTML' docs='
+If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+generate HTML output. 
+' defval='1'/>
+    <option type='string' id='HTML_OUTPUT' format='dir' docs='
+The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+put in front of it. If left blank `html&apos; will be used as the default path. 
+' defval='html' depends='GENERATE_HTML'/>
+    <option type='string' id='HTML_FILE_EXTENSION' format='string' docs='
+The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+doxygen will generate files with .html extension. 
+' defval='.html' depends='GENERATE_HTML'/>
+    <option type='string' id='HTML_HEADER' format='file' docs='
+The HTML_HEADER tag can be used to specify a personal HTML header for 
+each generated HTML page. If it is left blank doxygen will generate a 
+standard header. 
+' defval='' depends='GENERATE_HTML'/>
+    <option type='string' id='HTML_FOOTER' format='file' docs='
+The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+each generated HTML page. If it is left blank doxygen will generate a 
+standard footer. 
+' defval='' depends='GENERATE_HTML'/>
+    <option type='string' id='HTML_STYLESHEET' format='file' docs='
+The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+style sheet that is used by each HTML page. It can be used to 
+fine-tune the look of the HTML output. If the tag is left blank doxygen 
+will generate a default style sheet. Note that doxygen will try to copy 
+the style sheet file to the HTML output directory, so don&apos;t put your own 
+stylesheet in the HTML output directory as well, or it will be erased! 
+' defval='' depends='GENERATE_HTML'/>
+    <option type='bool' id='HTML_ALIGN_MEMBERS' docs='
+If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+files or namespaces will be aligned in HTML using tables. If set to 
+NO a bullet list will be used. 
+' defval='1' depends='GENERATE_HTML'/>
+    <option type='bool' id='HTML_DYNAMIC_SECTIONS' docs='
+If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+documentation will contain sections that can be hidden and shown after the 
+page has loaded. For this to work a browser that supports 
+JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). 
+' defval='0' depends='GENERATE_HTML'/>
+    <option type='bool' id='GENERATE_DOCSET' docs='
+If the GENERATE_DOCSET tag is set to YES, additional index files 
+will be generated that can be used as input for Apple&apos;s Xcode 3 
+integrated development environment, introduced with OSX 10.5 (Leopard). 
+To create a documentation set, doxygen will generate a Makefile in the 
+HTML output directory. Running make will produce the docset in that 
+directory and running &quot;make install&quot; will install the docset in 
+~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+it at startup. 
+See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. 
+' defval='0' depends='GENERATE_HTML'/>
+    <option type='string' id='DOCSET_FEEDNAME' format='string' docs='
+When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+feed. A documentation feed provides an umbrella under which multiple 
+documentation sets from a single provider (such as a company or product suite) 
+can be grouped. 
+' defval='Doxygen generated docs' depends='GENERATE_DOCSET'/>
+    <option type='string' id='DOCSET_BUNDLE_ID' format='string' docs='
+When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+should uniquely identify the documentation set bundle. This should be a 
+reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+will append .docset to the name. 
+' defval='org.doxygen.Project' depends='GENERATE_DOCSET'/>
+    <option type='bool' id='GENERATE_HTMLHELP' docs='
+If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+will be generated that can be used as input for tools like the 
+Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+of the generated HTML documentation. 
+' defval='0' depends='GENERATE_HTML'/>
+    <option type='string' id='CHM_FILE' format='file' docs='
+If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+be used to specify the file name of the resulting .chm file. You 
+can add a path in front of the file if the result should not be 
+written to the html output directory. 
+' defval='' depends='GENERATE_HTMLHELP'/>
+    <option type='string' id='HHC_LOCATION' format='file' docs='
+If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+be used to specify the location (absolute path including file name) of 
+the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+the HTML help compiler on the generated index.hhp. 
+' defval='' depends='GENERATE_HTMLHELP'/>
+    <option type='bool' id='GENERATE_CHI' docs='
+If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+controls if a separate .chi index file is generated (YES) or that 
+it should be included in the master .chm file (NO). 
+' defval='0' depends='GENERATE_HTMLHELP'/>
+    <option type='string' id='CHM_INDEX_ENCODING' format='string' docs='
+If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+content. 
+' defval='' depends='GENERATE_HTMLHELP'/>
+    <option type='bool' id='BINARY_TOC' docs='
+If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+controls whether a binary table of contents is generated (YES) or a 
+normal table of contents (NO) in the .chm file. 
+' defval='0' depends='GENERATE_HTMLHELP'/>
+    <option type='bool' id='TOC_EXPAND' docs='
+The TOC_EXPAND flag can be set to YES to add extra items for group members 
+to the contents of the HTML help documentation and to the tree view. 
+' defval='0' depends='GENERATE_HTMLHELP'/>
+    <option type='bool' id='GENERATE_QHP' docs='
+If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+are set, an additional index file will be generated that can be used as input for 
+Qt&apos;s qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+HTML documentation. 
+' defval='0' depends='GENERATE_HTML'/>
+    <option type='string' id='QCH_FILE' format='file' docs='
+If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+be used to specify the file name of the resulting .qch file. 
+The path specified is relative to the HTML output folder. 
+' defval='' depends='GENERATE_QHP'/>
+    <option type='string' id='QHP_NAMESPACE' format='string' docs='
+The QHP_NAMESPACE tag specifies the namespace to use when generating 
+Qt Help Project output. For more information please see 
+http://doc.trolltech.com/qthelpproject.html#namespace 
+' defval='' depends='GENERATE_QHP'/>
+    <option type='string' id='QHP_VIRTUAL_FOLDER' format='string' docs='
+The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+Qt Help Project output. For more information please see 
+http://doc.trolltech.com/qthelpproject.html#virtual-folders 
+' defval='doc' depends='GENERATE_QHP'/>
+    <option type='string' id='QHP_CUST_FILTER_NAME' format='string' docs='
+If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+For more information please see 
+http://doc.trolltech.com/qthelpproject.html#custom-filters 
+' defval='' depends='GENERATE_QHP'/>
+    <option type='string' id='QHP_CUST_FILTER_ATTRS' format='string' docs='
+The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+&lt;a href=&quot;http://doc.trolltech.com/qthelpproject.html#custom-filters&quot;&gt;Qt Help Project / Custom Filters&lt;/a&gt;. 
+' defval='' depends='GENERATE_QHP'/>
+    <option type='string' id='QHP_SECT_FILTER_ATTRS' format='string' docs='
+The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project&apos;s 
+filter section matches. 
+&lt;a href=&quot;http://doc.trolltech.com/qthelpproject.html#filter-attributes&quot;&gt;Qt Help Project / Filter Attributes&lt;/a&gt;. 
+' defval='' depends='GENERATE_QHP'/>
+    <option type='string' id='QHG_LOCATION' format='file' docs='
+If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+be used to specify the location of Qt&apos;s qhelpgenerator. 
+If non-empty doxygen will try to run qhelpgenerator on the generated 
+.qhp file. 
+' defval='' depends='GENERATE_QHP'/>
+    <option type='bool' id='DISABLE_INDEX' docs='
+The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+top of each HTML page. The value NO (the default) enables the index and 
+the value YES disables it. 
+' defval='0' depends='GENERATE_HTML'/>
+    <option type='int' id='ENUM_VALUES_PER_LINE' docs='
+This tag can be used to set the number of enum values (range [1..20]) 
+that doxygen will group on one line in the generated HTML documentation. 
+' minval='1' maxval='20' defval='4' depends='GENERATE_HTML'/>
+    <option type='enum' id='GENERATE_TREEVIEW' defval='NONE' docs='
+The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+structure should be generated to display hierarchical information. 
+If the tag value is set to FRAME, a side panel will be generated 
+containing a tree-like index structure (just like the one that 
+is generated for HTML Help). For this to work a browser that supports 
+JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+probably better off using the HTML help feature. Other possible values 
+for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+and Class Hierarchy pages using a tree view instead of an ordered list; 
+ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+disables this behavior completely. For backwards compatibility with previous 
+releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+respectively. 
+' depends='GENERATE_HTML'>
+      <value name='NONE'/>
+      <value name='FRAME'/>
+      <value name='HIERARCHIES'/>
+      <value name='ALL'/>
+    </option>
+    <option type='int' id='TREEVIEW_WIDTH' docs='
+If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+used to set the initial width (in pixels) of the frame in which the tree 
+is shown. 
+' minval='0' maxval='1500' defval='250' depends='GENERATE_HTML'/>
+    <option type='int' id='FORMULA_FONTSIZE' docs='
+Use this tag to change the font size of Latex formulas included 
+as images in the HTML documentation. The default is 10. Note that 
+when you change the font size after a successful doxygen run you need 
+to manually remove any form_*.png images from the HTML output directory 
+to force them to be regenerated. 
+' minval='8' maxval='50' defval='10' depends='GENERATE_HTML'/>
+  </group>
+  <group name='LaTeX' docs='configuration options related to the LaTeX output'>
+    <option type='bool' id='GENERATE_LATEX' docs='
+If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+generate Latex output. 
+' defval='1'/>
+    <option type='string' id='LATEX_OUTPUT' format='dir' docs='
+The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+put in front of it. If left blank `latex&apos; will be used as the default path. 
+' defval='latex' depends='GENERATE_LATEX'/>
+    <option type='string' id='LATEX_CMD_NAME' format='file' docs='
+The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+invoked. If left blank `latex&apos; will be used as the default command name. 
+' defval='latex' depends='GENERATE_LATEX'/>
+    <option type='string' id='MAKEINDEX_CMD_NAME' format='file' docs='
+The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+generate index for LaTeX. If left blank `makeindex&apos; will be used as the 
+default command name. 
+' defval='makeindex' depends='GENERATE_LATEX'/>
+    <option type='bool' id='COMPACT_LATEX' docs='
+If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+LaTeX documents. This may be useful for small projects and may help to 
+save some trees in general. 
+' defval='0' depends='GENERATE_LATEX'/>
+    <option type='enum' id='PAPER_TYPE' defval='a4wide' docs='
+The PAPER_TYPE tag can be used to set the paper type that is used 
+by the printer. Possible values are: a4, a4wide, letter, legal and 
+executive. If left blank a4wide will be used. 
+' depends='GENERATE_LATEX'>
+      <value name='a4'/>
+      <value name='a4wide'/>
+      <value name='letter'/>
+      <value name='legal'/>
+      <value name='executive'/>
+    </option>
+    <option type='list' id='EXTRA_PACKAGES' format='string' docs='
+The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+packages that should be included in the LaTeX output. 
+' depends='GENERATE_LATEX'>
+    </option>
+    <option type='string' id='LATEX_HEADER' format='file' docs='
+The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+the generated latex document. The header should contain everything until 
+the first chapter. If it is left blank doxygen will generate a 
+standard header. Notice: only use this tag if you know what you are doing! 
+' defval='' depends='GENERATE_LATEX'/>
+    <option type='bool' id='PDF_HYPERLINKS' docs='
+If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+contain links (just like the HTML output) instead of page references 
+This makes the output suitable for online browsing using a pdf viewer. 
+' defval='1' depends='GENERATE_LATEX'/>
+    <option type='bool' id='USE_PDFLATEX' docs='
+If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+plain latex in the generated Makefile. Set this option to YES to get a 
+higher quality PDF documentation. 
+' defval='1' depends='GENERATE_LATEX'/>
+    <option type='bool' id='LATEX_BATCHMODE' docs='
+If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+command to the generated LaTeX files. This will instruct LaTeX to keep 
+running if errors occur, instead of asking the user for help. 
+This option is also used when generating formulas in HTML. 
+' defval='0' depends='GENERATE_LATEX'/>
+    <option type='bool' id='LATEX_HIDE_INDICES' docs='
+If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+include the index chapters (such as File Index, Compound Index, etc.) 
+in the output. 
+' defval='0' depends='GENERATE_LATEX'/>
+  </group>
+  <group name='RTF' docs='configuration options related to the RTF output'>
+    <option type='bool' id='GENERATE_RTF' docs='
+If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+The RTF output is optimized for Word 97 and may not look very pretty with 
+other RTF readers or editors. 
+' defval='0'/>
+    <option type='string' id='RTF_OUTPUT' format='dir' docs='
+The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+put in front of it. If left blank `rtf&apos; will be used as the default path. 
+' defval='rtf' depends='GENERATE_RTF'/>
+    <option type='bool' id='COMPACT_RTF' docs='
+If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+RTF documents. This may be useful for small projects and may help to 
+save some trees in general. 
+' defval='0' depends='GENERATE_RTF'/>
+    <option type='bool' id='RTF_HYPERLINKS' docs='
+If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+will contain hyperlink fields. The RTF file will 
+contain links (just like the HTML output) instead of page references. 
+This makes the output suitable for online browsing using WORD or other 
+programs which support those fields. 
+Note: wordpad (write) and others do not support links. 
+' defval='0' depends='GENERATE_RTF'/>
+    <option type='string' id='RTF_STYLESHEET_FILE' format='file' docs='
+Load stylesheet definitions from file. Syntax is similar to doxygen&apos;s 
+config file, i.e. a series of assignments. You only have to provide 
+replacements, missing definitions are set to their default value. 
+' defval='' depends='GENERATE_RTF'/>
+    <option type='string' id='RTF_EXTENSIONS_FILE' format='file' docs='
+Set optional variables used in the generation of an rtf document. 
+Syntax is similar to doxygen&apos;s config file. 
+' defval='' depends='GENERATE_RTF'/>
+  </group>
+  <group name='Man' docs='configuration options related to the man page output'>
+    <option type='bool' id='GENERATE_MAN' docs='
+If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+generate man pages 
+' defval='0'/>
+    <option type='string' id='MAN_OUTPUT' format='dir' docs='
+The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+put in front of it. If left blank `man&apos; will be used as the default path. 
+' defval='man' depends='GENERATE_MAN'/>
+    <option type='string' id='MAN_EXTENSION' format='string' docs='
+The MAN_EXTENSION tag determines the extension that is added to 
+the generated man pages (default is the subroutine&apos;s section .3) 
+' defval='.3' depends='GENERATE_MAN'/>
+    <option type='bool' id='MAN_LINKS' docs='
+If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+then it will generate one additional man file for each entity 
+documented in the real man page(s). These additional files 
+only source the real man page, but without them the man command 
+would be unable to find the correct page. The default is NO. 
+' defval='0' depends='GENERATE_MAN'/>
+  </group>
+  <group name='XML' docs='configuration options related to the XML output'>
+    <option type='bool' id='GENERATE_XML' docs='
+If the GENERATE_XML tag is set to YES Doxygen will 
+generate an XML file that captures the structure of 
+the code including all documentation. 
+' defval='0'/>
+    <option type='string' id='XML_OUTPUT' format='dir' docs='
+The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+put in front of it. If left blank `xml&apos; will be used as the default path. 
+' defval='xml' depends='GENERATE_XML'/>
+    <option type='string' id='XML_SCHEMA' format='string' docs='
+The XML_SCHEMA tag can be used to specify an XML schema, 
+which can be used by a validating XML parser to check the 
+syntax of the XML files. 
+' defval='' depends='GENERATE_XML'/>
+    <option type='string' id='XML_DTD' format='string' docs='
+The XML_DTD tag can be used to specify an XML DTD, 
+which can be used by a validating XML parser to check the 
+syntax of the XML files. 
+' defval='' depends='GENERATE_XML'/>
+    <option type='bool' id='XML_PROGRAMLISTING' docs='
+If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+dump the program listings (including syntax highlighting 
+and cross-referencing information) to the XML output. Note that 
+enabling this will significantly increase the size of the XML output. 
+' defval='1' depends='GENERATE_XML'/>
+  </group>
+  <group name='DEF' docs='configuration options for the AutoGen Definitions output'>
+    <option type='bool' id='GENERATE_AUTOGEN_DEF' docs='
+If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+generate an AutoGen Definitions (see autogen.sf.net) file 
+that captures the structure of the code including all 
+documentation. Note that this feature is still experimental 
+and incomplete at the moment. 
+' defval='0'/>
+  </group>
+  <group name='PerlMod' docs='configuration options related to the Perl module output'>
+    <option type='bool' id='GENERATE_PERLMOD' docs='
+If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+generate a Perl module file that captures the structure of 
+the code including all documentation. Note that this 
+feature is still experimental and incomplete at the 
+moment. 
+' defval='0'/>
+    <option type='bool' id='PERLMOD_LATEX' docs='
+If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+to generate PDF and DVI output from the Perl module output. 
+' defval='0' depends='GENERATE_PERLMOD'/>
+    <option type='bool' id='PERLMOD_PRETTY' docs='
+If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+nicely formatted so it can be parsed by a human reader.  This is useful 
+if you want to understand what is going on.  On the other hand, if this 
+tag is set to NO the size of the Perl module output will be much smaller 
+and Perl will parse it just the same. 
+' defval='1' depends='GENERATE_PERLMOD'/>
+    <option type='string' id='PERLMOD_MAKEVAR_PREFIX' format='string' docs='
+The names of the make variables in the generated doxyrules.make file 
+are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+This is useful so different doxyrules.make files included by the same 
+Makefile don&apos;t overwrite each other&apos;s variables.' defval='' depends='GENERATE_PERLMOD'/>
+  </group>
+  <group name='Preprocessor' docs='Configuration options related to the preprocessor   '>
+    <option type='bool' id='ENABLE_PREPROCESSING' docs='
+If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+evaluate all C-preprocessor directives found in the sources and include 
+files. 
+' defval='1'/>
+    <option type='bool' id='MACRO_EXPANSION' docs='
+If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+names in the source code. If set to NO (the default) only conditional 
+compilation will be performed. Macro expansion can be done in a controlled 
+way by setting EXPAND_ONLY_PREDEF to YES. 
+' defval='0' depends='ENABLE_PREPROCESSING'/>
+    <option type='bool' id='EXPAND_ONLY_PREDEF' docs='
+If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+then the macro expansion is limited to the macros specified with the 
+PREDEFINED and EXPAND_AS_DEFINED tags. 
+' defval='0' depends='ENABLE_PREPROCESSING'/>
+    <option type='bool' id='SEARCH_INCLUDES' docs='
+If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+in the INCLUDE_PATH (see below) will be search if a #include is found. 
+' defval='1' depends='ENABLE_PREPROCESSING'/>
+    <option type='list' id='INCLUDE_PATH' format='dir' docs='
+The INCLUDE_PATH tag can be used to specify one or more directories that 
+contain include files that are not input files but should be processed by 
+the preprocessor. 
+' depends='ENABLE_PREPROCESSING'>
+    </option>
+    <option type='list' id='INCLUDE_FILE_PATTERNS' format='string' docs='
+You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+patterns (like *.h and *.hpp) to filter out the header-files in the 
+directories. If left blank, the patterns specified with FILE_PATTERNS will 
+be used. 
+' depends='ENABLE_PREPROCESSING'>
+    </option>
+    <option type='list' id='PREDEFINED' format='string' docs='
+The PREDEFINED tag can be used to specify one or more macro names that 
+are defined before the preprocessor is started (similar to the -D option of 
+gcc). The argument of the tag is a list of macros of the form: name 
+or name=definition (no spaces). If the definition and the = are 
+omitted =1 is assumed. To prevent a macro definition from being 
+undefined via #undef or recursively expanded use the := operator 
+instead of the = operator. 
+' depends='ENABLE_PREPROCESSING'>
+    </option>
+    <option type='list' id='EXPAND_AS_DEFINED' format='string' docs='
+If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+this tag can be used to specify a list of macro names that should be expanded. 
+The macro definition that is found in the sources will be used. 
+Use the PREDEFINED tag if you want to use a different macro definition. 
+' depends='ENABLE_PREPROCESSING'>
+    </option>
+    <option type='bool' id='SKIP_FUNCTION_MACROS' docs='
+If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+doxygen&apos;s preprocessor will remove all function-like macros that are alone 
+on a line, have an all uppercase name, and do not end with a semicolon. Such 
+function macros are typically used for boiler-plate code, and will confuse 
+the parser if not removed. 
+' defval='1' depends='ENABLE_PREPROCESSING'/>
+  </group>
+  <group name='External' docs='Configuration::additions related to external references   '>
+    <option type='list' id='TAGFILES' format='file' docs='
+The TAGFILES option can be used to specify one or more tagfiles. 
+Optionally an initial location of the external documentation 
+can be added for each tagfile. The format of a tag file without 
+this location is as follows: 
+  TAGFILES = file1 file2 ... 
+Adding location for the tag files is done as follows: 
+  TAGFILES = file1=loc1 &quot;file2 = loc2&quot; ... 
+where &quot;loc1&quot; and &quot;loc2&quot; can be relative or absolute paths or 
+URLs. If a location is present for each tag, the installdox tool 
+does not have to be run to correct the links. 
+Note that each tag file must have a unique name 
+(where the name does NOT include the path) 
+If a tag file is not located in the directory in which doxygen 
+is run, you must also specify the path to the tagfile here. 
+'>
+    </option>
+    <option type='string' id='GENERATE_TAGFILE' format='file' docs='
+When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+a tag file that is based on the input files it reads. 
+' defval=''/>
+    <option type='bool' id='ALLEXTERNALS' docs='
+If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+in the class index. If set to NO only the inherited external classes 
+will be listed. 
+' defval='0'/>
+    <option type='bool' id='EXTERNAL_GROUPS' docs='
+If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+in the modules index. If set to NO, only the current project&apos;s groups will 
+be listed. 
+' defval='1'/>
+    <option type='string' id='PERL_PATH' format='dir' docs='
+The PERL_PATH should be the absolute path and name of the perl script 
+interpreter (i.e. the result of `which perl&apos;). 
+' defval='/usr/bin/perl'/>
+  </group>
+  <group name='Dot' docs='Configuration options related to the dot tool   '>
+    <option type='bool' id='CLASS_DIAGRAMS' docs='
+If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+or super classes. Setting the tag to NO turns the diagrams off. Note that 
+this option is superseded by the HAVE_DOT option below. This is only a 
+fallback. It is recommended to install and use dot, since it yields more 
+powerful graphs. 
+' defval='1'/>
+    <option type='string' id='MSCGEN_PATH' format='string' docs='
+You can define message sequence charts within doxygen comments using the \msc 
+command. Doxygen will then run the mscgen tool (see 
+http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+the mscgen tool resides. If left empty the tool is assumed to be found in the 
+default search path. 
+' defval=''/>
+    <option type='bool' id='HIDE_UNDOC_RELATIONS' docs='
+If set to YES, the inheritance and collaboration graphs will hide 
+inheritance and usage relations if the target is undocumented 
+or is not a class. 
+' defval='1'/>
+    <option type='bool' id='HAVE_DOT' docs='
+If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+available from the path. This tool is part of Graphviz, a graph visualization 
+toolkit from AT&amp;T and Lucent Bell Labs. The other options in this section 
+have no effect if this option is set to NO (the default) 
+' defval='0'/>
+    <option type='string' id='DOT_FONTNAME' format='string' docs='
+By default doxygen will write a font called FreeSans.ttf to the output 
+directory and reference it in all dot files that doxygen generates. This 
+font does not include all possible unicode characters however, so when you need 
+these (or just want a differently looking font) you can specify the font name 
+using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+which can be done by putting it in a standard location or by setting the 
+DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+containing the font. 
+' defval='FreeSans' depends='HAVE_DOT'/>
+    <option type='int' id='DOT_FONTSIZE' docs='
+The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+The default size is 10pt. 
+' minval='4' maxval='24' defval='10' depends='HAVE_DOT'/>
+    <option type='string' id='DOT_FONTPATH' format='string' docs='
+By default doxygen will tell dot to use the output directory to look for the 
+FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+different font using DOT_FONTNAME you can set the path where dot 
+can find it using this tag. 
+' defval='' depends='HAVE_DOT'/>
+    <option type='bool' id='CLASS_GRAPH' docs='
+If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+will generate a graph for each documented class showing the direct and 
+indirect inheritance relations. Setting this tag to YES will force the 
+the CLASS_DIAGRAMS tag to NO. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='COLLABORATION_GRAPH' docs='
+If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+will generate a graph for each documented class showing the direct and 
+indirect implementation dependencies (inheritance, containment, and 
+class references variables) of the class with other documented classes. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='GROUP_GRAPHS' docs='
+If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+will generate a graph for groups, showing the direct groups dependencies 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='UML_LOOK' docs='
+If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+collaboration diagrams in a style similar to the OMG&apos;s Unified Modeling 
+Language. 
+' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='TEMPLATE_RELATIONS' docs='
+If set to YES, the inheritance and collaboration graphs will show the 
+relations between templates and their instances. 
+' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='INCLUDE_GRAPH' docs='
+If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+tags are set to YES then doxygen will generate a graph for each documented 
+file showing the direct and indirect include dependencies of the file with 
+other documented files. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='INCLUDED_BY_GRAPH' docs='
+If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+documented header file showing the documented files that directly or 
+indirectly include this file. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='CALL_GRAPH' docs='
+If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+doxygen will generate a call dependency graph for every global function 
+or class method. Note that enabling this option will significantly increase 
+the time of a run. So in most cases it will be better to enable call graphs 
+for selected functions only using the \callgraph command. 
+' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='CALLER_GRAPH' docs='
+If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+doxygen will generate a caller dependency graph for every global function 
+or class method. Note that enabling this option will significantly increase 
+the time of a run. So in most cases it will be better to enable caller 
+graphs for selected functions only using the \callergraph command. 
+' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='GRAPHICAL_HIERARCHY' docs='
+If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+will graphical hierarchy of all classes instead of a textual one. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='DIRECTORY_GRAPH' docs='
+If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+then doxygen will show the dependencies a directory has on other directories 
+in a graphical way. The dependency relations are determined by the #include 
+relations between the files in the directories. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='enum' id='DOT_IMAGE_FORMAT' defval='png' docs='
+The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+generated by dot. Possible values are png, jpg, or gif 
+If left blank png will be used. 
+' depends='HAVE_DOT'>
+      <value name='png'/>
+      <value name='jpg'/>
+      <value name='gif'/>
+    </option>
+    <option type='string' id='DOT_PATH' format='dir' docs='
+The tag DOT_PATH can be used to specify the path where the dot tool can be 
+found. If left blank, it is assumed the dot tool can be found in the path. 
+' defval='' depends='HAVE_DOT'/>
+    <option type='list' id='DOTFILE_DIRS' format='dir' docs='
+The DOTFILE_DIRS tag can be used to specify one or more directories that 
+contain dot files that are included in the documentation (see the 
+\dotfile command). 
+' depends='HAVE_DOT'>
+    </option>
+    <option type='int' id='DOT_GRAPH_MAX_NODES' docs='
+The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+nodes that will be shown in the graph. If the number of nodes in a graph 
+becomes larger than this value, doxygen will truncate the graph, which is 
+visualized by representing a node as a red box. Note that doxygen if the 
+number of direct children of the root node in a graph is already larger than 
+DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. 
+' minval='0' maxval='10000' defval='50' depends='HAVE_DOT'/>
+    <option type='int' id='MAX_DOT_GRAPH_DEPTH' docs='
+The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+graphs generated by dot. A depth value of 3 means that only nodes reachable 
+from the root by following a path via at most 3 edges will be shown. Nodes 
+that lay further from the root node will be omitted. Note that setting this 
+option to 1 or 2 may greatly reduce the computation time needed for large 
+code bases. Also note that the size of a graph can be further restricted by 
+DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. 
+' minval='0' maxval='1000' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='DOT_TRANSPARENT' docs='
+Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+background. This is disabled by default, because dot on Windows does not 
+seem to support this out of the box. Warning: Depending on the platform used, 
+enabling this option may lead to badly anti-aliased labels on the edges of 
+a graph (i.e. they become hard to read). 
+' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='DOT_MULTI_TARGETS' docs='
+Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+files in one run (i.e. multiple -o and -T options on the command line). This 
+makes dot run faster, but since only newer versions of dot (&gt;1.8.10) 
+support this, this feature is disabled by default. 
+' defval='0' depends='HAVE_DOT'/>
+    <option type='bool' id='GENERATE_LEGEND' docs='
+If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+generate a legend page explaining the meaning of the various boxes and 
+arrows in the dot generated graphs. 
+' defval='1' depends='HAVE_DOT'/>
+    <option type='bool' id='DOT_CLEANUP' docs='
+If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+remove the intermediate dot files that are used to generate 
+the various graphs. 
+' defval='1' depends='HAVE_DOT'/>
+  </group>
+  <group name='Search' docs='Options related to the search engine'>
+    <option type='bool' id='SEARCHENGINE' docs='
+The SEARCHENGINE tag specifies whether or not a search engine should be 
+used. If set to NO the values of all tags below this one will be ignored. 
+' defval='0'/>
+    <option type='obsolete' id='USE_WINDOWS_ENCODING'/>
+    <option type='obsolete' id='DETAILS_AT_TOP'/>
+    <option type='obsolete' id='QTHELP_FILE'/>
+    <option type='obsolete' id='QTHELP_CONFIG'/>
+    <option type='obsolete' id='DOXYGEN2QTHELP_LOC'/>
+    <option type='obsolete' id='MAX_DOT_GRAPH_WIDTH'/>
+    <option type='obsolete' id='MAX_DOT_GRAPH_HEIGHT'/>
+    <option type='obsolete' id='CGI_NAME'/>
+    <option type='obsolete' id='CGI_URL'/>
+    <option type='obsolete' id='DOC_URL'/>
+    <option type='obsolete' id='DOC_ABSPATH'/>
+    <option type='obsolete' id='BIN_ABSPATH'/>
+    <option type='obsolete' id='EXT_DOC_PATHS'/>
+  </group>
+</doxygenconfig>
diff --git a/src/configgen.py b/src/configgen.py
new file mode 100755
index 0000000..c58464d
--- /dev/null
+++ b/src/configgen.py
@@ -0,0 +1,137 @@
+# python script to generate configoptions.cpp from config.xml
+#
+# Copyright (C) 1997-2008 by Dimitri van Heesch.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation under the terms of the GNU General Public License is hereby 
+# granted. No representations are made about the suitability of this software 
+# for any purpose. It is provided "as is" without express or implied warranty.
+# See the GNU General Public License for more details.
+#
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
+#
+import xml.dom.minidom
+from xml.dom import minidom, Node
+
+def addValues(var,node):
+        for n in node.childNodes:
+		if n.nodeType == Node.ELEMENT_NODE:
+			name = n.getAttribute('name');
+			print "  %s->addValue(\"%s\");" % (var,name)
+	
+def parseOption(node):
+	name    = node.getAttribute('id')
+	type    = node.getAttribute('type')
+	format  = node.getAttribute('format')
+	doc     = node.getAttribute('docs')
+	defval  = node.getAttribute('defval')
+	adefval = node.getAttribute('altdefval')
+	depends = node.getAttribute('depends')
+	# replace \ by \\, replace " by \", and '  ' by a newline with end string and start string at next line
+        docC    = doc.strip().replace('\\','\\\\').replace('"','\\"').replace('  ',' \\n"\n                 "')
+	print "  //----"
+        if type=='bool':
+        	if len(adefval)>0:
+			enabled = adefval
+		else:
+			enabled = "TRUE" if defval=='1' else "FALSE"
+		print "  cb = cfg->addBool("
+		print "                 \"%s\"," % (name)
+		print "                 \"%s\"," % (docC)
+		print "                 %s"  % (enabled)
+                print "                );"
+		if depends!='':
+			print "  cb->addDependency(\"%s\");" % (depends)
+	elif type=='string':
+		print "  cs = cfg->addString("
+		print "                 \"%s\"," % (name)
+		print "                 \"%s\""  % (docC)
+                print "                );"
+		if defval!='':
+			print "  cs->setDefaultValue(\"%s\");" % (defval)
+		if format=='file':
+			print "  cs->setWidgetType(ConfigString::File);"
+		elif format=='dir':
+			print "  cs->setWidgetType(ConfigString::Dir);"
+		if depends!='':
+			print "  cs->addDependency(\"%s\");" % (depends)
+	elif type=='enum':
+		print "  ce = cfg->addEnum("
+		print "                 \"%s\"," % (name)
+		print "                 \"%s\"," % (docC)
+		print "                 \"%s\""  % (defval)
+                print "                );"
+                addValues("ce",node)
+		if depends!='':
+			print "  ce->addDependency(\"%s\");" % (depends)
+	elif type=='int':
+		minval = node.getAttribute('minval')
+		maxval = node.getAttribute('maxval')
+		print "  ci = cfg->addInt("
+		print "                 \"%s\"," % (name)
+		print "                 \"%s\"," % (docC)
+		print "                 %s,%s,%s" % (minval,maxval,defval)
+                print "                );"
+		if depends!='':
+			print "  ci->addDependency(\"%s\");" % (depends)
+	elif type=='list':
+		print "  cl = cfg->addList("
+		print "                 \"%s\"," % (name)
+		print "                 \"%s\""  % (docC)
+                print "                );"
+		addValues("cl",node)
+		if depends!='':
+			print "  cl->addDependency(\"%s\");" % (depends)
+		if format=='file':
+			print "  cl->setWidgetType(ConfigList::File);"
+		elif format=='dir':
+			print "  cl->setWidgetType(ConfigList::Dir);"
+		elif format=='filedir':
+			print "  cl->setWidgetType(ConfigList::FileAndDir);"
+	elif type=='obsolete':
+		print "  cfg->addObsolete(\"%s\");" % (name)
+		
+
+
+
+def parseGroups(node):
+	name = node.getAttribute('name')
+	doc  = node.getAttribute('docs')
+        print "  //---------------------------------------------------------------------------";
+	print "  cfg->addInfo(\"%s\",\"%s\");" % (name,doc)
+        print "  //---------------------------------------------------------------------------";
+        print
+        for n in node.childNodes:
+		if n.nodeType == Node.ELEMENT_NODE:
+			parseOption(n)
+	
+
+def main():
+	doc = xml.dom.minidom.parse("config.xml")
+	elem = doc.documentElement
+        print "/* WARNING: This file is generated!"
+        print " * Do not edit this file, but edit config.xml instead and run"
+        print " * python configgen.py to regenerate this file!"
+        print " */"
+        print ""
+        print "#include \"configoptions.h\""
+        print "#include \"config.h\""
+        print "#include \"portable.h\""
+        print ""
+        print "void addConfigOptions(Config *cfg)"
+        print "{"
+        print "  ConfigString *cs;"
+        print "  ConfigEnum   *ce;"
+        print "  ConfigList   *cl;"
+        print "  ConfigInt    *ci;"
+        print "  ConfigBool   *cb;"
+        print ""
+	for n in elem.childNodes:
+		if n.nodeType == Node.ELEMENT_NODE:
+			parseGroups(n)
+        print "}"
+
+if __name__ == '__main__':
+	main()
+
diff --git a/src/configoptions.cpp b/src/configoptions.cpp
index 038046f..4010359 100644
--- a/src/configoptions.cpp
+++ b/src/configoptions.cpp
@@ -1,61 +1,46 @@
-/******************************************************************************
- *
- * 
- *
- *
- * Copyright (C) 1997-2008 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- * Documents produced by Doxygen are derivative works derived from the
- * input used in their production; they are not affected by this license.
- *
+/* WARNING: This file is generated!
+ * Do not edit this file, but edit config.xml instead and run
+ * python configgen.py to regenerate this file!
  */
 
 #include "configoptions.h"
 #include "config.h"
 #include "portable.h"
-#include "lang_cfg.h"
 
 void addConfigOptions(Config *cfg)
 {
-
   ConfigString *cs;
   ConfigEnum   *ce;
   ConfigList   *cl;
   ConfigInt    *ci;
   ConfigBool   *cb;
-  
-  // option definitions
-  //-----------------------------------------------------------------------------------------------
+
+  //---------------------------------------------------------------------------
   cfg->addInfo("Project","Project related configuration options");
-  //-----------------------------------------------------------------------------------------------
-  
+  //---------------------------------------------------------------------------
+
+  //----
   cs = cfg->addString(
-                  "DOXYFILE_ENCODING",
-		  "This tag specifies the encoding used for all characters in the config file \n"
-		  "that follow. The default is UTF-8 which is also the encoding used for all \n"
-		  "text before the first occurrence of this tag. Doxygen uses libiconv (or the \n"
-		  "iconv built into libc) for the transcoding. See \n"
-		  "http://www.gnu.org/software/libiconv for the list of possible encodings.\n"
+                 "DOXYFILE_ENCODING",
+                 "This tag specifies the encoding used for all characters in the config file \n"
+                 "that follow. The default is UTF-8 which is also the encoding used for all \n"
+                 "text before the first occurrence of this tag. Doxygen uses libiconv (or the \n"
+                 "iconv built into libc) for the transcoding. See \n"
+                 "http://www.gnu.org/software/libiconv for the list of possible encodings."
                 );
   cs->setDefaultValue("UTF-8");
   //----
   cs = cfg->addString(
                  "PROJECT_NAME",
                  "The PROJECT_NAME tag is a single word (or a sequence of words surrounded \n"
-                 "by quotes) that should identify the project. "
+                 "by quotes) that should identify the project."
                 );
   //----
   cs = cfg->addString(
                  "PROJECT_NUMBER",
                  "The PROJECT_NUMBER tag can be used to enter a project or revision number. \n"
                  "This could be handy for archiving the generated documentation or \n"
-                 "if some version control system is used.\n"
+                 "if some version control system is used."
                 );
   //----
   cs = cfg->addString(
@@ -63,19 +48,19 @@ void addConfigOptions(Config *cfg)
                  "The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) \n"
                  "base path where the generated documentation will be put. \n"
                  "If a relative path is entered, it will be relative to the location \n"
-                 "where doxygen was started. If left blank the current directory will be used.\n"
-		);
+                 "where doxygen was started. If left blank the current directory will be used."
+                );
   cs->setWidgetType(ConfigString::Dir);
   //----
   cb = cfg->addBool(
                  "CREATE_SUBDIRS",
                  "If the CREATE_SUBDIRS tag is set to YES, then doxygen will create \n"
                  "4096 sub-directories (in 2 levels) under the output directory of each output \n"
-		 "format and will distribute the generated files over these directories. \n"
-		 "Enabling this option can be useful when feeding doxygen a huge amount of \n"
-		 "source files, where putting all generated files in the same directory would \n"
-		 "otherwise cause performance problems for the file system. \n",
-		 FALSE
+                 "format and will distribute the generated files over these directories. \n"
+                 "Enabling this option can be useful when feeding doxygen a huge amount of \n"
+                 "source files, where putting all generated files in the same directory would \n"
+                 "otherwise cause performance problems for the file system.",
+                 FALSE
                 );
   //----
   ce = cfg->addEnum(
@@ -84,1304 +69,1242 @@ void addConfigOptions(Config *cfg)
                  "documentation generated by doxygen is written. Doxygen will use this \n"
                  "information to generate all constant output in the proper language. \n"
                  "The default language is English, other supported languages are: \n"
-		 "Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, \n"
-		 "Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, \n"
-		 "Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), \n"
-		 "Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, \n"
-		 "Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, \n"
-		 "Spanish, Swedish, and Ukrainian.\n", 
-		 "English"
-                );
-#ifdef LANG_ZA
+                 "Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, \n"
+                 "Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, \n"
+                 "Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), \n"
+                 "Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, \n"
+                 "Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, \n"
+                 "Spanish, Swedish, and Ukrainian.",
+                 "English"
+                );
   ce->addValue("Afrikaans");
-#endif
-#ifdef LANG_AR
   ce->addValue("Arabic");
-#endif
-#ifdef LANG_BR
   ce->addValue("Brazilian");
-#endif
-#ifdef LANG_CA
   ce->addValue("Catalan");
-#endif
-#ifdef LANG_CN
   ce->addValue("Chinese");
-#endif
-#ifdef LANG_TW
   ce->addValue("Chinese-Traditional");
-#endif
-#ifdef LANG_HR
   ce->addValue("Croatian");
-#endif
-#ifdef LANG_CZ
   ce->addValue("Czech");
-#endif
-#ifdef LANG_DK
   ce->addValue("Danish");
-#endif
-#ifdef LANG_NL
   ce->addValue("Dutch");
-#endif
   ce->addValue("English");
-#ifdef LANG_FI
   ce->addValue("Finnish");
-#endif
-#ifdef LANG_FR
   ce->addValue("French");
-#endif
-#ifdef LANG_DE
   ce->addValue("German");
-#endif
-#ifdef LANG_GR
   ce->addValue("Greek");
-#endif
-#ifdef LANG_HU
   ce->addValue("Hungarian");
-#endif
-#ifdef LANG_IT
   ce->addValue("Italian");
-#endif
-#ifdef LANG_JP
   ce->addValue("Japanese");
   ce->addValue("Japanese-en");
-#endif
-#ifdef LANG_KR
   ce->addValue("Korean");
   ce->addValue("Korean-en");
-#endif
-#ifdef LANG_LI
-  ce->addValue("Lithuanian");
-#endif
-#ifdef LANG_NO
   ce->addValue("Norwegian");
-#endif
-#ifdef LANG_MK
-  ce->addValue("Macedonian");
-#endif
-#ifdef LANG_FA
   ce->addValue("Farsi");
   ce->addValue("Persian");
-#endif
-#ifdef LANG_PL
   ce->addValue("Polish");
-#endif
-#ifdef LANG_PT
   ce->addValue("Portuguese");
-#endif
-#ifdef LANG_RO
   ce->addValue("Romanian");
-#endif
-#ifdef LANG_RU
   ce->addValue("Russian");
-#endif
-#ifdef LANG_SR
   ce->addValue("Serbian");
-#endif
-#ifdef LANG_SC
-  ce->addValue("Serbian-Cyrilic");
-#endif
-#ifdef LANG_SK
   ce->addValue("Slovak");
-#endif
-#ifdef LANG_SI
   ce->addValue("Slovene");
-#endif
-#ifdef LANG_ES
   ce->addValue("Spanish");
-#endif
-#ifdef LANG_SE
   ce->addValue("Swedish");
-#endif
-#ifdef LANG_UA
   ce->addValue("Ukrainian");
-#endif
-
-#if 0
-  cb = cfg->addBool(
-                    "USE_WINDOWS_ENCODING",
-		    "This tag can be used to specify the encoding used in the generated output. \n"
-		    "The encoding is not always determined by the language that is chosen, \n"
-		    "but also whether or not the output is meant for Windows or non-Windows users. \n"
-		    "In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES \n"
-		    "forces the Windows encoding (this is the default for the Windows binary), \n"
-		    "whereas setting the tag to NO uses a Unix-style encoding (the default for \n"
-		    "all platforms other than Windows).\n",
-#if defined(_WIN32) || defined(__CYGWIN__)
-		    TRUE
-#else
-		    FALSE
-#endif
-		 );
-#endif
-  //----
-  cfg->addObsolete("USE_WINDOWS_ENCODING");
-
   //----
   cb = cfg->addBool(
-                    "BRIEF_MEMBER_DESC",
-                    "If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will \n"
-                    "include brief member descriptions after the members that are listed in \n"
-                    "the file and class documentation (similar to JavaDoc). \n"
-                    "Set to NO to disable this. \n",
-                    TRUE
-                 );
+                 "BRIEF_MEMBER_DESC",
+                 "If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will \n"
+                 "include brief member descriptions after the members that are listed in \n"
+                 "the file and class documentation (similar to JavaDoc). \n"
+                 "Set to NO to disable this.",
+                 TRUE
+                );
   //----
   cb = cfg->addBool(
-                    "REPEAT_BRIEF",
-                    "If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend \n"
-                    "the brief description of a member or function before the detailed description. \n"
-                    "Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the \n"
-                    "brief descriptions will be completely suppressed. \n",
-                    TRUE
-                 );
+                 "REPEAT_BRIEF",
+                 "If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend \n"
+                 "the brief description of a member or function before the detailed description. \n"
+                 "Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the \n"
+                 "brief descriptions will be completely suppressed.",
+                 TRUE
+                );
   //----
   cl = cfg->addList(
-                    "ABBREVIATE_BRIEF",
-                    "This tag implements a quasi-intelligent brief description abbreviator \n"
-                    "that is used to form the text in various listings. Each string \n"
-                    "in this list, if found as the leading text of the brief description, will be \n"
-                    "stripped from the text and the result after processing the whole list, is \n"
-		    "used as the annotated text. Otherwise, the brief description is used as-is. \n"
-		    "If left blank, the following values are used (\"$name\" is automatically \n"
-		    "replaced with the name of the entity): \"The $name class\" \"The $name widget\" \n"
-		    "\"The $name file\" \"is\" \"provides\" \"specifies\" \"contains\" \n"
-		    "\"represents\" \"a\" \"an\" \"the\"\n"
-                 );
-  //----
-  cb = cfg->addBool(
-                    "ALWAYS_DETAILED_SEC",
-                    "If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then \n"
-                    "Doxygen will generate a detailed section even if there is only a brief \n"
-                    "description. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "INLINE_INHERITED_MEMB",
-                    "If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all \n"
-		    "inherited members of a class in the documentation of that class as if those \n"
-		    "members were ordinary class members. Constructors, destructors and assignment \n"
-		    "operators of the base classes will not be shown. \n",
-		    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "FULL_PATH_NAMES",
-                    "If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full \n"
-                    "path before files name in the file list and in the header files. If set \n"
-                    "to NO the shortest path that makes the file name unique will be used. \n",
-                    TRUE
-                 );
+                 "ABBREVIATE_BRIEF",
+                 "This tag implements a quasi-intelligent brief description abbreviator \n"
+                 "that is used to form the text in various listings. Each string \n"
+                 "in this list, if found as the leading text of the brief description, will be \n"
+                 "stripped from the text and the result after processing the whole list, is \n"
+                 "used as the annotated text. Otherwise, the brief description is used as-is. \n"
+                 "If left blank, the following values are used (\"$name\" is automatically \n"
+                 "replaced with the name of the entity): \"The $name class\" \"The $name widget\" \n"
+                 "\"The $name file\" \"is\" \"provides\" \"specifies\" \"contains\" \n"
+                 "\"represents\" \"a\" \"an\" \"the\""
+                );
+  cl->addValue("The $name class");
+  cl->addValue("The $name widget");
+  cl->addValue("The $name file");
+  cl->addValue("is");
+  cl->addValue("provides");
+  cl->addValue("specifies");
+  cl->addValue("contains");
+  cl->addValue("represents");
+  cl->addValue("a");
+  cl->addValue("an");
+  cl->addValue("the");
+  //----
+  cb = cfg->addBool(
+                 "ALWAYS_DETAILED_SEC",
+                 "If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then \n"
+                 "Doxygen will generate a detailed section even if there is only a brief \n"
+                 "description.",
+                 FALSE
+                );
   //----
-  cl = cfg->addList(
-                    "STRIP_FROM_PATH",
-                    "If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag \n"
-                    "can be used to strip a user-defined part of the path. Stripping is \n"
-                    "only done if one of the specified strings matches the left-hand part of \n"
-                    "the path. The tag can be used to show relative paths in the file list. \n"
-		    "If left blank the directory from which doxygen is run is used as the \n"
-		    "path to strip. \n"
-                 );
+  cb = cfg->addBool(
+                 "INLINE_INHERITED_MEMB",
+                 "If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all \n"
+                 "inherited members of a class in the documentation of that class as if those \n"
+                 "members were ordinary class members. Constructors, destructors and assignment \n"
+                 "operators of the base classes will not be shown.",
+                 FALSE
+                );
   //----
+  cb = cfg->addBool(
+                 "FULL_PATH_NAMES",
+                 "If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full \n"
+                 "path before files name in the file list and in the header files. If set \n"
+                 "to NO the shortest path that makes the file name unique will be used.",
+                 TRUE
+                );
+  //----
+  cl = cfg->addList(
+                 "STRIP_FROM_PATH",
+                 "If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag \n"
+                 "can be used to strip a user-defined part of the path. Stripping is \n"
+                 "only done if one of the specified strings matches the left-hand part of \n"
+                 "the path. The tag can be used to show relative paths in the file list. \n"
+                 "If left blank the directory from which doxygen is run is used as the \n"
+                 "path to strip."
+                );
+  cl->addValue("/Users/dimitri/doxygen/mail/1.5.7/doxywizard/");
   cl->addDependency("FULL_PATH_NAMES");
+  //----
   cl = cfg->addList(
-                    "STRIP_FROM_INC_PATH",
-                    "The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of \n"
-		    "the path mentioned in the documentation of a class, which tells \n"
-		    "the reader which header file to include in order to use a class. \n"
-		    "If left blank only the name of the header file containing the class \n"
-		    "definition is used. Otherwise one should specify the include paths that \n"
-		    "are normally passed to the compiler using the -I flag.\n"
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SHORT_NAMES",
-		    "If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter \n"
-		    "(but less readable) file names. This can be useful is your file systems \n"
-		    "doesn't support long names like on DOS, Mac, or CD-ROM. \n",
-		    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "JAVADOC_AUTOBRIEF",
-                    "If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen \n"
-                    "will interpret the first line (until the first dot) of a JavaDoc-style \n"
-                    "comment as the brief description. If set to NO, the JavaDoc \n"
-                    "comments will behave just like regular Qt-style comments \n"
-                    "(thus requiring an explicit @brief command for a brief description.) \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "QT_AUTOBRIEF",
-                    "If the QT_AUTOBRIEF tag is set to YES then Doxygen will \n"
-                    "interpret the first line (until the first dot) of a Qt-style \n"
-                    "comment as the brief description. If set to NO, the comments \n"
-                    "will behave just like regular Qt-style comments (thus requiring \n"
-                    "an explicit \\brief command for a brief description.) \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "MULTILINE_CPP_IS_BRIEF",
-                    "The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen \n"
-                    "treat a multi-line C++ special comment block (i.e. a block of //! or /// \n"
-		    "comments) as a brief description. This used to be the default behaviour. \n"
-		    "The new default is to treat a multi-line C++ comment block as a detailed \n"
-		    "description. Set this tag to YES if you prefer the old behaviour instead. \n",
-                    FALSE
-                 );
-  //----
-  //cb = cfg->addBool(
-  //                  "DETAILS_AT_TOP",
-  //                  "If the DETAILS_AT_TOP tag is set to YES then Doxygen \n"
-  //                  "will output the detailed description near the top, like JavaDoc.\n"
-  //                  "If set to NO, the detailed description appears after the member \n"
-  //                  "documentation. \n",
-  //                  FALSE
-  //               );
-  cb = cfg->addBool(
-                    "INHERIT_DOCS",
-                    "If the INHERIT_DOCS tag is set to YES (the default) then an undocumented \n"
-                    "member inherits the documentation from any documented member that it \n"
-                    "re-implements. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(    
-                    "SEPARATE_MEMBER_PAGES",
-		    "If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce \n"
-		    "a new page for each member. If set to NO, the documentation of a member will \n"
-		    "be part of the file/class/namespace that contains it.\n",
-		    FALSE
-		 );
+                 "STRIP_FROM_INC_PATH",
+                 "The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of \n"
+                 "the path mentioned in the documentation of a class, which tells \n"
+                 "the reader which header file to include in order to use a class. \n"
+                 "If left blank only the name of the header file containing the class \n"
+                 "definition is used. Otherwise one should specify the include paths that \n"
+                 "are normally passed to the compiler using the -I flag."
+                );
+  //----
+  cb = cfg->addBool(
+                 "SHORT_NAMES",
+                 "If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter \n"
+                 "(but less readable) file names. This can be useful is your file systems \n"
+                 "doesn't support long names like on DOS, Mac, or CD-ROM.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "JAVADOC_AUTOBRIEF",
+                 "If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen \n"
+                 "will interpret the first line (until the first dot) of a JavaDoc-style \n"
+                 "comment as the brief description. If set to NO, the JavaDoc \n"
+                 "comments will behave just like regular Qt-style comments \n"
+                 "(thus requiring an explicit @brief command for a brief description.)",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "QT_AUTOBRIEF",
+                 "If the QT_AUTOBRIEF tag is set to YES then Doxygen will \n"
+                 "interpret the first line (until the first dot) of a Qt-style \n"
+                 "comment as the brief description. If set to NO, the comments \n"
+                 "will behave just like regular Qt-style comments (thus requiring \n"
+                 "an explicit \\brief command for a brief description.)",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "MULTILINE_CPP_IS_BRIEF",
+                 "The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen \n"
+                 "treat a multi-line C++ special comment block (i.e. a block of //! or /// \n"
+                 "comments) as a brief description. This used to be the default behaviour. \n"
+                 "The new default is to treat a multi-line C++ comment block as a detailed \n"
+                 "description. Set this tag to YES if you prefer the old behaviour instead.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "INHERIT_DOCS",
+                 "If the INHERIT_DOCS tag is set to YES (the default) then an undocumented \n"
+                 "member inherits the documentation from any documented member that it \n"
+                 "re-implements.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SEPARATE_MEMBER_PAGES",
+                 "If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce \n"
+                 "a new page for each member. If set to NO, the documentation of a member will \n"
+                 "be part of the file/class/namespace that contains it.",
+                 FALSE
+                );
   //----
   ci = cfg->addInt(
-                    "TAB_SIZE",
-                    "The TAB_SIZE tag can be used to set the number of spaces in a tab. \n"
-                    "Doxygen uses this value to replace tabs by spaces in code fragments. \n",
-                    1,16,8
-                 );
+                 "TAB_SIZE",
+                 "The TAB_SIZE tag can be used to set the number of spaces in a tab. \n"
+                 "Doxygen uses this value to replace tabs by spaces in code fragments.",
+                 1,16,8
+                );
+  //----
+  cl = cfg->addList(
+                 "ALIASES",
+                 "This tag can be used to specify a number of aliases that acts \n"
+                 "as commands in the documentation. An alias has the form \"name=value\". \n"
+                 "For example adding \"sideeffect=\\par Side Effects:\\n\" will allow you to \n"
+                 "put the command \\sideeffect (or @sideeffect) in the documentation, which \n"
+                 "will result in a user-defined paragraph with heading \"Side Effects:\". \n"
+                 "You can put \\n's in the value part of an alias to insert newlines."
+                );
+  //----
+  cb = cfg->addBool(
+                 "OPTIMIZE_OUTPUT_FOR_C",
+                 "Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C \n"
+                 "sources only. Doxygen will then generate output that is more tailored for C. \n"
+                 "For instance, some of the names that are used will be different. The list \n"
+                 "of all members will be omitted, etc.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "OPTIMIZE_OUTPUT_JAVA",
+                 "Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java \n"
+                 "sources only. Doxygen will then generate output that is more tailored for \n"
+                 "Java. For instance, namespaces will be presented as packages, qualified \n"
+                 "scopes will look different, etc.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "OPTIMIZE_FOR_FORTRAN",
+                 "Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran \n"
+                 "sources only. Doxygen will then generate output that is more tailored for \n"
+                 "Fortran.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "OPTIMIZE_OUTPUT_VHDL",
+                 "Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL \n"
+                 "sources. Doxygen will then generate output that is tailored for \n"
+                 "VHDL.",
+                 FALSE
+                );
   //----
   cl = cfg->addList(
-                    "ALIASES",
-                    "This tag can be used to specify a number of aliases that acts \n"
-                    "as commands in the documentation. An alias has the form \"name=value\". \n"
-                    "For example adding \"sideeffect=\\par Side Effects:\\n\" will allow you to \n"
-                    "put the command \\sideeffect (or @sideeffect) in the documentation, which \n"
-                    "will result in a user-defined paragraph with heading \"Side Effects:\". \n"
-                    "You can put \\n's in the value part of an alias to insert newlines. \n" 
-                 );
-  //----
-  cb = cfg->addBool(
-                    "OPTIMIZE_OUTPUT_FOR_C",
-                    "Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C \n"
-		    "sources only. Doxygen will then generate output that is more tailored for C. \n"
-                    "For instance, some of the names that are used will be different. The list \n"
-                    "of all members will be omitted, etc. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "OPTIMIZE_OUTPUT_JAVA",
-                    "Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java \n"
-		    "sources only. Doxygen will then generate output that is more tailored for \n"
-		    "Java. For instance, namespaces will be presented as packages, qualified \n"
-		    "scopes will look different, etc. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "OPTIMIZE_FOR_FORTRAN",
-                    "Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran \n"
-                    "sources only. Doxygen will then generate output that is more tailored for \n"
-		    "Fortran. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "OPTIMIZE_OUTPUT_VHDL",
-                    "Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL \n"
-                    "sources. Doxygen will then generate output that is tailored for \n"
-		    "VHDL. \n",
-                    FALSE
-                 );
-  //----
-  cl = cfg->addList(     "EXTENSION_MAPPING",
-                    "Doxygen selects the parser to use depending on the extension of the files it parses. \n"
-		    "With this tag you can assign which parser to use for a given extension. \n"
-		    "Doxygen has a built-in mapping, but you can override or extend it using this tag. \n"
-		    "The format is ext=language, where ext is a file extension, and language is one of \n"
-		    "the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, \n"
-		    "Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat \n"
-		    ".inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), \n"
-		    "use: inc=Fortran f=C\n"
-                 );
-  //----
-  cb = cfg->addBool(  
-                    "BUILTIN_STL_SUPPORT",
-		    "If you use STL classes (i.e. std::string, std::vector, etc.) but do not want \n"
-		    "to include (a tag file for) the STL sources as input, then you should \n"
-		    "set this tag to YES in order to let doxygen match functions declarations and \n"
-		    "definitions whose arguments contain STL classes (e.g. func(std::string); v.s. \n"
-		    "func(std::string) {}). This also make the inheritance and collaboration \n"
-		    "diagrams that involve STL classes more complete and accurate. \n",
-		    FALSE
-		 );
-  //----
-  cb = cfg->addBool(
-                    "CPP_CLI_SUPPORT",
-		    "If you use Microsoft's C++/CLI language, you should set this option to YES to\n"
-		    "enable parsing support.\n",
-		    FALSE
-      	         );
-  //----
-  cb = cfg->addBool(
-                    "SIP_SUPPORT",
-                    "Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. \n"
-		    "Doxygen will parse them like normal C++ but will assume all classes use public \n"
-		    "instead of private inheritance when no explicit protection keyword is present. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(     "IDL_PROPERTY_SUPPORT",
-                    "For Microsoft's IDL there are propget and propput attributes to indicate getter \n"
-		    "and setter methods for a property. Setting this option to YES (the default) \n"
-		    "will make doxygen to replace the get and set methods by a property in the \n"
-		    "documentation. This will only work if the methods are indeed getting or \n"
-		    "setting a simple type. If this is not the case, or you want to show the \n"
-		    "methods anyway, you should set this option to NO. \n",
-		    TRUE
-		 );
-  //----
-  cb = cfg->addBool(
-                    "DISTRIBUTE_GROUP_DOC",
-                    "If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC \n"
-                    "tag is set to YES, then doxygen will reuse the documentation of the first \n"
-                    "member in the group (if any) for the other members of the group. By default \n"
-                    "all members of a group must be documented explicitly.\n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(    
-                    "SUBGROUPING",
-		    "Set the SUBGROUPING tag to YES (the default) to allow class member groups of \n"
-		    "the same type (for instance a group of public functions) to be put as a \n"
-		    "subgroup of that type (e.g. under the Public Functions section). Set it to \n"
-		    "NO to prevent subgrouping. Alternatively, this can be done per class using \n"
-		    "the \\nosubgrouping command. \n",
-		    TRUE
-                );
-  //----
-  cb = cfg->addBool(     "TYPEDEF_HIDES_STRUCT",
-                    "When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum \n"
-		    "is documented as struct, union, or enum with the name of the typedef. So \n"
-		    "typedef struct TypeS {} TypeT, will appear in the documentation as a struct \n"
-		    "with name TypeT. When disabled the typedef will appear as a member of a file, \n"
-		    "namespace, or class. And the struct will be named TypeS. This can typically \n"
-		    "be useful for C code in case the coding convention dictates that all compound \n"
-		    "types are typedef'ed and only the typedef is referenced, never the tag name.\n",
-		    FALSE
+                 "EXTENSION_MAPPING",
+                 "Doxygen selects the parser to use depending on the extension of the files it parses. \n"
+                 "With this tag you can assign which parser to use for a given extension. \n"
+                 "Doxygen has a built-in mapping, but you can override or extend it using this tag. \n"
+                 "The format is ext=language, where ext is a file extension, and language is one of \n"
+                 "the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, \n"
+                 "Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat \n"
+                 ".inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), \n"
+                 "use: inc=Fortran f=C"
+                );
+  //----
+  cb = cfg->addBool(
+                 "BUILTIN_STL_SUPPORT",
+                 "If you use STL classes (i.e. std::string, std::vector, etc.) but do not want \n"
+                 "to include (a tag file for) the STL sources as input, then you should \n"
+                 "set this tag to YES in order to let doxygen match functions declarations and \n"
+                 "definitions whose arguments contain STL classes (e.g. func(std::string); v.s. \n"
+                 "func(std::string) {}). This also make the inheritance and collaboration \n"
+                 "diagrams that involve STL classes more complete and accurate.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "CPP_CLI_SUPPORT",
+                 "If you use Microsoft's C++/CLI language, you should set this option to YES to \n"
+                 "enable parsing support.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SIP_SUPPORT",
+                 "Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. \n"
+                 "Doxygen will parse them like normal C++ but will assume all classes use public \n"
+                 "instead of private inheritance when no explicit protection keyword is present.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "IDL_PROPERTY_SUPPORT",
+                 "For Microsoft's IDL there are propget and propput attributes to indicate getter \n"
+                 "and setter methods for a property. Setting this option to YES (the default) \n"
+                 "will make doxygen to replace the get and set methods by a property in the \n"
+                 "documentation. This will only work if the methods are indeed getting or \n"
+                 "setting a simple type. If this is not the case, or you want to show the \n"
+                 "methods anyway, you should set this option to NO.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "DISTRIBUTE_GROUP_DOC",
+                 "If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC \n"
+                 "tag is set to YES, then doxygen will reuse the documentation of the first \n"
+                 "member in the group (if any) for the other members of the group. By default \n"
+                 "all members of a group must be documented explicitly.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SUBGROUPING",
+                 "Set the SUBGROUPING tag to YES (the default) to allow class member groups of \n"
+                 "the same type (for instance a group of public functions) to be put as a \n"
+                 "subgroup of that type (e.g. under the Public Functions section). Set it to \n"
+                 "NO to prevent subgrouping. Alternatively, this can be done per class using \n"
+                 "the \\nosubgrouping command.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "TYPEDEF_HIDES_STRUCT",
+                 "When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum \n"
+                 "is documented as struct, union, or enum with the name of the typedef. So \n"
+                 "typedef struct TypeS {} TypeT, will appear in the documentation as a struct \n"
+                 "with name TypeT. When disabled the typedef will appear as a member of a file, \n"
+                 "namespace, or class. And the struct will be named TypeS. This can typically \n"
+                 "be useful for C code in case the coding convention dictates that all compound \n"
+                 "types are typedef'ed and only the typedef is referenced, never the tag name.",
+                 FALSE
                 );
   //----
   ci = cfg->addInt(
-                    "SYMBOL_CACHE_SIZE",
-                    "The SYMBOL_CACHE_SIZE determines the size of the internal cache use to \n"
-		    "determine which symbols to keep in memory and which to flush to disk.\n"
-		    "When the cache is full, less often used symbols will be written to disk.\n"
-		    "For small to medium size projects (<1000 input files) the default value is \n"
-		    "probably good enough. For larger projects a too small cache size can cause \n"
-		    "doxygen to be busy swapping symbols to and from disk most of the time \n"
-		    "causing a significant performance penality. \n"
-		    "If the system has enough physical memory increasing the cache will improve the \n"
-		    "performance by keeping more symbols in memory. Note that the value works on \n"
-		    "a logarithmic scale so increasing the size by one will rougly double the \n"
-		    "memory usage. The cache size is given by this formula: \n"
-		    "2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, \n"
-		    "corresponding to a cache size of 2^16 = 65536 symbols\n",
-                    0,9,0
-             );
-
-  //-----------------------------------------------------------------------------------------------
+                 "SYMBOL_CACHE_SIZE",
+                 "The SYMBOL_CACHE_SIZE determines the size of the internal cache use to \n"
+                 "determine which symbols to keep in memory and which to flush to disk. \n"
+                 "When the cache is full, less often used symbols will be written to disk. \n"
+                 "For small to medium size projects (<1000 input files) the default value is \n"
+                 "probably good enough. For larger projects a too small cache size can cause \n"
+                 "doxygen to be busy swapping symbols to and from disk most of the time \n"
+                 "causing a significant performance penality. \n"
+                 "If the system has enough physical memory increasing the cache will improve the \n"
+                 "performance by keeping more symbols in memory. Note that the value works on \n"
+                 "a logarithmic scale so increasing the size by one will rougly double the \n"
+                 "memory usage. The cache size is given by this formula: \n"
+                 "2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, \n"
+                 "corresponding to a cache size of 2^16 = 65536 symbols",
+                 0,9,0
+                );
+  //---------------------------------------------------------------------------
   cfg->addInfo("Build","Build related configuration options");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(
-                    "EXTRACT_ALL",
-                    "If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in \n"
-                    "documentation are documented, even if no documentation was available. \n"
-                    "Private class members and static file members will be hidden unless \n"
-                    "the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXTRACT_PRIVATE",
-                    "If the EXTRACT_PRIVATE tag is set to YES all private members of a class \n"
-                    "will be included in the documentation. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXTRACT_STATIC",
-                    "If the EXTRACT_STATIC tag is set to YES all static members of a file \n"
-                    "will be included in the documentation. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXTRACT_LOCAL_CLASSES",
-                    "If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) \n"
-		    "defined locally in source files will be included in the documentation. \n"
-		    "If set to NO only classes defined in header files are included. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXTRACT_LOCAL_METHODS",
-                    "This flag is only useful for Objective-C code. When set to YES local \n"
-		    "methods, which are defined in the implementation section but not in \n"
-		    "the interface are included in the documentation. \n"
-		    "If set to NO (the default) only methods in the interface are included. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXTRACT_ANON_NSPACES",
-                    "If this flag is set to YES, the members of anonymous namespaces will be \n"
-		    "extracted and appear in the documentation as a namespace called \n"
-		    "'anonymous_namespace{file}', where file will be replaced with the base \n"
-		    "name of the file that contains the anonymous namespace. By default \n"
-		    "anonymous namespace are hidden. \n",
-                   FALSE 
-                 );
-  //----
-  cb = cfg->addBool(
-                    "HIDE_UNDOC_MEMBERS",
-                    "If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all \n"
-                    "undocumented members of documented classes, files or namespaces. \n"
-                    "If set to NO (the default) these members will be included in the \n"
-                    "various overviews, but no documentation section is generated. \n"
-                    "This option has no effect if EXTRACT_ALL is enabled. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "HIDE_UNDOC_CLASSES",
-                    "If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all \n"
-                    "undocumented classes that are normally visible in the class hierarchy. \n"
-                    "If set to NO (the default) these classes will be included in the various \n"
-                    "overviews. This option has no effect if EXTRACT_ALL is enabled. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "HIDE_FRIEND_COMPOUNDS",
-                    "If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all \n"
-                    "friend (class|struct|union) declarations. \n"
-                    "If set to NO (the default) these declarations will be included in the \n"
-                    "documentation. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "HIDE_IN_BODY_DOCS",
-                    "If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any \n"
-                    "documentation blocks found inside the body of a function. \n"
-                    "If set to NO (the default) these blocks will be appended to the \n"
-                    "function's detailed documentation block. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "INTERNAL_DOCS",
-                    "The INTERNAL_DOCS tag determines if documentation \n"
-                    "that is typed after a \\internal command is included. If the tag is set \n"
-                    "to NO (the default) then the documentation will be excluded. \n"
-                    "Set it to YES to include the internal documentation. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "CASE_SENSE_NAMES",
-                    "If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate \n"
-                    "file names in lower-case letters. If set to YES upper-case letters are also \n"
-                    "allowed. This is useful if you have classes or files whose names only differ \n"
-                    "in case and if your file system supports case sensitive file names. Windows \n"
-                    "and Mac users are advised to set this option to NO.\n",
-		    portable_fileSystemIsCaseSensitive()
-                 );
-  //----
-  cb = cfg->addBool(
-                    "HIDE_SCOPE_NAMES",
-                    "If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen \n"
-                    "will show members with their full class and namespace scopes in the \n"
-                    "documentation. If set to YES the scope will be hidden. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SHOW_INCLUDE_FILES",
-                    "If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen \n"
-                    "will put a list of the files that are included by a file in the documentation \n"
-                    "of that file. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "INLINE_INFO",
-                    "If the INLINE_INFO tag is set to YES (the default) then a tag [inline] \n"
-                    "is inserted in the documentation for inline members. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SORT_MEMBER_DOCS",
-                    "If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen \n"
-                    "will sort the (detailed) documentation of file and class members \n"
-                    "alphabetically by member name. If set to NO the members will appear in \n"
-                    "declaration order. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SORT_BRIEF_DOCS",
-                    "If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the \n"
-                    "brief documentation of file, namespace and class members alphabetically \n"
-                    "by member name. If set to NO (the default) the members will appear in \n"
-                    "declaration order. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SORT_GROUP_NAMES",
-                    "If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the \n"
-                    "hierarchy of group names into alphabetical order. If set to NO (the default) \n"
-                    "the group names will appear in their defined order. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SORT_BY_SCOPE_NAME",
-                    "If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be \n"
-                    "sorted by fully-qualified names, including namespaces. If set to \n"
-		    "NO (the default), the class list will be sorted only by class name, \n"
-		    "not including the namespace part. \n"
-                    "Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.\n"
-                    "Note: This option applies only to the class list, not to the \n"
-                    "alphabetical list.\n",
-                    FALSE
-                 );
+  //---------------------------------------------------------------------------
 
   //----
   cb = cfg->addBool(
-                    "GENERATE_TODOLIST",
-                    "The GENERATE_TODOLIST tag can be used to enable (YES) or \n"
-                    "disable (NO) the todo list. This list is created by putting \\todo \n"
-                    "commands in the documentation.\n",
-                    TRUE
-                 );
+                 "EXTRACT_ALL",
+                 "If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in \n"
+                 "documentation are documented, even if no documentation was available. \n"
+                 "Private class members and static file members will be hidden unless \n"
+                 "the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "EXTRACT_PRIVATE",
+                 "If the EXTRACT_PRIVATE tag is set to YES all private members of a class \n"
+                 "will be included in the documentation.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "EXTRACT_STATIC",
+                 "If the EXTRACT_STATIC tag is set to YES all static members of a file \n"
+                 "will be included in the documentation.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "EXTRACT_LOCAL_CLASSES",
+                 "If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) \n"
+                 "defined locally in source files will be included in the documentation. \n"
+                 "If set to NO only classes defined in header files are included.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "EXTRACT_LOCAL_METHODS",
+                 "This flag is only useful for Objective-C code. When set to YES local \n"
+                 "methods, which are defined in the implementation section but not in \n"
+                 "the interface are included in the documentation. \n"
+                 "If set to NO (the default) only methods in the interface are included.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "EXTRACT_ANON_NSPACES",
+                 "If this flag is set to YES, the members of anonymous namespaces will be \n"
+                 "extracted and appear in the documentation as a namespace called \n"
+                 "'anonymous_namespace{file}', where file will be replaced with the base \n"
+                 "name of the file that contains the anonymous namespace. By default \n"
+                 "anonymous namespace are hidden.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "HIDE_UNDOC_MEMBERS",
+                 "If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all \n"
+                 "undocumented members of documented classes, files or namespaces. \n"
+                 "If set to NO (the default) these members will be included in the \n"
+                 "various overviews, but no documentation section is generated. \n"
+                 "This option has no effect if EXTRACT_ALL is enabled.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "HIDE_UNDOC_CLASSES",
+                 "If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all \n"
+                 "undocumented classes that are normally visible in the class hierarchy. \n"
+                 "If set to NO (the default) these classes will be included in the various \n"
+                 "overviews. This option has no effect if EXTRACT_ALL is enabled.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "HIDE_FRIEND_COMPOUNDS",
+                 "If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all \n"
+                 "friend (class|struct|union) declarations. \n"
+                 "If set to NO (the default) these declarations will be included in the \n"
+                 "documentation.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "HIDE_IN_BODY_DOCS",
+                 "If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any \n"
+                 "documentation blocks found inside the body of a function. \n"
+                 "If set to NO (the default) these blocks will be appended to the \n"
+                 "function's detailed documentation block.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "INTERNAL_DOCS",
+                 "The INTERNAL_DOCS tag determines if documentation \n"
+                 "that is typed after a \\internal command is included. If the tag is set \n"
+                 "to NO (the default) then the documentation will be excluded. \n"
+                 "Set it to YES to include the internal documentation.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "CASE_SENSE_NAMES",
+                 "If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate \n"
+                 "file names in lower-case letters. If set to YES upper-case letters are also \n"
+                 "allowed. This is useful if you have classes or files whose names only differ \n"
+                 "in case and if your file system supports case sensitive file names. Windows \n"
+                 "and Mac users are advised to set this option to NO.",
+                 portable_fileSystemIsCaseSensitive()
+                );
   //----
   cb = cfg->addBool(
-                    "GENERATE_TESTLIST",
-                    "The GENERATE_TESTLIST tag can be used to enable (YES) or \n"
-                    "disable (NO) the test list. This list is created by putting \\test \n"
-                    "commands in the documentation.\n",
-                    TRUE
-                 );
+                 "HIDE_SCOPE_NAMES",
+                 "If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen \n"
+                 "will show members with their full class and namespace scopes in the \n"
+                 "documentation. If set to YES the scope will be hidden.",
+                 FALSE
+                );
   //----
   cb = cfg->addBool(
-                    "GENERATE_BUGLIST",
-                    "The GENERATE_BUGLIST tag can be used to enable (YES) or \n"
-                    "disable (NO) the bug list. This list is created by putting \\bug \n"
-                    "commands in the documentation.\n",
-                    TRUE
-                 );
+                 "SHOW_INCLUDE_FILES",
+                 "If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen \n"
+                 "will put a list of the files that are included by a file in the documentation \n"
+                 "of that file.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "INLINE_INFO",
+                 "If the INLINE_INFO tag is set to YES (the default) then a tag [inline] \n"
+                 "is inserted in the documentation for inline members.",
+                 TRUE
+                );
   //----
   cb = cfg->addBool(
-                    "GENERATE_DEPRECATEDLIST",
-                    "The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or \n"
-                    "disable (NO) the deprecated list. This list is created by putting \n"
-		    "\\deprecated commands in the documentation.\n",
-                    TRUE
-	         );
+                 "SORT_MEMBER_DOCS",
+                 "If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen \n"
+                 "will sort the (detailed) documentation of file and class members \n"
+                 "alphabetically by member name. If set to NO the members will appear in \n"
+                 "declaration order.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SORT_BRIEF_DOCS",
+                 "If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the \n"
+                 "brief documentation of file, namespace and class members alphabetically \n"
+                 "by member name. If set to NO (the default) the members will appear in \n"
+                 "declaration order.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SORT_GROUP_NAMES",
+                 "If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the \n"
+                 "hierarchy of group names into alphabetical order. If set to NO (the default) \n"
+                 "the group names will appear in their defined order.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SORT_BY_SCOPE_NAME",
+                 "If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be \n"
+                 "sorted by fully-qualified names, including namespaces. If set to \n"
+                 "NO (the default), the class list will be sorted only by class name, \n"
+                 "not including the namespace part. \n"
+                 "Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. \n"
+                 "Note: This option applies only to the class list, not to the \n"
+                 "alphabetical list.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_TODOLIST",
+                 "The GENERATE_TODOLIST tag can be used to enable (YES) or \n"
+                 "disable (NO) the todo list. This list is created by putting \\todo \n"
+                 "commands in the documentation.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_TESTLIST",
+                 "The GENERATE_TESTLIST tag can be used to enable (YES) or \n"
+                 "disable (NO) the test list. This list is created by putting \\test \n"
+                 "commands in the documentation.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_BUGLIST",
+                 "The GENERATE_BUGLIST tag can be used to enable (YES) or \n"
+                 "disable (NO) the bug list. This list is created by putting \\bug \n"
+                 "commands in the documentation.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_DEPRECATEDLIST",
+                 "The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or \n"
+                 "disable (NO) the deprecated list. This list is created by putting \n"
+                 "\\deprecated commands in the documentation.",
+                 TRUE
+                );
   //----
   cl = cfg->addList(
-                    "ENABLED_SECTIONS",
-                    "The ENABLED_SECTIONS tag can be used to enable conditional \n"
-                    "documentation sections, marked by \\if sectionname ... \\endif. \n"
-                 );
+                 "ENABLED_SECTIONS",
+                 "The ENABLED_SECTIONS tag can be used to enable conditional \n"
+                 "documentation sections, marked by \\if sectionname ... \\endif."
+                );
   //----
   ci = cfg->addInt(
-                    "MAX_INITIALIZER_LINES",
-                    "The MAX_INITIALIZER_LINES tag determines the maximum number of lines \n"
-                    "the initial value of a variable or define consists of for it to appear in \n"
-                    "the documentation. If the initializer consists of more lines than specified \n"
-                    "here it will be hidden. Use a value of 0 to hide initializers completely. \n"
-                    "The appearance of the initializer of individual variables and defines in the \n"
-                    "documentation can be controlled using \\showinitializer or \\hideinitializer \n"
-                    "command in the documentation regardless of this setting. \n",
-                    0,10000,30
-                 );
-  //----
-  cb = cfg->addBool(
-                    "SHOW_USED_FILES",
-                    "Set the SHOW_USED_FILES tag to NO to disable the list of files generated \n"
-                    "at the bottom of the documentation of classes and structs. If set to YES the \n"
-                    "list will mention the files that were used to generate the documentation. \n",
-                    TRUE
-                );
-  //----
-  cb = cfg->addBool(
-                    "SHOW_DIRECTORIES",
-		    "If the sources in your project are distributed over multiple directories \n"
-		    "then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy \n"
-		    "in the documentation. The default is NO.\n",
-		    FALSE
-              );
-  //----
-  cb = cfg->addBool(
-                    "SHOW_FILES",
-                    "Set the SHOW_FILES tag to NO to disable the generation of the Files page.\n"
-                    "This will remove the Files entry from the Quick Index and from the \n"
-                    "Folder Tree View (if specified). The default is YES.\n",
-                    TRUE
-                );
-  //----
-  cb = cfg->addBool(
-                    "SHOW_NAMESPACES",
-                    "Set the SHOW_NAMESPACES tag to NO to disable the generation of the \n"
-                    "Namespaces page.  This will remove the Namespaces entry from the Quick Index\n"
-                    "and from the Folder Tree View (if specified). The default is YES.\n",
-                    TRUE
-                );
-  //----
-  cs = cfg->addString(  "FILE_VERSION_FILTER",
-                   "The FILE_VERSION_FILTER tag can be used to specify a program or script that \n"
-		   "doxygen should invoke to get the current version for each file (typically from \n"
-		   "the version control system). Doxygen will invoke the program by executing (via \n"
-		   "popen()) the command <command> <input-file>, where <command> is the value of \n"
-		   "the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file \n"
-		   "provided by doxygen. Whatever the program writes to standard output \n"
-		   "is used as the file version. See the manual for examples. \n"
-              );
-  cs->setWidgetType(ConfigString::File);
+                 "MAX_INITIALIZER_LINES",
+                 "The MAX_INITIALIZER_LINES tag determines the maximum number of lines \n"
+                 "the initial value of a variable or define consists of for it to appear in \n"
+                 "the documentation. If the initializer consists of more lines than specified \n"
+                 "here it will be hidden. Use a value of 0 to hide initializers completely. \n"
+                 "The appearance of the initializer of individual variables and defines in the \n"
+                 "documentation can be controlled using \\showinitializer or \\hideinitializer \n"
+                 "command in the documentation regardless of this setting.",
+                 0,10000,30
+                );
+  //----
+  cb = cfg->addBool(
+                 "SHOW_USED_FILES",
+                 "Set the SHOW_USED_FILES tag to NO to disable the list of files generated \n"
+                 "at the bottom of the documentation of classes and structs. If set to YES the \n"
+                 "list will mention the files that were used to generate the documentation.",
+                 TRUE
+                );
   //----
-  cs = cfg->addString(  "LAYOUT_FILE",
-                   "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
-		   "doxygen. The layout file controls the global structure of the generated output files \n"
-		   "in an output format independent way. The create the layout file that represents \n"
-		   "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
-		   "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
-		   "of the layout file.\n"
-	      );
+  cb = cfg->addBool(
+                 "SHOW_DIRECTORIES",
+                 "If the sources in your project are distributed over multiple directories \n"
+                 "then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy \n"
+                 "in the documentation. The default is NO.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SHOW_FILES",
+                 "Set the SHOW_FILES tag to NO to disable the generation of the Files page. \n"
+                 "This will remove the Files entry from the Quick Index and from the \n"
+                 "Folder Tree View (if specified). The default is YES.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "SHOW_NAMESPACES",
+                 "Set the SHOW_NAMESPACES tag to NO to disable the generation of the \n"
+                 "Namespaces page. \n"
+                 "This will remove the Namespaces entry from the Quick Index \n"
+                 "and from the Folder Tree View (if specified). The default is YES.",
+                 TRUE
+                );
+  //----
+  cs = cfg->addString(
+                 "FILE_VERSION_FILTER",
+                 "The FILE_VERSION_FILTER tag can be used to specify a program or script that \n"
+                 "doxygen should invoke to get the current version for each file (typically from \n"
+                 "the version control system). Doxygen will invoke the program by executing (via \n"
+                 "popen()) the command <command> <input-file>, where <command> is the value of \n"
+                 "the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file \n"
+                 "provided by doxygen. Whatever the program writes to standard output \n"
+                 "is used as the file version. See the manual for examples."
+                );
   cs->setWidgetType(ConfigString::File);
   //----
-  cfg->addObsolete("DETAILS_AT_TOP");
-
-  
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Messages","configuration options related to warning and progress messages");
-  //-----------------------------------------------------------------------------------------------
+  cs = cfg->addString(
+                 "LAYOUT_FILE",
+                 "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
+                 "doxygen. The layout file controls the global structure of the generated output files \n"
+                 "in an output format independent way. The create the layout file that represents \n"
+                 "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
+                 "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
+                 "of the layout file."
+                );
+  cs->setWidgetType(ConfigString::File);
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Messages","configuration options related to warning and progress messages");
+  //---------------------------------------------------------------------------
 
+  //----
+  cb = cfg->addBool(
+                 "QUIET",
+                 "The QUIET tag can be used to turn on/off the messages that are generated \n"
+                 "by doxygen. Possible values are YES and NO. If left blank NO is used.",
+                 FALSE
+                );
+  //----
   cb = cfg->addBool(
-                    "QUIET",
-                    "The QUIET tag can be used to turn on/off the messages that are generated \n"
-                    "by doxygen. Possible values are YES and NO. If left blank NO is used. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "WARNINGS",
-                    "The WARNINGS tag can be used to turn on/off the warning messages that are \n"
-                    "generated by doxygen. Possible values are YES and NO. If left blank \n"
-                    "NO is used. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "WARN_IF_UNDOCUMENTED",
-                    "If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings \n"
-                    "for undocumented members. If EXTRACT_ALL is set to YES then this flag will \n"
-                    "automatically be disabled. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "WARN_IF_DOC_ERROR",
-                    "If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for \n"
-                    "potential errors in the documentation, such as not documenting some \n"
-		    "parameters in a documented function, or documenting parameters that \n"
-		    "don't exist or using markup commands wrongly. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(     "WARN_NO_PARAMDOC",
-                    "This WARN_NO_PARAMDOC option can be abled to get warnings for \n"
-		    "functions that are documented, but have no documentation for their parameters \n"
-		    "or return value. If set to NO (the default) doxygen will only warn about \n"
-		    "wrong or incomplete parameter documentation, but not about the absence of \n"
-		    "documentation.\n",
-                    FALSE
-                 );
+                 "WARNINGS",
+                 "The WARNINGS tag can be used to turn on/off the warning messages that are \n"
+                 "generated by doxygen. Possible values are YES and NO. If left blank \n"
+                 "NO is used.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "WARN_IF_UNDOCUMENTED",
+                 "If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings \n"
+                 "for undocumented members. If EXTRACT_ALL is set to YES then this flag will \n"
+                 "automatically be disabled.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "WARN_IF_DOC_ERROR",
+                 "If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for \n"
+                 "potential errors in the documentation, such as not documenting some \n"
+                 "parameters in a documented function, or documenting parameters that \n"
+                 "don't exist or using markup commands wrongly.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "WARN_NO_PARAMDOC",
+                 "This WARN_NO_PARAMDOC option can be abled to get warnings for \n"
+                 "functions that are documented, but have no documentation for their parameters \n"
+                 "or return value. If set to NO (the default) doxygen will only warn about \n"
+                 "wrong or incomplete parameter documentation, but not about the absence of \n"
+                 "documentation.",
+                 FALSE
+                );
   //----
   cs = cfg->addString(
-                    "WARN_FORMAT",
-                    "The WARN_FORMAT tag determines the format of the warning messages that \n"
-                    "doxygen can produce. The string should contain the $file, $line, and $text \n"
-                    "tags, which will be replaced by the file and line number from which the \n"
-                    "warning originated and the warning text. Optionally the format may contain \n"
-		    "$version, which will be replaced by the version of the file (if it could \n"
-		    "be obtained via FILE_VERSION_FILTER)\n"
-                   ); 
+                 "WARN_FORMAT",
+                 "The WARN_FORMAT tag determines the format of the warning messages that \n"
+                 "doxygen can produce. The string should contain the $file, $line, and $text \n"
+                 "tags, which will be replaced by the file and line number from which the \n"
+                 "warning originated and the warning text. Optionally the format may contain \n"
+                 "$version, which will be replaced by the version of the file (if it could \n"
+                 "be obtained via FILE_VERSION_FILTER)"
+                );
   cs->setDefaultValue("$file:$line: $text");
   //----
   cs = cfg->addString(
-                    "WARN_LOGFILE",
-                    "The WARN_LOGFILE tag can be used to specify a file to which warning \n"
-                    "and error messages should be written. If left blank the output is written \n"
-                    "to stderr. \n"
-                   );
+                 "WARN_LOGFILE",
+                 "The WARN_LOGFILE tag can be used to specify a file to which warning \n"
+                 "and error messages should be written. If left blank the output is written \n"
+                 "to stderr."
+                );
   cs->setWidgetType(ConfigString::File);
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Input","configuration options related to the input files");
-  //-----------------------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Input","configuration options related to the input files");
+  //---------------------------------------------------------------------------
+
+  //----
   cl = cfg->addList(
-                    "INPUT",
-                    "The INPUT tag can be used to specify the files and/or directories that contain \n"
-                    "documented source files. You may enter file names like \"myfile.cpp\" or \n"
-                    "directories like \"/usr/src/myproject\". Separate the files or directories \n"
-                    "with spaces. \n"
-                 );
+                 "INPUT",
+                 "The INPUT tag can be used to specify the files and/or directories that contain \n"
+                 "documented source files. You may enter file names like \"myfile.cpp\" or \n"
+                 "directories like \"/usr/src/myproject\". Separate the files or directories \n"
+                 "with spaces."
+                );
+  cl->addValue("/Users/dimitri/doxygen/mail/1.5.7/doxywizard");
   cl->setWidgetType(ConfigList::FileAndDir);
   //----
-  cs = cfg->addString(   "INPUT_ENCODING",
-                    "This tag can be used to specify the character encoding of the source files \n"
-		    "that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is \n"
-		    "also the default input encoding. Doxygen uses libiconv (or the iconv built \n"
-		    "into libc) for the transcoding. See http://www.gnu.org/software/libiconv for \n"
-		    "the list of possible encodings.\n"
+  cs = cfg->addString(
+                 "INPUT_ENCODING",
+                 "This tag can be used to specify the character encoding of the source files \n"
+                 "that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is \n"
+                 "also the default input encoding. Doxygen uses libiconv (or the iconv built \n"
+                 "into libc) for the transcoding. See http://www.gnu.org/software/libiconv for \n"
+                 "the list of possible encodings."
                 );
   cs->setDefaultValue("UTF-8");
   //----
   cl = cfg->addList(
-                    "FILE_PATTERNS",
-                    "If the value of the INPUT tag contains directories, you can use the \n"
-                    "FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp \n"
-                    "and *.h) to filter out the source-files in the directories. If left \n"
-                    "blank the following patterns are tested: \n"
-		    "*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx \n"
-		    "*.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90\n"
-                 );
-  //----
-  cb = cfg->addBool(
-                    "RECURSIVE",
-                    "The RECURSIVE tag can be used to turn specify whether or not subdirectories \n"
-                    "should be searched for input files as well. Possible values are YES and NO. \n"
-                    "If left blank NO is used. \n",
-                    FALSE
-                 );
+                 "FILE_PATTERNS",
+                 "If the value of the INPUT tag contains directories, you can use the \n"
+                 "FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp \n"
+                 "and *.h) to filter out the source-files in the directories. If left \n"
+                 "blank the following patterns are tested: \n"
+                 "*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx \n"
+                 "*.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90"
+                );
+  cl->addValue("*.c");
+  cl->addValue("*.cc");
+  cl->addValue("*.cxx");
+  cl->addValue("*.cpp");
+  cl->addValue("*.c++");
+  cl->addValue("*.d");
+  cl->addValue("*.java");
+  cl->addValue("*.ii");
+  cl->addValue("*.ixx");
+  cl->addValue("*.ipp");
+  cl->addValue("*.i++");
+  cl->addValue("*.inl");
+  cl->addValue("*.h");
+  cl->addValue("*.hh");
+  cl->addValue("*.hxx");
+  cl->addValue("*.hpp");
+  cl->addValue("*.h++");
+  cl->addValue("*.idl");
+  cl->addValue("*.odl");
+  cl->addValue("*.cs");
+  cl->addValue("*.php");
+  cl->addValue("*.php3");
+  cl->addValue("*.inc");
+  cl->addValue("*.m");
+  cl->addValue("*.mm");
+  cl->addValue("*.dox");
+  cl->addValue("*.py");
+  cl->addValue("*.f90");
+  cl->addValue("*.f");
+  cl->addValue("*.vhd");
+  cl->addValue("*.vhdl");
+  //----
+  cb = cfg->addBool(
+                 "RECURSIVE",
+                 "The RECURSIVE tag can be used to turn specify whether or not subdirectories \n"
+                 "should be searched for input files as well. Possible values are YES and NO. \n"
+                 "If left blank NO is used.",
+                 FALSE
+                );
   //----
   cl = cfg->addList(
-                    "EXCLUDE",
-                    "The EXCLUDE tag can be used to specify files and/or directories that should \n"
-                    "excluded from the INPUT source files. This way you can easily exclude a \n"
-                    "subdirectory from a directory tree whose root is specified with the INPUT tag. \n"
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXCLUDE_SYMLINKS",
-                    "The EXCLUDE_SYMLINKS tag can be used select whether or not files or \n"
-		    "directories that are symbolic links (a Unix filesystem feature) are excluded \n"
-		    "from the input. \n",
-                    FALSE
-                 );
+                 "EXCLUDE",
+                 "The EXCLUDE tag can be used to specify files and/or directories that should \n"
+                 "excluded from the INPUT source files. This way you can easily exclude a \n"
+                 "subdirectory from a directory tree whose root is specified with the INPUT tag."
+                );
   cl->setWidgetType(ConfigList::FileAndDir);
   //----
+  cb = cfg->addBool(
+                 "EXCLUDE_SYMLINKS",
+                 "The EXCLUDE_SYMLINKS tag can be used select whether or not files or \n"
+                 "directories that are symbolic links (a Unix filesystem feature) are excluded \n"
+                 "from the input.",
+                 FALSE
+                );
+  //----
   cl = cfg->addList(
-                    "EXCLUDE_PATTERNS",
-                    "If the value of the INPUT tag contains directories, you can use the \n"
-                    "EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude \n"
-                    "certain files from those directories. Note that the wildcards are matched \n"
-		    "against the file with absolute path, so to exclude all test directories \n"
-		    "for example use the pattern */test/* \n"
-                 );
+                 "EXCLUDE_PATTERNS",
+                 "If the value of the INPUT tag contains directories, you can use the \n"
+                 "EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude \n"
+                 "certain files from those directories. Note that the wildcards are matched \n"
+                 "against the file with absolute path, so to exclude all test directories \n"
+                 "for example use the pattern */test/*"
+                );
   //----
   cl = cfg->addList(
-                    "EXCLUDE_SYMBOLS",
-                    "The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names \n"
-		    "(namespaces, classes, functions, etc.) that should be excluded from the \n"
-		    "output. The symbol name can be a fully qualified name, a word, or if the \n"
-		    "wildcard * is used, a substring. Examples: ANamespace, AClass, \n"
-		    "AClass::ANamespace, ANamespace::*Test \n"
-                 );
+                 "EXCLUDE_SYMBOLS",
+                 "The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names \n"
+                 "(namespaces, classes, functions, etc.) that should be excluded from the \n"
+                 "output. The symbol name can be a fully qualified name, a word, or if the \n"
+                 "wildcard * is used, a substring. Examples: ANamespace, AClass, \n"
+                 "AClass::ANamespace, ANamespace::*Test"
+                );
   //----
   cl = cfg->addList(
-                    "EXAMPLE_PATH",
-                    "The EXAMPLE_PATH tag can be used to specify one or more files or \n"
-                    "directories that contain example code fragments that are included (see \n"
-                    "the \\include command). \n"
-                 );
+                 "EXAMPLE_PATH",
+                 "The EXAMPLE_PATH tag can be used to specify one or more files or \n"
+                 "directories that contain example code fragments that are included (see \n"
+                 "the \\include command)."
+                );
   cl->setWidgetType(ConfigList::Dir);
   //----
   cl = cfg->addList(
-                    "EXAMPLE_PATTERNS",
-                    "If the value of the EXAMPLE_PATH tag contains directories, you can use the \n"
-                    "EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp \n"
-                    "and *.h) to filter out the source-files in the directories. If left \n"
-                    "blank all files are included. \n"
-                 );
-  //----
-  cb = cfg->addBool(
-                    "EXAMPLE_RECURSIVE",
-                    "If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be \n"
-                    "searched for input files to be used with the \\include or \\dontinclude \n"
-                    "commands irrespective of the value of the RECURSIVE tag. \n"
-                    "Possible values are YES and NO. If left blank NO is used. \n",
-                    FALSE
-                 );
+                 "EXAMPLE_PATTERNS",
+                 "If the value of the EXAMPLE_PATH tag contains directories, you can use the \n"
+                 "EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp \n"
+                 "and *.h) to filter out the source-files in the directories. If left \n"
+                 "blank all files are included."
+                );
+  cl->addValue("*");
+  //----
+  cb = cfg->addBool(
+                 "EXAMPLE_RECURSIVE",
+                 "If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be \n"
+                 "searched for input files to be used with the \\include or \\dontinclude \n"
+                 "commands irrespective of the value of the RECURSIVE tag. \n"
+                 "Possible values are YES and NO. If left blank NO is used.",
+                 FALSE
+                );
   //----
   cl = cfg->addList(
-                    "IMAGE_PATH",
-                    "The IMAGE_PATH tag can be used to specify one or more files or \n"
-                    "directories that contain image that are included in the documentation (see \n"
-                    "the \\image command). \n"
-                 );
+                 "IMAGE_PATH",
+                 "The IMAGE_PATH tag can be used to specify one or more files or \n"
+                 "directories that contain image that are included in the documentation (see \n"
+                 "the \\image command)."
+                );
   cl->setWidgetType(ConfigList::Dir);
   //----
   cs = cfg->addString(
-                    "INPUT_FILTER",
-                    "The INPUT_FILTER tag can be used to specify a program that doxygen should \n"
-                    "invoke to filter for each input file. Doxygen will invoke the filter program \n"
-                    "by executing (via popen()) the command <filter> <input-file>, where <filter> \n"
-                    "is the value of the INPUT_FILTER tag, and <input-file> is the name of an \n"
-                    "input file. Doxygen will then use the output that the filter program writes \n"
-                    "to standard output.  If FILTER_PATTERNS is specified, this tag will be \n"
-                    "ignored. \n"
-                   );
+                 "INPUT_FILTER",
+                 "The INPUT_FILTER tag can be used to specify a program that doxygen should \n"
+                 "invoke to filter for each input file. Doxygen will invoke the filter program \n"
+                 "by executing (via popen()) the command <filter> <input-file>, where <filter> \n"
+                 "is the value of the INPUT_FILTER tag, and <input-file> is the name of an \n"
+                 "input file. Doxygen will then use the output that the filter program writes \n"
+                 "to standard output. \n"
+                 "If FILTER_PATTERNS is specified, this tag will be \n"
+                 "ignored."
+                );
   cs->setWidgetType(ConfigString::File);
   //----
   cl = cfg->addList(
-                    "FILTER_PATTERNS",
-                    "The FILTER_PATTERNS tag can be used to specify filters on a per file pattern \n"
-                    "basis.  Doxygen will compare the file name with each pattern and apply the \n"
-                    "filter if there is a match.  The filters are a list of the form: \n"
-                    "pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further \n"
-                    "info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER \n"
-                    "is applied to all files. \n"
-                   );
+                 "FILTER_PATTERNS",
+                 "The FILTER_PATTERNS tag can be used to specify filters on a per file pattern \n"
+                 "basis. \n"
+                 "Doxygen will compare the file name with each pattern and apply the \n"
+                 "filter if there is a match. \n"
+                 "The filters are a list of the form: \n"
+                 "pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further \n"
+                 "info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER \n"
+                 "is applied to all files."
+                );
   cl->setWidgetType(ConfigList::File);
   //----
   cb = cfg->addBool(
-                    "FILTER_SOURCE_FILES",
-                    "If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using \n"
-                    "INPUT_FILTER) will be used to filter the input files when producing source \n"
-                    "files to browse (i.e. when SOURCE_BROWSER is set to YES). \n",
-                    FALSE
-                );    
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Source Browser","configuration options related to source browsing");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(
-                    "SOURCE_BROWSER",
-                    "If the SOURCE_BROWSER tag is set to YES then a list of source files will \n"
-                    "be generated. Documented entities will be cross-referenced with these sources. \n"
-		    "Note: To get rid of all source code in the generated output, make sure also \n"
-		    "VERBATIM_HEADERS is set to NO. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "INLINE_SOURCES",
-                    "Setting the INLINE_SOURCES tag to YES will include the body \n"
-                    "of functions and classes directly in the documentation. \n",
-                    FALSE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "STRIP_CODE_COMMENTS",
-                    "Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct \n"
-                    "doxygen to hide any special comment blocks from generated source code \n"
-                    "fragments. Normal C and C++ comments will always remain visible. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(     "REFERENCED_BY_RELATION",
-                    "If the REFERENCED_BY_RELATION tag is set to YES \n"
-		    "then for each documented function all documented \n"
-		    "functions referencing it will be listed. \n",
-                    FALSE
-              );
-  //----
-  cb = cfg->addBool(     "REFERENCES_RELATION",
-                    "If the REFERENCES_RELATION tag is set to YES \n"
-		    "then for each documented function all documented entities \n"
-		    "called/used by that function will be listed. \n",
-                    FALSE
-              );
-  //----
-  cb = cfg->addBool(     "REFERENCES_LINK_SOURCE",
-                    "If the REFERENCES_LINK_SOURCE tag is set to YES (the default)\n"
-                    "and SOURCE_BROWSER tag is set to YES, then the hyperlinks from\n"
-                    "functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will\n"
-                    "link to the source code.  Otherwise they will link to the documentstion.\n",
-                    TRUE
-              );
-  //----
-  cb = cfg->addBool(
-                    "USE_HTAGS",
-		    "If the USE_HTAGS tag is set to YES then the references to source code \n"
-		    "will point to the HTML generated by the htags(1) tool instead of doxygen \n"
-		    "built-in source browser. The htags tool is part of GNU's global source \n"
-		    "tagging system (see http://www.gnu.org/software/global/global.html). You \n"
-		    "will need version 4.8.6 or higher. \n",
-		    FALSE
-              );
+                 "FILTER_SOURCE_FILES",
+                 "If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using \n"
+                 "INPUT_FILTER) will be used to filter the input files when producing source \n"
+                 "files to browse (i.e. when SOURCE_BROWSER is set to YES).",
+                 FALSE
+                );
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Source Browser","configuration options related to source browsing");
+  //---------------------------------------------------------------------------
+
+  //----
+  cb = cfg->addBool(
+                 "SOURCE_BROWSER",
+                 "If the SOURCE_BROWSER tag is set to YES then a list of source files will \n"
+                 "be generated. Documented entities will be cross-referenced with these sources. \n"
+                 "Note: To get rid of all source code in the generated output, make sure also \n"
+                 "VERBATIM_HEADERS is set to NO.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "INLINE_SOURCES",
+                 "Setting the INLINE_SOURCES tag to YES will include the body \n"
+                 "of functions and classes directly in the documentation.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "STRIP_CODE_COMMENTS",
+                 "Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct \n"
+                 "doxygen to hide any special comment blocks from generated source code \n"
+                 "fragments. Normal C and C++ comments will always remain visible.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "REFERENCED_BY_RELATION",
+                 "If the REFERENCED_BY_RELATION tag is set to YES \n"
+                 "then for each documented function all documented \n"
+                 "functions referencing it will be listed.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "REFERENCES_RELATION",
+                 "If the REFERENCES_RELATION tag is set to YES \n"
+                 "then for each documented function all documented entities \n"
+                 "called/used by that function will be listed.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "REFERENCES_LINK_SOURCE",
+                 "If the REFERENCES_LINK_SOURCE tag is set to YES (the default) \n"
+                 "and SOURCE_BROWSER tag is set to YES, then the hyperlinks from \n"
+                 "functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will \n"
+                 "link to the source code. \n"
+                 "Otherwise they will link to the documentation.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "USE_HTAGS",
+                 "If the USE_HTAGS tag is set to YES then the references to source code \n"
+                 "will point to the HTML generated by the htags(1) tool instead of doxygen \n"
+                 "built-in source browser. The htags tool is part of GNU's global source \n"
+                 "tagging system (see http://www.gnu.org/software/global/global.html). You \n"
+                 "will need version 4.8.6 or higher.",
+                 FALSE
+                );
   cb->addDependency("SOURCE_BROWSER");
   //----
   cb = cfg->addBool(
-                    "VERBATIM_HEADERS",
-                    "If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen \n"
-                    "will generate a verbatim copy of the header file for each class for \n"
-                    "which an include is specified. Set to NO to disable this. \n",
-                    TRUE
-              );
-  
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Index","configuration options related to the alphabetical class index");
-  //-----------------------------------------------------------------------------------------------
-  
-  cb = cfg->addBool(
-                    "ALPHABETICAL_INDEX",
-                    "If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index \n"
-                    "of all compounds will be generated. Enable this if the project \n"
-                    "contains a lot of classes, structs, unions or interfaces. \n",
-                    FALSE
-                 );
+                 "VERBATIM_HEADERS",
+                 "If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen \n"
+                 "will generate a verbatim copy of the header file for each class for \n"
+                 "which an include is specified. Set to NO to disable this.",
+                 TRUE
+                );
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Index","configuration options related to the alphabetical class index");
+  //---------------------------------------------------------------------------
+
+  //----
+  cb = cfg->addBool(
+                 "ALPHABETICAL_INDEX",
+                 "If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index \n"
+                 "of all compounds will be generated. Enable this if the project \n"
+                 "contains a lot of classes, structs, unions or interfaces.",
+                 FALSE
+                );
   //----
   ci = cfg->addInt(
-                    "COLS_IN_ALPHA_INDEX",
-                    "If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then \n"
-                    "the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns \n"
-                    "in which this list will be split (can be a number in the range [1..20]) \n",
-                    1,20,5
+                 "COLS_IN_ALPHA_INDEX",
+                 "If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then \n"
+                 "the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns \n"
+                 "in which this list will be split (can be a number in the range [1..20])",
+                 1,20,5
                 );
   //----
   cl = cfg->addList(
-                    "IGNORE_PREFIX",
-                    "In case all classes in a project start with a common prefix, all \n"
-                    "classes will be put under the same header in the alphabetical index. \n"
-                    "The IGNORE_PREFIX tag can be used to specify one or more prefixes that \n"
-                    "should be ignored while generating the index headers. \n"
-                 );
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "HTML","configuration options related to the HTML output");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(
-                    "GENERATE_HTML",
-                    "If the GENERATE_HTML tag is set to YES (the default) Doxygen will \n"
-                    "generate HTML output. \n",
-                    TRUE
-                 );
+                 "IGNORE_PREFIX",
+                 "In case all classes in a project start with a common prefix, all \n"
+                 "classes will be put under the same header in the alphabetical index. \n"
+                 "The IGNORE_PREFIX tag can be used to specify one or more prefixes that \n"
+                 "should be ignored while generating the index headers."
+                );
+  //---------------------------------------------------------------------------
+  cfg->addInfo("HTML","configuration options related to the HTML output");
+  //---------------------------------------------------------------------------
+
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_HTML",
+                 "If the GENERATE_HTML tag is set to YES (the default) Doxygen will \n"
+                 "generate HTML output.",
+                 TRUE
+                );
   //----
   cs = cfg->addString(
-                    "HTML_OUTPUT",
-                    "The HTML_OUTPUT tag is used to specify where the HTML docs will be put. \n"
-                    "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
-                    "put in front of it. If left blank `html' will be used as the default path. \n"
-                   );
+                 "HTML_OUTPUT",
+                 "The HTML_OUTPUT tag is used to specify where the HTML docs will be put. \n"
+                 "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
+                 "put in front of it. If left blank `html' will be used as the default path."
+                );
   cs->setDefaultValue("html");
   cs->setWidgetType(ConfigString::Dir);
   cs->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "HTML_FILE_EXTENSION",
-                    "The HTML_FILE_EXTENSION tag can be used to specify the file extension for \n"
-                    "each generated HTML page (for example: .htm,.php,.asp). If it is left blank \n"
-                    "doxygen will generate files with .html extension.\n"
-                   );
+                 "HTML_FILE_EXTENSION",
+                 "The HTML_FILE_EXTENSION tag can be used to specify the file extension for \n"
+                 "each generated HTML page (for example: .htm,.php,.asp). If it is left blank \n"
+                 "doxygen will generate files with .html extension."
+                );
   cs->setDefaultValue(".html");
   cs->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "HTML_HEADER",
-                    "The HTML_HEADER tag can be used to specify a personal HTML header for \n"
-                    "each generated HTML page. If it is left blank doxygen will generate a \n"
-                    "standard header.\n"
-                   );
+                 "HTML_HEADER",
+                 "The HTML_HEADER tag can be used to specify a personal HTML header for \n"
+                 "each generated HTML page. If it is left blank doxygen will generate a \n"
+                 "standard header."
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "HTML_FOOTER",
-                    "The HTML_FOOTER tag can be used to specify a personal HTML footer for \n"
-                    "each generated HTML page. If it is left blank doxygen will generate a \n"
-                    "standard footer.\n"
-                   );
+                 "HTML_FOOTER",
+                 "The HTML_FOOTER tag can be used to specify a personal HTML footer for \n"
+                 "each generated HTML page. If it is left blank doxygen will generate a \n"
+                 "standard footer."
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "HTML_STYLESHEET",
-                    "The HTML_STYLESHEET tag can be used to specify a user-defined cascading \n"
-                    "style sheet that is used by each HTML page. It can be used to \n"
-                    "fine-tune the look of the HTML output. If the tag is left blank doxygen \n"
-                    "will generate a default style sheet. Note that doxygen will try to copy \n"
-		    "the style sheet file to the HTML output directory, so don't put your own \n"
-		    "stylesheet in the HTML output directory as well, or it will be erased! \n"
-                   );
+                 "HTML_STYLESHEET",
+                 "The HTML_STYLESHEET tag can be used to specify a user-defined cascading \n"
+                 "style sheet that is used by each HTML page. It can be used to \n"
+                 "fine-tune the look of the HTML output. If the tag is left blank doxygen \n"
+                 "will generate a default style sheet. Note that doxygen will try to copy \n"
+                 "the style sheet file to the HTML output directory, so don't put your own \n"
+                 "stylesheet in the HTML output directory as well, or it will be erased!"
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
-  cb = cfg->addBool( 
-                    "HTML_ALIGN_MEMBERS",
-                    "If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, \n"
-                    "files or namespaces will be aligned in HTML using tables. If set to \n"
-                    "NO a bullet list will be used. \n",
-                    TRUE
-                 );
+  cb = cfg->addBool(
+                 "HTML_ALIGN_MEMBERS",
+                 "If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, \n"
+                 "files or namespaces will be aligned in HTML using tables. If set to \n"
+                 "NO a bullet list will be used.",
+                 TRUE
+                );
   cb->addDependency("GENERATE_HTML");
   //----
   cb = cfg->addBool(
-                    "HTML_DYNAMIC_SECTIONS",
-                    "If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML \n"
-		    "documentation will contain sections that can be hidden and shown after the \n"
-		    "page has loaded. For this to work a browser that supports \n"
-                    "JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox \n"
-		    "Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). \n",
-                    FALSE
-                 );
+                 "HTML_DYNAMIC_SECTIONS",
+                 "If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML \n"
+                 "documentation will contain sections that can be hidden and shown after the \n"
+                 "page has loaded. For this to work a browser that supports \n"
+                 "JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox \n"
+                 "Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).",
+                 FALSE
+                );
   cb->addDependency("GENERATE_HTML");
-
-  /////////////////////////////////////////////////////////
-  // Docsets //////////////////////////////////////////////
-  /////////////////////////////////////////////////////////
-
-  cb = cfg->addBool( "GENERATE_DOCSET",
-                    "If the GENERATE_DOCSET tag is set to YES, additional index files \n"
-                    "will be generated that can be used as input for Apple's Xcode 3 \n"
-                    "integrated development environment, introduced with OSX 10.5 (Leopard). \n"
-		    "To create a documentation set, doxygen will generate a Makefile in the \n"
-		    "HTML output directory. Running make will produce the docset in that \n"
-		    "directory and running \"make install\" will install the docset in \n"
-		    "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find \n"
-		    "it at startup. \n"
-		    "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html "
-		    "for more information. \n",
-                    FALSE
-                 );
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_DOCSET",
+                 "If the GENERATE_DOCSET tag is set to YES, additional index files \n"
+                 "will be generated that can be used as input for Apple's Xcode 3 \n"
+                 "integrated development environment, introduced with OSX 10.5 (Leopard). \n"
+                 "To create a documentation set, doxygen will generate a Makefile in the \n"
+                 "HTML output directory. Running make will produce the docset in that \n"
+                 "directory and running \"make install\" will install the docset in \n"
+                 "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find \n"
+                 "it at startup. \n"
+                 "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "DOCSET_FEEDNAME",
-                    "When GENERATE_DOCSET tag is set to YES, this tag determines the name of the \n"
-                    "feed. A documentation feed provides an umbrella under which multiple \n"
-		    "documentation sets from a single provider (such as a company or product suite) \n"
-		    "can be grouped. \n"
+                 "DOCSET_FEEDNAME",
+                 "When GENERATE_DOCSET tag is set to YES, this tag determines the name of the \n"
+                 "feed. A documentation feed provides an umbrella under which multiple \n"
+                 "documentation sets from a single provider (such as a company or product suite) \n"
+                 "can be grouped."
                 );
   cs->setDefaultValue("Doxygen generated docs");
   cs->addDependency("GENERATE_DOCSET");
   //----
   cs = cfg->addString(
-                    "DOCSET_BUNDLE_ID",
-                    "When GENERATE_DOCSET tag is set to YES, this tag specifies a string that \n"
-		    "should uniquely identify the documentation set bundle. This should be a \n"
-		    "reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen \n"
-		    "will append .docset to the name. \n"
-		);
+                 "DOCSET_BUNDLE_ID",
+                 "When GENERATE_DOCSET tag is set to YES, this tag specifies a string that \n"
+                 "should uniquely identify the documentation set bundle. This should be a \n"
+                 "reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen \n"
+                 "will append .docset to the name."
+                );
   cs->setDefaultValue("org.doxygen.Project");
   cs->addDependency("GENERATE_DOCSET");
-
-  /////////////////////////////////////////////////////////
-  // HTMLHELP /////////////////////////////////////////////
-  /////////////////////////////////////////////////////////
-
+  //----
   cb = cfg->addBool(
-                    "GENERATE_HTMLHELP",
-                    "If the GENERATE_HTMLHELP tag is set to YES, additional index files \n"
-                    "will be generated that can be used as input for tools like the \n"
-                    "Microsoft HTML help workshop to generate a compiled HTML help file (.chm) \n"
-                    "of the generated HTML documentation. \n",
-                    FALSE
-                 );
+                 "GENERATE_HTMLHELP",
+                 "If the GENERATE_HTMLHELP tag is set to YES, additional index files \n"
+                 "will be generated that can be used as input for tools like the \n"
+                 "Microsoft HTML help workshop to generate a compiled HTML help file (.chm) \n"
+                 "of the generated HTML documentation.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "CHM_FILE",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can \n"
-                    "be used to specify the file name of the resulting .chm file. You \n"
-		    "can add a path in front of the file if the result should not be \n"
-		    "written to the html output directory. \n"
-                   );
+                 "CHM_FILE",
+                 "If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can \n"
+                 "be used to specify the file name of the resulting .chm file. You \n"
+                 "can add a path in front of the file if the result should not be \n"
+                 "written to the html output directory."
+                );
   cs->setWidgetType(ConfigString::File);
-  cs->addDependency("GENERATE_HTML");
+  cs->addDependency("GENERATE_HTMLHELP");
   //----
   cs = cfg->addString(
-                    "HHC_LOCATION",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can \n"
-                    "be used to specify the location (absolute path including file name) of \n"
-		    "the HTML help compiler (hhc.exe). If non-empty doxygen will try to run \n"
-		    "the HTML help compiler on the generated index.hhp.\n"
-                   );
+                 "HHC_LOCATION",
+                 "If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can \n"
+                 "be used to specify the location (absolute path including file name) of \n"
+                 "the HTML help compiler (hhc.exe). If non-empty doxygen will try to run \n"
+                 "the HTML help compiler on the generated index.hhp."
+                );
   cs->setWidgetType(ConfigString::File);
-  cs->addDependency("GENERATE_HTML");
-  //----
-  cfg->addObsolete("QTHELP_FILE");
-  //----
-  cfg->addObsolete("QTHELP_CONFIG");
-  //----
-  cfg->addObsolete("DOXYGEN2QTHELP_LOC");
+  cs->addDependency("GENERATE_HTMLHELP");
   //----
   cb = cfg->addBool(
-                    "GENERATE_CHI",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n"
-                    "controls if a separate .chi index file is generated (YES) or that \n"
-                    "it should be included in the master .chm file (NO).\n",
-                    FALSE
-                 );
-  cb->addDependency("GENERATE_HTML");
+                 "GENERATE_CHI",
+                 "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n"
+                 "controls if a separate .chi index file is generated (YES) or that \n"
+                 "it should be included in the master .chm file (NO).",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTMLHELP");
   //----
   cs = cfg->addString(
-                    "CHM_INDEX_ENCODING",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING\n"
-                    "is used to encode HtmlHelp index (hhk), content (hhc) and project file\n"
-                    "content.\n" 
-                 );
-  cs->addDependency("GENERATE_HTML");
+                 "CHM_INDEX_ENCODING",
+                 "If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING \n"
+                 "is used to encode HtmlHelp index (hhk), content (hhc) and project file \n"
+                 "content."
+                );
+  cs->addDependency("GENERATE_HTMLHELP");
   //----
   cb = cfg->addBool(
-                    "BINARY_TOC",
-                    "If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag \n"
-                    "controls whether a binary table of contents is generated (YES) or a \n"
-                    "normal table of contents (NO) in the .chm file.\n",
-                    FALSE
-                 );
-  cb->addDependency("GENERATE_HTML");
+                 "BINARY_TOC",
+                 "If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag \n"
+                 "controls whether a binary table of contents is generated (YES) or a \n"
+                 "normal table of contents (NO) in the .chm file.",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTMLHELP");
   //----
   cb = cfg->addBool(
-                    "TOC_EXPAND",
-                    "The TOC_EXPAND flag can be set to YES to add extra items for group members \n"
-                    "to the contents of the HTML help documentation and to the tree view. \n",
-                    FALSE
-                 );
-  cb->addDependency("GENERATE_HTML");
-
-  /////////////////////////////////////////////////////////
-  // QT HELP //////////////////////////////////////////////
-  /////////////////////////////////////////////////////////
-
+                 "TOC_EXPAND",
+                 "The TOC_EXPAND flag can be set to YES to add extra items for group members \n"
+                 "to the contents of the HTML help documentation and to the tree view.",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTMLHELP");
+  //----
   cb = cfg->addBool(
-                    "GENERATE_QHP",
-                    "If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER \n"
-                    "are set, an additional index file will be generated that can be used as input for \n"
-                    "Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated \n"
-                    "HTML documentation. \n",
-                    FALSE
-                 );
+                 "GENERATE_QHP",
+                 "If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER \n"
+                 "are set, an additional index file will be generated that can be used as input for \n"
+                 "Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated \n"
+                 "HTML documentation.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_HTML");
   //----
   cs = cfg->addString(
-                    "QCH_FILE",
-                    "If the QHG_LOCATION tag is specified, the QCH_FILE tag can \n"
-                    "be used to specify the file name of the resulting .qch file. \n"
-                    "The path specified is relative to the HTML output folder. \n"
-                   );
+                 "QCH_FILE",
+                 "If the QHG_LOCATION tag is specified, the QCH_FILE tag can \n"
+                 "be used to specify the file name of the resulting .qch file. \n"
+                 "The path specified is relative to the HTML output folder."
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_QHP");
   //----
   cs = cfg->addString(
-                    "QHP_NAMESPACE",
-                    "The QHP_NAMESPACE tag specifies the namespace to use when generating \n"
-                    "Qt Help Project output. For more information please see \n"
-                    "http://doc.trolltech.com/qthelpproject.html#namespace \n"
-                   );
+                 "QHP_NAMESPACE",
+                 "The QHP_NAMESPACE tag specifies the namespace to use when generating \n"
+                 "Qt Help Project output. For more information please see \n"
+                 "http://doc.trolltech.com/qthelpproject.html#namespace"
+                );
   cs->addDependency("GENERATE_QHP");
   //----
   cs = cfg->addString(
-                    "QHP_VIRTUAL_FOLDER",
-                    "The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n"
-                    "Qt Help Project output. For more information please see \n"
-                    "http://doc.trolltech.com/qthelpproject.html#virtual-folders \n"
-                   );
+                 "QHP_VIRTUAL_FOLDER",
+                 "The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n"
+                 "Qt Help Project output. For more information please see \n"
+                 "http://doc.trolltech.com/qthelpproject.html#virtual-folders"
+                );
   cs->setDefaultValue("doc");
   cs->addDependency("GENERATE_QHP");
   //----
-
   cs = cfg->addString(
-                    "QHP_CUST_FILTER_NAME",
-                    "If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. \n"
-                    "For more information please see \n"
-                    "http://doc.trolltech.com/qthelpproject.html#custom-filters \n"
-                   );
+                 "QHP_CUST_FILTER_NAME",
+                 "If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. \n"
+                 "For more information please see \n"
+                 "http://doc.trolltech.com/qthelpproject.html#custom-filters"
+                );
   cs->addDependency("GENERATE_QHP");
   //----
-
   cs = cfg->addString(
-                    "QHP_CUST_FILTER_ATTRS",
-                    "The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add."
-                    "For more information please see \n"
-                    "<a href=\"http://doc.trolltech.com/qthelpproject.html#custom-filters\">Qt Help Project / Custom Filters</a>. \n"
-                   );
+                 "QHP_CUST_FILTER_ATTRS",
+                 "The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see \n"
+                 "<a href=\"http://doc.trolltech.com/qthelpproject.html#custom-filters\">Qt Help Project / Custom Filters</a>."
+                );
   cs->addDependency("GENERATE_QHP");
   //----
-
   cs = cfg->addString(
-                    "QHP_SECT_FILTER_ATTRS",
-                    "The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n"
-                    "filter section matches. \n"
-                    "<a href=\"http://doc.trolltech.com/qthelpproject.html#filter-attributes\">Qt Help Project / Filter Attributes</a>. \n"
-                   );
+                 "QHP_SECT_FILTER_ATTRS",
+                 "The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n"
+                 "filter section matches. \n"
+                 "<a href=\"http://doc.trolltech.com/qthelpproject.html#filter-attributes\">Qt Help Project / Filter Attributes</a>."
+                );
   cs->addDependency("GENERATE_QHP");
   //----
-
   cs = cfg->addString(
-                    "QHG_LOCATION",
-                    "If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can \n"
-                    "be used to specify the location of Qt's qhelpgenerator. \n"
-                    "If non-empty doxygen will try to run qhelpgenerator on the generated \n"
-                    ".qhp file .\n"
-                   );
+                 "QHG_LOCATION",
+                 "If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can \n"
+                 "be used to specify the location of Qt's qhelpgenerator. \n"
+                 "If non-empty doxygen will try to run qhelpgenerator on the generated \n"
+                 ".qhp file."
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_QHP");
-
-  /////////////////////////////////////////////////////////
-  // MISC /////////////////////////////////////////////////
-  /////////////////////////////////////////////////////////
-
+  //----
   cb = cfg->addBool(
-                    "DISABLE_INDEX",
-                    "The DISABLE_INDEX tag can be used to turn on/off the condensed index at \n"
-                    "top of each HTML page. The value NO (the default) enables the index and \n"
-                    "the value YES disables it. \n",
-                    FALSE
-                 );
+                 "DISABLE_INDEX",
+                 "The DISABLE_INDEX tag can be used to turn on/off the condensed index at \n"
+                 "top of each HTML page. The value NO (the default) enables the index and \n"
+                 "the value YES disables it.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_HTML");
   //----
   ci = cfg->addInt(
-                    "ENUM_VALUES_PER_LINE",
-                    "This tag can be used to set the number of enum values (range [1..20]) \n"
-                    "that doxygen will group on one line in the generated HTML documentation. \n",
-                    1,20,4
+                 "ENUM_VALUES_PER_LINE",
+                 "This tag can be used to set the number of enum values (range [1..20]) \n"
+                 "that doxygen will group on one line in the generated HTML documentation.",
+                 1,20,4
                 );
   ci->addDependency("GENERATE_HTML");
   //----
   ce = cfg->addEnum(
-                    "GENERATE_TREEVIEW",
-                    "The GENERATE_TREEVIEW tag is used to specify whether a tree-like index\n"
-                    "structure should be generated to display hierarchical information.\n"
-                    "If the tag value is set to FRAME, a side panel will be generated\n"
-                    "containing a tree-like index structure (just like the one that \n"
-                    "is generated for HTML Help). For this to work a browser that supports \n"
-                    "JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, \n"
-		    "Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are \n"
-		    "probably better off using the HTML help feature. Other possible values \n"
-		    "for this tag are: HIERARCHIES, which will generate the Groups, Directories,\n"
-                    "and Class Hierarchy pages using a tree view instead of an ordered list;\n"
-                    "ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which\n"
-                    "disables this behavior completely. For backwards compatibility with previous\n"
-                    "releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE\n"
-                    "respectively.\n",
-                    "NONE"
-                 );
+                 "GENERATE_TREEVIEW",
+                 "The GENERATE_TREEVIEW tag is used to specify whether a tree-like index \n"
+                 "structure should be generated to display hierarchical information. \n"
+                 "If the tag value is set to FRAME, a side panel will be generated \n"
+                 "containing a tree-like index structure (just like the one that \n"
+                 "is generated for HTML Help). For this to work a browser that supports \n"
+                 "JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, \n"
+                 "Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are \n"
+                 "probably better off using the HTML help feature. Other possible values \n"
+                 "for this tag are: HIERARCHIES, which will generate the Groups, Directories, \n"
+                 "and Class Hierarchy pages using a tree view instead of an ordered list; \n"
+                 "ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which \n"
+                 "disables this behavior completely. For backwards compatibility with previous \n"
+                 "releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE \n"
+                 "respectively.",
+                 "NONE"
+                );
   ce->addValue("NONE");
   ce->addValue("FRAME");
   ce->addValue("HIERARCHIES");
@@ -1389,90 +1312,81 @@ void addConfigOptions(Config *cfg)
   ce->addDependency("GENERATE_HTML");
   //----
   ci = cfg->addInt(
-                    "TREEVIEW_WIDTH",
-                    "If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be \n"
-                    "used to set the initial width (in pixels) of the frame in which the tree \n"
-                    "is shown. \n",
-                    0,1500,250
-                 );
+                 "TREEVIEW_WIDTH",
+                 "If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be \n"
+                 "used to set the initial width (in pixels) of the frame in which the tree \n"
+                 "is shown.",
+                 0,1500,250
+                );
   ci->addDependency("GENERATE_HTML");
   //----
   ci = cfg->addInt(
-                    "FORMULA_FONTSIZE",
-                    "Use this tag to change the font size of Latex formulas included \n"
-                    "as images in the HTML documentation. The default is 10. Note that \n"
-		    "when you change the font size after a successful doxygen run you need \n"
-		    "to manually remove any form_*.png images from the HTML output directory \n"
-		    "to force them to be regenerated. \n",
-                    8,50,10
-                 );
+                 "FORMULA_FONTSIZE",
+                 "Use this tag to change the font size of Latex formulas included \n"
+                 "as images in the HTML documentation. The default is 10. Note that \n"
+                 "when you change the font size after a successful doxygen run you need \n"
+                 "to manually remove any form_*.png images from the HTML output directory \n"
+                 "to force them to be regenerated.",
+                 8,50,10
+                );
   ci->addDependency("GENERATE_HTML");
+  //---------------------------------------------------------------------------
+  cfg->addInfo("LaTeX","configuration options related to the LaTeX output");
+  //---------------------------------------------------------------------------
 
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "LaTeX","configuration options related to the LaTeX output");
-  //-----------------------------------------------------------------------------------------------
+  //----
   cb = cfg->addBool(
-                    "GENERATE_LATEX",
-                    "If the GENERATE_LATEX tag is set to YES (the default) Doxygen will \n"
-                    "generate Latex output. \n",
-                    TRUE
-                 );
+                 "GENERATE_LATEX",
+                 "If the GENERATE_LATEX tag is set to YES (the default) Doxygen will \n"
+                 "generate Latex output.",
+                 TRUE
+                );
   //----
   cs = cfg->addString(
-                    "LATEX_OUTPUT",
-                    "The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. \n"
-                    "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
-                    "put in front of it. If left blank `latex' will be used as the default path. \n"
-                   );
+                 "LATEX_OUTPUT",
+                 "The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. \n"
+                 "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
+                 "put in front of it. If left blank `latex' will be used as the default path."
+                );
   cs->setDefaultValue("latex");
   cs->setWidgetType(ConfigString::Dir);
   cs->addDependency("GENERATE_LATEX");
   //----
-#if 0
-  cs = cfg->addString(   "LATEX_OUTPUT_ENCODING",
-                    "The LATEX_OUTPUT_ENCODING specifies the character encoding of the LaTeX output.\n"
-                    "produced by doxygen. If left blank ISO-8859-1 will be used. Doxygen uses \n"
-		    "libiconv for the transcoding. See http://www.gnu.org/software/libiconv for \n"
-		    "the list of possible encodings.\n"
-                );
-  cs->setDefaultValue("ISO-8859-1");
-  cs->addDependency("GENERATE_LATEX");
-#endif
   cs = cfg->addString(
-                    "LATEX_CMD_NAME",
-                    "The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be \n"
-                    "invoked. If left blank `latex' will be used as the default command name. \n"
-                   );
+                 "LATEX_CMD_NAME",
+                 "The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be \n"
+                 "invoked. If left blank `latex' will be used as the default command name."
+                );
   cs->setDefaultValue("latex");
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_LATEX");
   //----
   cs = cfg->addString(
-                    "MAKEINDEX_CMD_NAME",
-                    "The MAKEINDEX_CMD_NAME tag can be used to specify the command name to \n"
-		    "generate index for LaTeX. If left blank `makeindex' will be used as the \n"
-		    "default command name. \n"
-                   );
+                 "MAKEINDEX_CMD_NAME",
+                 "The MAKEINDEX_CMD_NAME tag can be used to specify the command name to \n"
+                 "generate index for LaTeX. If left blank `makeindex' will be used as the \n"
+                 "default command name."
+                );
   cs->setDefaultValue("makeindex");
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_LATEX");
   //----
   cb = cfg->addBool(
-                    "COMPACT_LATEX",
-                    "If the COMPACT_LATEX tag is set to YES Doxygen generates more compact \n"
-                    "LaTeX documents. This may be useful for small projects and may help to \n"
-                    "save some trees in general. \n",
-                    FALSE
-                 );
+                 "COMPACT_LATEX",
+                 "If the COMPACT_LATEX tag is set to YES Doxygen generates more compact \n"
+                 "LaTeX documents. This may be useful for small projects and may help to \n"
+                 "save some trees in general.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_LATEX");
   //----
   ce = cfg->addEnum(
-                    "PAPER_TYPE",
-                    "The PAPER_TYPE tag can be used to set the paper type that is used \n"
-                    "by the printer. Possible values are: a4, a4wide, letter, legal and \n"
-                    "executive. If left blank a4wide will be used. \n",
-                    "a4wide"
-                   );
+                 "PAPER_TYPE",
+                 "The PAPER_TYPE tag can be used to set the paper type that is used \n"
+                 "by the printer. Possible values are: a4, a4wide, letter, legal and \n"
+                 "executive. If left blank a4wide will be used.",
+                 "a4wide"
+                );
   ce->addValue("a4");
   ce->addValue("a4wide");
   ce->addValue("letter");
@@ -1481,686 +1395,708 @@ void addConfigOptions(Config *cfg)
   ce->addDependency("GENERATE_LATEX");
   //----
   cl = cfg->addList(
-                    "EXTRA_PACKAGES",
-                    "The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX \n"
-                    "packages that should be included in the LaTeX output. \n"
-                 );
+                 "EXTRA_PACKAGES",
+                 "The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX \n"
+                 "packages that should be included in the LaTeX output."
+                );
   cl->addDependency("GENERATE_LATEX");
   //----
   cs = cfg->addString(
-                    "LATEX_HEADER",
-                    "The LATEX_HEADER tag can be used to specify a personal LaTeX header for \n"
-                    "the generated latex document. The header should contain everything until \n"
-                    "the first chapter. If it is left blank doxygen will generate a \n"
-                    "standard header. Notice: only use this tag if you know what you are doing! \n"
-                 );
+                 "LATEX_HEADER",
+                 "The LATEX_HEADER tag can be used to specify a personal LaTeX header for \n"
+                 "the generated latex document. The header should contain everything until \n"
+                 "the first chapter. If it is left blank doxygen will generate a \n"
+                 "standard header. Notice: only use this tag if you know what you are doing!"
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_LATEX");
   //----
   cb = cfg->addBool(
-                    "PDF_HYPERLINKS",
-                    "If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated \n"
-                    "is prepared for conversion to pdf (using ps2pdf). The pdf file will \n"
-                    "contain links (just like the HTML output) instead of page references \n"
-                    "This makes the output suitable for online browsing using a pdf viewer. \n",
-                    TRUE
-                 );
+                 "PDF_HYPERLINKS",
+                 "If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated \n"
+                 "is prepared for conversion to pdf (using ps2pdf). The pdf file will \n"
+                 "contain links (just like the HTML output) instead of page references \n"
+                 "This makes the output suitable for online browsing using a pdf viewer.",
+                 TRUE
+                );
   cb->addDependency("GENERATE_LATEX");
   //----
   cb = cfg->addBool(
-                    "USE_PDFLATEX",
-                    "If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of \n"
-                    "plain latex in the generated Makefile. Set this option to YES to get a \n"
-                    "higher quality PDF documentation. \n",
-                    TRUE
-                 );   
+                 "USE_PDFLATEX",
+                 "If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of \n"
+                 "plain latex in the generated Makefile. Set this option to YES to get a \n"
+                 "higher quality PDF documentation.",
+                 TRUE
+                );
   cb->addDependency("GENERATE_LATEX");
   //----
   cb = cfg->addBool(
-                    "LATEX_BATCHMODE",
-                    "If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\\\batchmode. \n"
-                    "command to the generated LaTeX files. This will instruct LaTeX to keep \n"
-                    "running if errors occur, instead of asking the user for help. \n"
-                    "This option is also used when generating formulas in HTML. \n",
-                    FALSE
-                 );
+                 "LATEX_BATCHMODE",
+                 "If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\\\batchmode. \n"
+                 "command to the generated LaTeX files. This will instruct LaTeX to keep \n"
+                 "running if errors occur, instead of asking the user for help. \n"
+                 "This option is also used when generating formulas in HTML.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_LATEX");
   //----
   cb = cfg->addBool(
-                    "LATEX_HIDE_INDICES",
-                    "If LATEX_HIDE_INDICES is set to YES then doxygen will not \n"
-                    "include the index chapters (such as File Index, Compound Index, etc.) \n"
-                    "in the output. \n",
-                    FALSE
-                 );
+                 "LATEX_HIDE_INDICES",
+                 "If LATEX_HIDE_INDICES is set to YES then doxygen will not \n"
+                 "include the index chapters (such as File Index, Compound Index, etc.) \n"
+                 "in the output.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_LATEX");
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "RTF","configuration options related to the RTF output");
-  //-----------------------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  cfg->addInfo("RTF","configuration options related to the RTF output");
+  //---------------------------------------------------------------------------
+
+  //----
   cb = cfg->addBool(
-                    "GENERATE_RTF",
-                    "If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output \n"
-                    "The RTF output is optimized for Word 97 and may not look very pretty with \n"
-                    "other RTF readers or editors.\n",
-                    FALSE
-                 );
+                 "GENERATE_RTF",
+                 "If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output \n"
+                 "The RTF output is optimized for Word 97 and may not look very pretty with \n"
+                 "other RTF readers or editors.",
+                 FALSE
+                );
   //----
   cs = cfg->addString(
-                    "RTF_OUTPUT",
-                    "The RTF_OUTPUT tag is used to specify where the RTF docs will be put. \n"
-                    "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
-                    "put in front of it. If left blank `rtf' will be used as the default path. \n"
-                 );
+                 "RTF_OUTPUT",
+                 "The RTF_OUTPUT tag is used to specify where the RTF docs will be put. \n"
+                 "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
+                 "put in front of it. If left blank `rtf' will be used as the default path."
+                );
   cs->setDefaultValue("rtf");
   cs->setWidgetType(ConfigString::Dir);
   cs->addDependency("GENERATE_RTF");
   //----
-#if 0
-  cs = cfg->addString(   "RTF_OUTPUT_ENCODING",
-                    "The RTF_OUTPUT_ENCODING specifies the character encoding of the RTF output.\n"
-                    "produced by doxygen. If left blank ISO-8859-1 will be used. Doxygen uses \n"
-		    "libiconv for the transcoding. See http://www.gnu.org/software/libiconv for \n"
-		    "the list of possible encodings.\n"
+  cb = cfg->addBool(
+                 "COMPACT_RTF",
+                 "If the COMPACT_RTF tag is set to YES Doxygen generates more compact \n"
+                 "RTF documents. This may be useful for small projects and may help to \n"
+                 "save some trees in general.",
+                 FALSE
                 );
-  cs->setDefaultValue("ISO-8859-1");
-  cs->addDependency("GENERATE_RTF");
-#endif
-  cb = cfg->addBool(
-                    "COMPACT_RTF",
-                    "If the COMPACT_RTF tag is set to YES Doxygen generates more compact \n"
-                    "RTF documents. This may be useful for small projects and may help to \n"
-                    "save some trees in general. \n",
-                    FALSE
-                 );
   cb->addDependency("GENERATE_RTF");
   //----
   cb = cfg->addBool(
-                    "RTF_HYPERLINKS",
-                    "If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated \n"
-                    "will contain hyperlink fields. The RTF file will \n"
-                    "contain links (just like the HTML output) instead of page references. \n"
-                    "This makes the output suitable for online browsing using WORD or other \n"
-                    "programs which support those fields. \n"
-                    "Note: wordpad (write) and others do not support links. \n",
-                    FALSE
-                 );
+                 "RTF_HYPERLINKS",
+                 "If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated \n"
+                 "will contain hyperlink fields. The RTF file will \n"
+                 "contain links (just like the HTML output) instead of page references. \n"
+                 "This makes the output suitable for online browsing using WORD or other \n"
+                 "programs which support those fields. \n"
+                 "Note: wordpad (write) and others do not support links.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_RTF");
   //----
   cs = cfg->addString(
-                    "RTF_STYLESHEET_FILE",
-                    "Load stylesheet definitions from file. Syntax is similar to doxygen's \n"
-                    "config file, i.e. a series of assignments. You only have to provide \n"
-                    "replacements, missing definitions are set to their default value. \n"
-                   );
+                 "RTF_STYLESHEET_FILE",
+                 "Load stylesheet definitions from file. Syntax is similar to doxygen's \n"
+                 "config file, i.e. a series of assignments. You only have to provide \n"
+                 "replacements, missing definitions are set to their default value."
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_RTF");
   //----
   cs = cfg->addString(
-                    "RTF_EXTENSIONS_FILE",
-                    "Set optional variables used in the generation of an rtf document. \n"
-                    "Syntax is similar to doxygen's config file.\n"
-                );                  
+                 "RTF_EXTENSIONS_FILE",
+                 "Set optional variables used in the generation of an rtf document. \n"
+                 "Syntax is similar to doxygen's config file."
+                );
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_RTF");
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Man","configuration options related to the man page output");
+  //---------------------------------------------------------------------------
 
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Man","configuration options related to the man page output");
-  //-----------------------------------------------------------------------------------------------
+  //----
   cb = cfg->addBool(
-                    "GENERATE_MAN",
-                    "If the GENERATE_MAN tag is set to YES (the default) Doxygen will \n"
-                    "generate man pages \n",
-                    FALSE
-                   );
+                 "GENERATE_MAN",
+                 "If the GENERATE_MAN tag is set to YES (the default) Doxygen will \n"
+                 "generate man pages",
+                 FALSE
+                );
   //----
   cs = cfg->addString(
-                    "MAN_OUTPUT",
-                    "The MAN_OUTPUT tag is used to specify where the man pages will be put. \n"
-                    "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
-                    "put in front of it. If left blank `man' will be used as the default path. \n"
-                   );
+                 "MAN_OUTPUT",
+                 "The MAN_OUTPUT tag is used to specify where the man pages will be put. \n"
+                 "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
+                 "put in front of it. If left blank `man' will be used as the default path."
+                );
   cs->setDefaultValue("man");
   cs->setWidgetType(ConfigString::Dir);
   cs->addDependency("GENERATE_MAN");
   //----
   cs = cfg->addString(
-                    "MAN_EXTENSION",
-                    "The MAN_EXTENSION tag determines the extension that is added to \n"
-                    "the generated man pages (default is the subroutine's section .3) \n"
-                   );
+                 "MAN_EXTENSION",
+                 "The MAN_EXTENSION tag determines the extension that is added to \n"
+                 "the generated man pages (default is the subroutine's section .3)"
+                );
   cs->setDefaultValue(".3");
   cs->addDependency("GENERATE_MAN");
   //----
   cb = cfg->addBool(
-                    "MAN_LINKS",
-                    "If the MAN_LINKS tag is set to YES and Doxygen generates man output, \n"
-                    "then it will generate one additional man file for each entity \n"
-                    "documented in the real man page(s). These additional files \n"
-                    "only source the real man page, but without them the man command \n"
-                    "would be unable to find the correct page. The default is NO. \n",
-                    FALSE
-                   );
+                 "MAN_LINKS",
+                 "If the MAN_LINKS tag is set to YES and Doxygen generates man output, \n"
+                 "then it will generate one additional man file for each entity \n"
+                 "documented in the real man page(s). These additional files \n"
+                 "only source the real man page, but without them the man command \n"
+                 "would be unable to find the correct page. The default is NO.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_MAN");
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "XML","configuration options related to the XML output");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(  
-                    "GENERATE_XML",
-                    "If the GENERATE_XML tag is set to YES Doxygen will \n"
-                    "generate an XML file that captures the structure of \n"
-                    "the code including all documentation. \n",
-		    FALSE
-                 );
+  //---------------------------------------------------------------------------
+  cfg->addInfo("XML","configuration options related to the XML output");
+  //---------------------------------------------------------------------------
+
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_XML",
+                 "If the GENERATE_XML tag is set to YES Doxygen will \n"
+                 "generate an XML file that captures the structure of \n"
+                 "the code including all documentation.",
+                 FALSE
+                );
   //----
   cs = cfg->addString(
-                    "XML_OUTPUT",
-                    "The XML_OUTPUT tag is used to specify where the XML pages will be put. \n"
-                    "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
-                    "put in front of it. If left blank `xml' will be used as the default path. \n"
-                   );
+                 "XML_OUTPUT",
+                 "The XML_OUTPUT tag is used to specify where the XML pages will be put. \n"
+                 "If a relative path is entered the value of OUTPUT_DIRECTORY will be \n"
+                 "put in front of it. If left blank `xml' will be used as the default path."
+                );
   cs->setDefaultValue("xml");
   cs->setWidgetType(ConfigString::Dir);
   cs->addDependency("GENERATE_XML");
   //----
   cs = cfg->addString(
-                    "XML_SCHEMA",
-		    "The XML_SCHEMA tag can be used to specify an XML schema, \n"
-		    "which can be used by a validating XML parser to check the \n"
-		    "syntax of the XML files. \n"
-                 );
+                 "XML_SCHEMA",
+                 "The XML_SCHEMA tag can be used to specify an XML schema, \n"
+                 "which can be used by a validating XML parser to check the \n"
+                 "syntax of the XML files."
+                );
   cs->addDependency("GENERATE_XML");
   //----
   cs = cfg->addString(
-                    "XML_DTD",
-		    "The XML_DTD tag can be used to specify an XML DTD, \n"
-		    "which can be used by a validating XML parser to check the \n"
-		    "syntax of the XML files. \n"
-                 );
+                 "XML_DTD",
+                 "The XML_DTD tag can be used to specify an XML DTD, \n"
+                 "which can be used by a validating XML parser to check the \n"
+                 "syntax of the XML files."
+                );
   cs->addDependency("GENERATE_XML");
   //----
   cb = cfg->addBool(
-                    "XML_PROGRAMLISTING",
-                    "If the XML_PROGRAMLISTING tag is set to YES Doxygen will \n"
-                    "dump the program listings (including syntax highlighting \n"
-		    "and cross-referencing information) to the XML output. Note that \n"
-		    "enabling this will significantly increase the size of the XML output. \n",
-                    TRUE
-                 );
+                 "XML_PROGRAMLISTING",
+                 "If the XML_PROGRAMLISTING tag is set to YES Doxygen will \n"
+                 "dump the program listings (including syntax highlighting \n"
+                 "and cross-referencing information) to the XML output. Note that \n"
+                 "enabling this will significantly increase the size of the XML output.",
+                 TRUE
+                );
   cb->addDependency("GENERATE_XML");
+  //---------------------------------------------------------------------------
+  cfg->addInfo("DEF","configuration options for the AutoGen Definitions output");
+  //---------------------------------------------------------------------------
 
-  //--------------------------------------------------------------------------
-  cfg->addInfo(  "DEF","configuration options for the AutoGen Definitions output");
-  //--------------------------------------------------------------------------
-  cb = cfg->addBool(     "GENERATE_AUTOGEN_DEF",
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_AUTOGEN_DEF",
+                 "If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will \n"
+                 "generate an AutoGen Definitions (see autogen.sf.net) file \n"
+                 "that captures the structure of the code including all \n"
+                 "documentation. Note that this feature is still experimental \n"
+                 "and incomplete at the moment.",
+                 FALSE
+                );
+  //---------------------------------------------------------------------------
+  cfg->addInfo("PerlMod","configuration options related to the Perl module output");
+  //---------------------------------------------------------------------------
 
-                    "If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will \n"
-                    "generate an AutoGen Definitions (see autogen.sf.net) file \n"
-	            "that captures the structure of the code including all \n"
-	            "documentation. Note that this feature is still experimental \n"
-	            "and incomplete at the moment. \n",
-                    FALSE );
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "PerlMod","configuration options related to the Perl module output");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(  
-                    "GENERATE_PERLMOD",
-                    "If the GENERATE_PERLMOD tag is set to YES Doxygen will \n"
-                    "generate a Perl module file that captures the structure of \n"
-                    "the code including all documentation. Note that this \n"
-		    "feature is still experimental and incomplete at the \n"
-		    "moment. \n",
-		    FALSE
-                 );
-  //----
-  cb = cfg->addBool(  
-                    "PERLMOD_LATEX",
-                    "If the PERLMOD_LATEX tag is set to YES Doxygen will generate \n"
-                    "the necessary Makefile rules, Perl scripts and LaTeX code to be able \n"
-		    "to generate PDF and DVI output from the Perl module output. \n",
-		    FALSE
-                 );
+  //----
+  cb = cfg->addBool(
+                 "GENERATE_PERLMOD",
+                 "If the GENERATE_PERLMOD tag is set to YES Doxygen will \n"
+                 "generate a Perl module file that captures the structure of \n"
+                 "the code including all documentation. Note that this \n"
+                 "feature is still experimental and incomplete at the \n"
+                 "moment.",
+                 FALSE
+                );
+  //----
+  cb = cfg->addBool(
+                 "PERLMOD_LATEX",
+                 "If the PERLMOD_LATEX tag is set to YES Doxygen will generate \n"
+                 "the necessary Makefile rules, Perl scripts and LaTeX code to be able \n"
+                 "to generate PDF and DVI output from the Perl module output.",
+                 FALSE
+                );
   cb->addDependency("GENERATE_PERLMOD");
   //----
-  cb = cfg->addBool(  
-                    "PERLMOD_PRETTY",
-                    "If the PERLMOD_PRETTY tag is set to YES the Perl module output will be \n"
-		    "nicely formatted so it can be parsed by a human reader.  This is useful \n"
-		    "if you want to understand what is going on.  On the other hand, if this \n"
-		    "tag is set to NO the size of the Perl module output will be much smaller \n"
-		    "and Perl will parse it just the same. \n",
-		    TRUE
-                 );
+  cb = cfg->addBool(
+                 "PERLMOD_PRETTY",
+                 "If the PERLMOD_PRETTY tag is set to YES the Perl module output will be \n"
+                 "nicely formatted so it can be parsed by a human reader. \n"
+                 "This is useful \n"
+                 "if you want to understand what is going on. \n"
+                 "On the other hand, if this \n"
+                 "tag is set to NO the size of the Perl module output will be much smaller \n"
+                 "and Perl will parse it just the same.",
+                 TRUE
+                );
   cb->addDependency("GENERATE_PERLMOD");
   //----
-  cs = cfg->addString(  
-                    "PERLMOD_MAKEVAR_PREFIX",
-                    "The names of the make variables in the generated doxyrules.make file \n"
-                    "are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. \n"
-		    "This is useful so different doxyrules.make files included by the same \n"
-		    "Makefile don't overwrite each other's variables."
-                 );
+  cs = cfg->addString(
+                 "PERLMOD_MAKEVAR_PREFIX",
+                 "The names of the make variables in the generated doxyrules.make file \n"
+                 "are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. \n"
+                 "This is useful so different doxyrules.make files included by the same \n"
+                 "Makefile don't overwrite each other's variables."
+                );
   cs->addDependency("GENERATE_PERLMOD");
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Preprocessor","Configuration options related to the preprocessor   ");
+  //---------------------------------------------------------------------------
 
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Preprocessor","Configuration options related to the preprocessor   ");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(
-                    "ENABLE_PREPROCESSING",
-                    "If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will \n"
-                    "evaluate all C-preprocessor directives found in the sources and include \n"
-                    "files. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "MACRO_EXPANSION",
-                    "If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro \n"
-                    "names in the source code. If set to NO (the default) only conditional \n"
-                    "compilation will be performed. Macro expansion can be done in a controlled \n"
-                    "way by setting EXPAND_ONLY_PREDEF to YES. \n",
-                    FALSE
-                 );
+  //----
+  cb = cfg->addBool(
+                 "ENABLE_PREPROCESSING",
+                 "If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will \n"
+                 "evaluate all C-preprocessor directives found in the sources and include \n"
+                 "files.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "MACRO_EXPANSION",
+                 "If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro \n"
+                 "names in the source code. If set to NO (the default) only conditional \n"
+                 "compilation will be performed. Macro expansion can be done in a controlled \n"
+                 "way by setting EXPAND_ONLY_PREDEF to YES.",
+                 FALSE
+                );
   cb->addDependency("ENABLE_PREPROCESSING");
   //----
   cb = cfg->addBool(
-                    "EXPAND_ONLY_PREDEF",
-                    "If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES \n"
-                    "then the macro expansion is limited to the macros specified with the \n"
-                    "PREDEFINED and EXPAND_AS_DEFINED tags. \n",
-                    FALSE
-                 );
+                 "EXPAND_ONLY_PREDEF",
+                 "If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES \n"
+                 "then the macro expansion is limited to the macros specified with the \n"
+                 "PREDEFINED and EXPAND_AS_DEFINED tags.",
+                 FALSE
+                );
   cb->addDependency("ENABLE_PREPROCESSING");
   //----
   cb = cfg->addBool(
-                    "SEARCH_INCLUDES",
-                    "If the SEARCH_INCLUDES tag is set to YES (the default) the includes files \n"
-                    "in the INCLUDE_PATH (see below) will be search if a #include is found. \n",
-                    TRUE
-                 );
+                 "SEARCH_INCLUDES",
+                 "If the SEARCH_INCLUDES tag is set to YES (the default) the includes files \n"
+                 "in the INCLUDE_PATH (see below) will be search if a #include is found.",
+                 TRUE
+                );
   cb->addDependency("ENABLE_PREPROCESSING");
   //----
   cl = cfg->addList(
-                    "INCLUDE_PATH",
-                    "The INCLUDE_PATH tag can be used to specify one or more directories that \n"
-                    "contain include files that are not input files but should be processed by \n"
-                    "the preprocessor.\n"
-                 );
-  cl->setWidgetType(ConfigList::Dir);
+                 "INCLUDE_PATH",
+                 "The INCLUDE_PATH tag can be used to specify one or more directories that \n"
+                 "contain include files that are not input files but should be processed by \n"
+                 "the preprocessor."
+                );
   cl->addDependency("ENABLE_PREPROCESSING");
+  cl->setWidgetType(ConfigList::Dir);
   //----
   cl = cfg->addList(
-                    "INCLUDE_FILE_PATTERNS",
-                    "You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard \n"
-                    "patterns (like *.h and *.hpp) to filter out the header-files in the \n"
-                    "directories. If left blank, the patterns specified with FILE_PATTERNS will \n"
-                    "be used. \n"
-                 );
+                 "INCLUDE_FILE_PATTERNS",
+                 "You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard \n"
+                 "patterns (like *.h and *.hpp) to filter out the header-files in the \n"
+                 "directories. If left blank, the patterns specified with FILE_PATTERNS will \n"
+                 "be used."
+                );
   cl->addDependency("ENABLE_PREPROCESSING");
   //----
   cl = cfg->addList(
-                    "PREDEFINED",
-                    "The PREDEFINED tag can be used to specify one or more macro names that \n"
-                    "are defined before the preprocessor is started (similar to the -D option of \n"
-                    "gcc). The argument of the tag is a list of macros of the form: name \n"
-                    "or name=definition (no spaces). If the definition and the = are \n"
-                    "omitted =1 is assumed. To prevent a macro definition from being \n"
-		    "undefined via #undef or recursively expanded use the := operator \n"
-		    "instead of the = operator.\n"
-                 );
+                 "PREDEFINED",
+                 "The PREDEFINED tag can be used to specify one or more macro names that \n"
+                 "are defined before the preprocessor is started (similar to the -D option of \n"
+                 "gcc). The argument of the tag is a list of macros of the form: name \n"
+                 "or name=definition (no spaces). If the definition and the = are \n"
+                 "omitted =1 is assumed. To prevent a macro definition from being \n"
+                 "undefined via #undef or recursively expanded use the := operator \n"
+                 "instead of the = operator."
+                );
   cl->addDependency("ENABLE_PREPROCESSING");
   //----
   cl = cfg->addList(
-                    "EXPAND_AS_DEFINED",
-                    "If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then \n"
-                    "this tag can be used to specify a list of macro names that should be expanded. \n"
-                    "The macro definition that is found in the sources will be used. \n"
-                    "Use the PREDEFINED tag if you want to use a different macro definition. \n" 
-                 );
+                 "EXPAND_AS_DEFINED",
+                 "If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then \n"
+                 "this tag can be used to specify a list of macro names that should be expanded. \n"
+                 "The macro definition that is found in the sources will be used. \n"
+                 "Use the PREDEFINED tag if you want to use a different macro definition."
+                );
   cl->addDependency("ENABLE_PREPROCESSING");
   //----
   cb = cfg->addBool(
-                    "SKIP_FUNCTION_MACROS",
-                    "If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then \n"
-		    "doxygen's preprocessor will remove all function-like macros that are alone \n"
-		    "on a line, have an all uppercase name, and do not end with a semicolon. Such \n"
-		    "function macros are typically used for boiler-plate code, and will confuse \n"
-		    "the parser if not removed. \n",
-                    TRUE
-                 );
+                 "SKIP_FUNCTION_MACROS",
+                 "If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then \n"
+                 "doxygen's preprocessor will remove all function-like macros that are alone \n"
+                 "on a line, have an all uppercase name, and do not end with a semicolon. Such \n"
+                 "function macros are typically used for boiler-plate code, and will confuse \n"
+                 "the parser if not removed.",
+                 TRUE
+                );
   cb->addDependency("ENABLE_PREPROCESSING");
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "External","Configuration::additions related to external references   ");
-  //-----------------------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------
+  cfg->addInfo("External","Configuration::additions related to external references   ");
+  //---------------------------------------------------------------------------
+
+  //----
   cl = cfg->addList(
-                    "TAGFILES",
-                    "The TAGFILES option can be used to specify one or more tagfiles. \n"
-		    "Optionally an initial location of the external documentation \n"
-		    "can be added for each tagfile. The format of a tag file without \n"
-		    "this location is as follows: \n"
-		    "  TAGFILES = file1 file2 ... \n" 
-		    "Adding location for the tag files is done as follows: \n"
-		    "  TAGFILES = file1=loc1 \"file2 = loc2\" ... \n"
-	            "where \"loc1\" and \"loc2\" can be relative or absolute paths or \n"
-		    "URLs. If a location is present for each tag, the installdox tool \n"
-		    "does not have to be run to correct the links.\n"
-		    "Note that each tag file must have a unique name\n"
-		    "(where the name does NOT include the path)\n"
-	            "If a tag file is not located in the directory in which doxygen \n"
-	            "is run, you must also specify the path to the tagfile here. \n"
-               );
+                 "TAGFILES",
+                 "The TAGFILES option can be used to specify one or more tagfiles. \n"
+                 "Optionally an initial location of the external documentation \n"
+                 "can be added for each tagfile. The format of a tag file without \n"
+                 "this location is as follows: \n"
+                 " \n"
+                 "TAGFILES = file1 file2 ... \n"
+                 "Adding location for the tag files is done as follows: \n"
+                 " \n"
+                 "TAGFILES = file1=loc1 \"file2 = loc2\" ... \n"
+                 "where \"loc1\" and \"loc2\" can be relative or absolute paths or \n"
+                 "URLs. If a location is present for each tag, the installdox tool \n"
+                 "does not have to be run to correct the links. \n"
+                 "Note that each tag file must have a unique name \n"
+                 "(where the name does NOT include the path) \n"
+                 "If a tag file is not located in the directory in which doxygen \n"
+                 "is run, you must also specify the path to the tagfile here."
+                );
   cl->setWidgetType(ConfigList::File);
   //----
   cs = cfg->addString(
-                    "GENERATE_TAGFILE",
-                    "When a file name is specified after GENERATE_TAGFILE, doxygen will create \n"
-                    "a tag file that is based on the input files it reads. \n"
-                   );
+                 "GENERATE_TAGFILE",
+                 "When a file name is specified after GENERATE_TAGFILE, doxygen will create \n"
+                 "a tag file that is based on the input files it reads."
+                );
   cs->setWidgetType(ConfigString::File);
   //----
   cb = cfg->addBool(
-                    "ALLEXTERNALS",
-                    "If the ALLEXTERNALS tag is set to YES all external classes will be listed \n"
-                    "in the class index. If set to NO only the inherited external classes \n"
-                    "will be listed. \n",
-                    FALSE
-                 );
+                 "ALLEXTERNALS",
+                 "If the ALLEXTERNALS tag is set to YES all external classes will be listed \n"
+                 "in the class index. If set to NO only the inherited external classes \n"
+                 "will be listed.",
+                 FALSE
+                );
   //----
   cb = cfg->addBool(
-                    "EXTERNAL_GROUPS",
-                    "If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed \n"
-                    "in the modules index. If set to NO, only the current project's groups will \n"
-                    "be listed. \n",
-                    TRUE
-                 );
+                 "EXTERNAL_GROUPS",
+                 "If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed \n"
+                 "in the modules index. If set to NO, only the current project's groups will \n"
+                 "be listed.",
+                 TRUE
+                );
   //----
   cs = cfg->addString(
-                    "PERL_PATH",
-                    "The PERL_PATH should be the absolute path and name of the perl script \n"
-                    "interpreter (i.e. the result of `which perl'). \n"
-                   );
+                 "PERL_PATH",
+                 "The PERL_PATH should be the absolute path and name of the perl script \n"
+                 "interpreter (i.e. the result of `which perl')."
+                );
   cs->setDefaultValue("/usr/bin/perl");
   cs->setWidgetType(ConfigString::Dir);
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Dot","Configuration options related to the dot tool   ");
+  //---------------------------------------------------------------------------
 
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Dot","Configuration options related to the dot tool   ");
-  //-----------------------------------------------------------------------------------------------
-  cb = cfg->addBool(
-                    "CLASS_DIAGRAMS",
-                    "If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will \n"
-                    "generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base \n"
-		    "or super classes. Setting the tag to NO turns the diagrams off. Note that \n"
-		    "this option is superseded by the HAVE_DOT option below. This is only a \n"
-		    "fallback. It is recommended to install and use dot, since it yields more \n"
-		    "powerful graphs. \n",
-                    TRUE
-                 );
-  //----
-  cs = cfg->addString(   "MSCGEN_PATH",
-                    "You can define message sequence charts within doxygen comments using the \\msc \n"
-		    "command. Doxygen will then run the mscgen tool (see \n"
-		    "http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the \n"
-		    "documentation. The MSCGEN_PATH tag allows you to specify the directory where \n"
-		    "the mscgen tool resides. If left empty the tool is assumed to be found in the \n"
-		    "default search path. \n"
-                );
-  //----
-  cb = cfg->addBool(
-                    "HIDE_UNDOC_RELATIONS",
-		    "If set to YES, the inheritance and collaboration graphs will hide \n"
-		    "inheritance and usage relations if the target is undocumented \n"
-		    "or is not a class. \n",
-                    TRUE
-                 );
-  //----
-  cb = cfg->addBool(
-                    "HAVE_DOT",
-                    "If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is \n"
-                    "available from the path. This tool is part of Graphviz, a graph visualization \n"
-                    "toolkit from AT&T and Lucent Bell Labs. The other options in this section \n"
-                    "have no effect if this option is set to NO (the default) \n",
-                    FALSE
-                 );
-  //----
-  cs = cfg->addString(   "DOT_FONTNAME",
-                    "By default doxygen will write a font called FreeSans.ttf to the output \n"
-		    "directory and reference it in all dot files that doxygen generates. This \n"
-		    "font does not include all possible unicode characters however, so when you need \n"
-		    "these (or just want a differently looking font) you can specify the font name \n"
-		    "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
-		    "which can be done by putting it in a standard location or by setting the \n"
-		    "DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory \n"
-		    "containing the font. \n"
-                 );
+  //----
+  cb = cfg->addBool(
+                 "CLASS_DIAGRAMS",
+                 "If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will \n"
+                 "generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base \n"
+                 "or super classes. Setting the tag to NO turns the diagrams off. Note that \n"
+                 "this option is superseded by the HAVE_DOT option below. This is only a \n"
+                 "fallback. It is recommended to install and use dot, since it yields more \n"
+                 "powerful graphs.",
+                 TRUE
+                );
+  //----
+  cs = cfg->addString(
+                 "MSCGEN_PATH",
+                 "You can define message sequence charts within doxygen comments using the \\msc \n"
+                 "command. Doxygen will then run the mscgen tool (see \n"
+                 "http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the \n"
+                 "documentation. The MSCGEN_PATH tag allows you to specify the directory where \n"
+                 "the mscgen tool resides. If left empty the tool is assumed to be found in the \n"
+                 "default search path."
+                );
+  //----
+  cb = cfg->addBool(
+                 "HIDE_UNDOC_RELATIONS",
+                 "If set to YES, the inheritance and collaboration graphs will hide \n"
+                 "inheritance and usage relations if the target is undocumented \n"
+                 "or is not a class.",
+                 TRUE
+                );
+  //----
+  cb = cfg->addBool(
+                 "HAVE_DOT",
+                 "If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is \n"
+                 "available from the path. This tool is part of Graphviz, a graph visualization \n"
+                 "toolkit from AT&T and Lucent Bell Labs. The other options in this section \n"
+                 "have no effect if this option is set to NO (the default)",
+                 FALSE
+                );
+  //----
+  cs = cfg->addString(
+                 "DOT_FONTNAME",
+                 "By default doxygen will write a font called FreeSans.ttf to the output \n"
+                 "directory and reference it in all dot files that doxygen generates. This \n"
+                 "font does not include all possible unicode characters however, so when you need \n"
+                 "these (or just want a differently looking font) you can specify the font name \n"
+                 "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
+                 "which can be done by putting it in a standard location or by setting the \n"
+                 "DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory \n"
+                 "containing the font."
+                );
   cs->setDefaultValue("FreeSans");
   cs->addDependency("HAVE_DOT");
   //----
-  ci = cfg->addInt(      "DOT_FONTSIZE",
-                    "The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. \n"
-		    "The default size is 10pt. \n",
-		    4,24,10
-	     );
+  ci = cfg->addInt(
+                 "DOT_FONTSIZE",
+                 "The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. \n"
+                 "The default size is 10pt.",
+                 4,24,10
+                );
   ci->addDependency("HAVE_DOT");
   //----
-  cs = cfg->addString(   "DOT_FONTPATH",
-      		    "By default doxygen will tell dot to use the output directory to look for the \n"
-		    "FreeSans.ttf font (which doxygen will put there itself). If you specify a \n"
-		    "different font using DOT_FONTNAME you can set the path where dot \n"
-		    "can find it using this tag. \n"
+  cs = cfg->addString(
+                 "DOT_FONTPATH",
+                 "By default doxygen will tell dot to use the output directory to look for the \n"
+                 "FreeSans.ttf font (which doxygen will put there itself). If you specify a \n"
+                 "different font using DOT_FONTNAME you can set the path where dot \n"
+                 "can find it using this tag."
                 );
   cs->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "CLASS_GRAPH",
-                    "If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen \n"
-                    "will generate a graph for each documented class showing the direct and \n"
-                    "indirect inheritance relations. Setting this tag to YES will force the \n"
-                    "the CLASS_DIAGRAMS tag to NO.\n",
-                    TRUE
-                 );
+                 "CLASS_GRAPH",
+                 "If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen \n"
+                 "will generate a graph for each documented class showing the direct and \n"
+                 "indirect inheritance relations. Setting this tag to YES will force the \n"
+                 "the CLASS_DIAGRAMS tag to NO.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "COLLABORATION_GRAPH",
-                    "If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen \n"
-                    "will generate a graph for each documented class showing the direct and \n"
-                    "indirect implementation dependencies (inheritance, containment, and \n"
-                    "class references variables) of the class with other documented classes. \n",
-                    TRUE
-                 );
+                 "COLLABORATION_GRAPH",
+                 "If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen \n"
+                 "will generate a graph for each documented class showing the direct and \n"
+                 "indirect implementation dependencies (inheritance, containment, and \n"
+                 "class references variables) of the class with other documented classes.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "GROUP_GRAPHS",
-                    "If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen \n"
-                    "will generate a graph for groups, showing the direct groups dependencies\n",
-                    TRUE
-                 );                 
+                 "GROUP_GRAPHS",
+                 "If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen \n"
+                 "will generate a graph for groups, showing the direct groups dependencies",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "UML_LOOK",
-                    "If the UML_LOOK tag is set to YES doxygen will generate inheritance and \n"
-	            "collaboration diagrams in a style similar to the OMG's Unified Modeling \n"
-		    "Language. \n",
-	            FALSE
-	      );
+                 "UML_LOOK",
+                 "If the UML_LOOK tag is set to YES doxygen will generate inheritance and \n"
+                 "collaboration diagrams in a style similar to the OMG's Unified Modeling \n"
+                 "Language.",
+                 FALSE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "TEMPLATE_RELATIONS",
-		    "If set to YES, the inheritance and collaboration graphs will show the \n"
-		    "relations between templates and their instances. \n",
-                    FALSE
-                 );
+                 "TEMPLATE_RELATIONS",
+                 "If set to YES, the inheritance and collaboration graphs will show the \n"
+                 "relations between templates and their instances.",
+                 FALSE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "INCLUDE_GRAPH",
-                    "If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT \n"
-                    "tags are set to YES then doxygen will generate a graph for each documented \n"
-                    "file showing the direct and indirect include dependencies of the file with \n"
-                    "other documented files. \n",
-                    TRUE
-                 );
+                 "INCLUDE_GRAPH",
+                 "If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT \n"
+                 "tags are set to YES then doxygen will generate a graph for each documented \n"
+                 "file showing the direct and indirect include dependencies of the file with \n"
+                 "other documented files.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "INCLUDED_BY_GRAPH",
-                    "If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and \n"
-                    "HAVE_DOT tags are set to YES then doxygen will generate a graph for each \n"
-                    "documented header file showing the documented files that directly or \n"
-                    "indirectly include this file. \n",
-                    TRUE
-                 );
+                 "INCLUDED_BY_GRAPH",
+                 "If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and \n"
+                 "HAVE_DOT tags are set to YES then doxygen will generate a graph for each \n"
+                 "documented header file showing the documented files that directly or \n"
+                 "indirectly include this file.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "CALL_GRAPH",
-                    "If the CALL_GRAPH and HAVE_DOT options are set to YES then \n"
-		    "doxygen will generate a call dependency graph for every global function \n"
-		    "or class method. Note that enabling this option will significantly increase \n"
-		    "the time of a run. So in most cases it will be better to enable call graphs \n"
-		    "for selected functions only using the \\callgraph command.\n",
-                    FALSE
-                 );
+                 "CALL_GRAPH",
+                 "If the CALL_GRAPH and HAVE_DOT options are set to YES then \n"
+                 "doxygen will generate a call dependency graph for every global function \n"
+                 "or class method. Note that enabling this option will significantly increase \n"
+                 "the time of a run. So in most cases it will be better to enable call graphs \n"
+                 "for selected functions only using the \\callgraph command.",
+                 FALSE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "CALLER_GRAPH",
-                    "If the CALLER_GRAPH and HAVE_DOT tags are set to YES then \n"
-		    "doxygen will generate a caller dependency graph for every global function \n"
-		    "or class method. Note that enabling this option will significantly increase \n"
-		    "the time of a run. So in most cases it will be better to enable caller \n"
-		    "graphs for selected functions only using the \\callergraph command.\n",
-                    FALSE
-                 );
+                 "CALLER_GRAPH",
+                 "If the CALLER_GRAPH and HAVE_DOT tags are set to YES then \n"
+                 "doxygen will generate a caller dependency graph for every global function \n"
+                 "or class method. Note that enabling this option will significantly increase \n"
+                 "the time of a run. So in most cases it will be better to enable caller \n"
+                 "graphs for selected functions only using the \\callergraph command.",
+                 FALSE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "GRAPHICAL_HIERARCHY",
-                    "If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen \n"
-                    "will graphical hierarchy of all classes instead of a textual one. \n",
-                    TRUE
-                 );
+                 "GRAPHICAL_HIERARCHY",
+                 "If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen \n"
+                 "will graphical hierarchy of all classes instead of a textual one.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
-  cb = cfg->addBool(    
-                  "DIRECTORY_GRAPH",
-  		  "If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES \n"
-  	 	  "then doxygen will show the dependencies a directory has on other directories \n"
-       	          "in a graphical way. The dependency relations are determined by the #include\n"
-  		  "relations between the files in the directories.\n",
-                  TRUE
-               );
+  cb = cfg->addBool(
+                 "DIRECTORY_GRAPH",
+                 "If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES \n"
+                 "then doxygen will show the dependencies a directory has on other directories \n"
+                 "in a graphical way. The dependency relations are determined by the #include \n"
+                 "relations between the files in the directories.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   ce = cfg->addEnum(
-                    "DOT_IMAGE_FORMAT",
-                    "The DOT_IMAGE_FORMAT tag can be used to set the image format of the images \n"
-		    "generated by dot. Possible values are png, jpg, or gif\n"
-                    "If left blank png will be used. \n",
-                    "png"
-                   );
+                 "DOT_IMAGE_FORMAT",
+                 "The DOT_IMAGE_FORMAT tag can be used to set the image format of the images \n"
+                 "generated by dot. Possible values are png, jpg, or gif \n"
+                 "If left blank png will be used.",
+                 "png"
+                );
   ce->addValue("png");
   ce->addValue("jpg");
   ce->addValue("gif");
   ce->addDependency("HAVE_DOT");
   //----
   cs = cfg->addString(
-                    "DOT_PATH",
-                    "The tag DOT_PATH can be used to specify the path where the dot tool can be \n"
-                    "found. If left blank, it is assumed the dot tool can be found in the path. \n"
-                   );
+                 "DOT_PATH",
+                 "The tag DOT_PATH can be used to specify the path where the dot tool can be \n"
+                 "found. If left blank, it is assumed the dot tool can be found in the path."
+                );
   cs->setWidgetType(ConfigString::Dir);
   cs->addDependency("HAVE_DOT");
   //----
   cl = cfg->addList(
-                    "DOTFILE_DIRS",
-                    "The DOTFILE_DIRS tag can be used to specify one or more directories that \n"
-		    "contain dot files that are included in the documentation (see the \n"
-                    "\\dotfile command). \n"
-                 );
-  cl->setWidgetType(ConfigList::Dir);
+                 "DOTFILE_DIRS",
+                 "The DOTFILE_DIRS tag can be used to specify one or more directories that \n"
+                 "contain dot files that are included in the documentation (see the \n"
+                 "\\dotfile command)."
+                );
   cl->addDependency("HAVE_DOT");
+  cl->setWidgetType(ConfigList::Dir);
   //----
   ci = cfg->addInt(
-                    "DOT_GRAPH_MAX_NODES",
-                    "The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of \n"
-                    "nodes that will be shown in the graph. If the number of nodes in a graph \n"
-                    "becomes larger than this value, doxygen will truncate the graph, which is \n"
-                    "visualized by representing a node as a red box. Note that doxygen if the \n"
-		    "number of direct children of the root node in a graph is already larger than \n"
-		    "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n"
-                    "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n",
-                    0,10000, 50
+                 "DOT_GRAPH_MAX_NODES",
+                 "The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of \n"
+                 "nodes that will be shown in the graph. If the number of nodes in a graph \n"
+                 "becomes larger than this value, doxygen will truncate the graph, which is \n"
+                 "visualized by representing a node as a red box. Note that doxygen if the \n"
+                 "number of direct children of the root node in a graph is already larger than \n"
+                 "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n"
+                 "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.",
+                 0,10000,50
                 );
   ci->addDependency("HAVE_DOT");
   //----
   ci = cfg->addInt(
-                    "MAX_DOT_GRAPH_DEPTH",
-                    "The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the \n"
-                    "graphs generated by dot. A depth value of 3 means that only nodes reachable \n"
-                    "from the root by following a path via at most 3 edges will be shown. Nodes \n"
-		    "that lay further from the root node will be omitted. Note that setting this \n"
-		    "option to 1 or 2 may greatly reduce the computation time needed for large \n"
-		    "code bases. Also note that the size of a graph can be further restricted by \n"
-                    "DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.\n",
-                    0,1000,0
+                 "MAX_DOT_GRAPH_DEPTH",
+                 "The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the \n"
+                 "graphs generated by dot. A depth value of 3 means that only nodes reachable \n"
+                 "from the root by following a path via at most 3 edges will be shown. Nodes \n"
+                 "that lay further from the root node will be omitted. Note that setting this \n"
+                 "option to 1 or 2 may greatly reduce the computation time needed for large \n"
+                 "code bases. Also note that the size of a graph can be further restricted by \n"
+                 "DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.",
+                 0,1000,0
                 );
   ci->addDependency("HAVE_DOT");
   //----
-  cfg->addObsolete("MAX_DOT_GRAPH_WIDTH");
-  //----
-  cfg->addObsolete("MAX_DOT_GRAPH_HEIGHT");
-  //----
   cb = cfg->addBool(
-                    "DOT_TRANSPARENT",
-		    "Set the DOT_TRANSPARENT tag to YES to generate images with a transparent \n"
-		    "background. This is disabled by default, because dot on Windows does not \n"
-		    "seem to support this out of the box. Warning: Depending on the platform used, \n"
-		    "enabling this option may lead to badly anti-aliased labels on the edges of \n"
-		    "a graph (i.e. they become hard to read). \n",
-		    FALSE
-              );
+                 "DOT_TRANSPARENT",
+                 "Set the DOT_TRANSPARENT tag to YES to generate images with a transparent \n"
+                 "background. This is disabled by default, because dot on Windows does not \n"
+                 "seem to support this out of the box. Warning: Depending on the platform used, \n"
+                 "enabling this option may lead to badly anti-aliased labels on the edges of \n"
+                 "a graph (i.e. they become hard to read).",
+                 FALSE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "DOT_MULTI_TARGETS",
-		    "Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output \n"
-		    "files in one run (i.e. multiple -o and -T options on the command line). This \n"
-		    "makes dot run faster, but since only newer versions of dot (>1.8.10) \n"
-		    "support this, this feature is disabled by default. \n",
-		    FALSE
-              );
+                 "DOT_MULTI_TARGETS",
+                 "Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output \n"
+                 "files in one run (i.e. multiple -o and -T options on the command line). This \n"
+                 "makes dot run faster, but since only newer versions of dot (>1.8.10) \n"
+                 "support this, this feature is disabled by default.",
+                 FALSE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "GENERATE_LEGEND",
-                    "If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will \n"
-                    "generate a legend page explaining the meaning of the various boxes and \n"
-                    "arrows in the dot generated graphs. \n",
-                    TRUE
-                 );
+                 "GENERATE_LEGEND",
+                 "If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will \n"
+                 "generate a legend page explaining the meaning of the various boxes and \n"
+                 "arrows in the dot generated graphs.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
   //----
   cb = cfg->addBool(
-                    "DOT_CLEANUP",
-                    "If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n"
-                    "remove the intermediate dot files that are used to generate \n"
-                    "the various graphs. \n",
-                    TRUE
-                 );
+                 "DOT_CLEANUP",
+                 "If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n"
+                 "remove the intermediate dot files that are used to generate \n"
+                 "the various graphs.",
+                 TRUE
+                );
   cb->addDependency("HAVE_DOT");
+  //---------------------------------------------------------------------------
+  cfg->addInfo("Search","Options related to the search engine");
+  //---------------------------------------------------------------------------
 
-  //-----------------------------------------------------------------------------------------------
-  cfg->addInfo(  "Search","Configuration::additions related to the search engine   ");
-  //-----------------------------------------------------------------------------------------------
+  //----
   cb = cfg->addBool(
-                    "SEARCHENGINE",
-                    "The SEARCHENGINE tag specifies whether or not a search engine should be \n"
-                    "used. If set to NO the values of all tags below this one will be ignored. \n",
-                    FALSE
-                 );
+                 "SEARCHENGINE",
+                 "The SEARCHENGINE tag specifies whether or not a search engine should be \n"
+                 "used. If set to NO the values of all tags below this one will be ignored.",
+                 FALSE
+                );
+  //----
+  cfg->addObsolete("USE_WINDOWS_ENCODING");
+  //----
+  cfg->addObsolete("DETAILS_AT_TOP");
+  //----
+  cfg->addObsolete("QTHELP_FILE");
+  //----
+  cfg->addObsolete("QTHELP_CONFIG");
+  //----
+  cfg->addObsolete("DOXYGEN2QTHELP_LOC");
+  //----
+  cfg->addObsolete("MAX_DOT_GRAPH_WIDTH");
+  //----
+  cfg->addObsolete("MAX_DOT_GRAPH_HEIGHT");
   //----
   cfg->addObsolete("CGI_NAME");
   //----
@@ -2173,7 +2109,4 @@ void addConfigOptions(Config *cfg)
   cfg->addObsolete("BIN_ABSPATH");
   //----
   cfg->addObsolete("EXT_DOC_PATHS");
-
-  // The IMAGE_PATTERNS tag is now officially obsolete.
-
 }
diff --git a/src/dot.cpp b/src/dot.cpp
index 3f0a4ff..ece1638 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -1968,7 +1968,7 @@ QCString DotClassGraph::writeGraph(QTextStream &out,
       }
       else
       {
-        out << "\\includegraphics[width=" << width/2 << "pt]";
+        out << "\\includegraphics[width=" << width << "pt]";
       }
       out << "{" << baseName << "}\n"
         "\\end{center}\n"
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index b919521..03ef3ff 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9295,13 +9295,17 @@ void readConfiguration(int argc, char **argv)
 
   if (genConfig)
   {
-    checkConfiguration();
-    generateConfigFile(configName,shortList);
     if (g_dumpConfigAsXML)
     {
+      checkConfiguration();
+      generateConfigFile(configName,shortList);
       dumpConfigAsXML();
       exit(0); 
     }
+    else
+    {
+      generateConfigFile(configName,shortList);
+    }
     cleanUpDoxygen();
     exit(0);
   }
diff --git a/src/doxygen.css b/src/doxygen.css
index 7561c63..3767dc9 100644
--- a/src/doxygen.css
+++ b/src/doxygen.css
@@ -68,6 +68,10 @@ a.qindexHL {
 	border: 1px double #9295C2;
 }
 
+.contents a.qindexHL:visited {
+        color: #ffffff;
+}
+
 a.el {
 	font-weight: bold;
 }
diff --git a/src/doxygen_css.h b/src/doxygen_css.h
index 591c2bf..99c7b5d 100644
--- a/src/doxygen_css.h
+++ b/src/doxygen_css.h
@@ -68,6 +68,10 @@
 "	border: 1px double #9295C2;\n"
 "}\n"
 "\n"
+".contents a.qindexHL:visited {\n"
+"        color: #ffffff;\n"
+"}\n"
+"\n"
 "a.el {\n"
 "	font-weight: bold;\n"
 "}\n"
diff --git a/src/lang_cfg.h b/src/lang_cfg.h
index 2855c93..e955bb0 100644
--- a/src/lang_cfg.h
+++ b/src/lang_cfg.h
@@ -33,3 +33,4 @@
 #define LANG_AR
 #define LANG_FA
 #define LANG_VI
+#define LANG_TR
diff --git a/src/language.cpp b/src/language.cpp
index ec9a9c7..f5485a4 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -137,6 +137,9 @@
 #ifdef LANG_VI
 #include "translator_vi.h"
 #endif
+#ifdef LANG_TR
+#include "translator_tr.h"
+#endif
 #endif // !ENGLISH_ONLY
 
 #define L_EQUAL(a) !stricmp(langName,a)
@@ -382,6 +385,12 @@ bool setTranslator(const char *langName)
     theTranslator=new TranslatorVietnamese;
   }
 #endif
+#ifdef LANG_TR
+  else if (L_EQUAL("turkish"))
+  {
+    theTranslator=new TranslatorTurkish;
+  }
+#endif
 #endif // ENGLISH_ONLY
   else // use the default language (i.e. english)
   {
diff --git a/src/pre.l b/src/pre.l
index 5040a2a..7d5565b 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "qtbc.h"
 #include <qarray.h>
@@ -53,6 +54,8 @@ struct FileState
 {
   int lineNr;
   FILE *filePtr;
+  FILE *oldYYin;
+  bool isPlainFile;
   YY_BUFFER_STATE bufState;
   QCString fileName;
 };  
@@ -171,9 +174,9 @@ static Define *isDefined(const char *name)
   return 0;
 }
 
-static FILE *checkAndOpenFile(const QCString &fileName)
+static FileState *checkAndOpenFile(const QCString &fileName)
 {
-  FILE *f = 0;
+  FileState *fs = 0;
   //printf("checkAndOpenFile(%s)\n",absName.data());
   QFileInfo fi(fileName);
   if (fi.exists() && fi.isFile())
@@ -183,7 +186,6 @@ static FILE *checkAndOpenFile(const QCString &fileName)
 
     QStack<FileState> tmpStack;
     g_includeStack.setAutoDelete(FALSE);
-    FileState *fs;
     bool alreadyIncluded=FALSE;
     while ((fs=g_includeStack.pop()))
     {
@@ -198,24 +200,33 @@ static FILE *checkAndOpenFile(const QCString &fileName)
 
     if (alreadyIncluded) return 0; 
 
+    fs = new FileState;
     
     QCString filterName = getFileFilter(absName);
     if (!filterName.isEmpty())
     {
+      fs->isPlainFile = FALSE;
       QCString cmd = filterName+" \""+absName+"\"";
-      f=portable_popen(cmd,"r");
-      if (!f) err("Error: could not execute filter %s\n",cmd.data());
+      fs->filePtr=portable_popen(cmd,"r");
+      if (!fs->filePtr) err("Error: could not execute filter %s\n",cmd.data());
     }
     else
     {
-      f=fopen(absName,"r");
-      if (!f) err("Error: could not open file %s for reading\n",absName.data());
+      fs->isPlainFile = TRUE;
+      fs->filePtr=fopen(absName,"r");
+      if (!fs->filePtr) err("Error: could not open file %s for reading\n",absName.data());
+    }
+    if (!fs->filePtr) // error -> cleanup
+    {
+      delete fs;
+      fs=0;
     }
+    fs->oldYYin = preYYin;
   }
-  return f;
+  return fs;
 }
 
-static FILE *findFile(const char *fileName,bool localInclude)
+static FileState *findFile(const char *fileName,bool localInclude)
 {
   //printf("** findFile(%s,%d) g_yyFileName=%s\n",fileName,localInclude,g_yyFileName.data());
   if (localInclude && !g_yyFileName.isEmpty())
@@ -224,12 +235,12 @@ static FILE *findFile(const char *fileName,bool localInclude)
     if (fi.exists())
     {
       QCString absName = QCString(fi.dirPath(TRUE).data())+"/"+fileName;
-      FILE *f = checkAndOpenFile(absName);
-      if (f)
+      FileState *fs = checkAndOpenFile(absName);
+      if (fs)
       {
 	setFileName(absName);
 	g_yyLineNr=1;
-	return f;
+	return fs;
       }
     }
   }
@@ -241,12 +252,12 @@ static FILE *findFile(const char *fileName,bool localInclude)
   while (s)
   {
     QCString absName = (QCString)s+"/"+fileName;
-    FILE *f = checkAndOpenFile(absName);
-    if (f)
+    FileState *fs = checkAndOpenFile(absName);
+    if (fs)
     {
       setFileName(absName);
       g_yyLineNr=1;
-      return f;
+      return fs;
     }
 
     s=g_pathList->next();
@@ -1116,14 +1127,14 @@ static void readIncludeFile(const QCString &inc)
     // extract include path+name
     QCString incFileName=inc.mid(s,i-s).stripWhiteSpace(); 
 
-    FILE *f;
     QCString oldFileName = g_yyFileName.copy();
     FileDef *oldFileDef  = g_yyFileDef;
     int oldLineNr        = g_yyLineNr;
     //printf("Searching for `%s'\n",incFileName.data());
     
     // findFile will overwrite g_yyFileDef if found
-    if ((f=findFile(incFileName,localInclude))) // see if the include file can be found
+    FileState *fs;
+    if ((fs=findFile(incFileName,localInclude))) // see if the include file can be found
     {
       //printf("Found include file!\n");
       if (Debug::isFlagSet(Debug::Preprocessor))
@@ -1142,11 +1153,9 @@ static void readIncludeFile(const QCString &inc)
   	  g_yyFileDef->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,g_isImported);
         }
       }
-      FileState *fs=new FileState;
       fs->bufState=YY_CURRENT_BUFFER;
       fs->lineNr=oldLineNr;
       fs->fileName=oldFileName;
-      fs->filePtr=f;
       // push the state on the stack
       g_includeStack.push(fs);
       // set the scanner to the include file
@@ -1158,7 +1167,7 @@ static void readIncludeFile(const QCString &inc)
       outputArray(lineStr.data(),lineStr.length());
       
       //fprintf(stderr,"Switching to include file %s\n",incFileName.data());
-      preYYin=f;
+      preYYin=fs->filePtr;
       yy_switch_to_buffer(yy_create_buffer(preYYin, YY_BUF_SIZE));
     } 
     else
@@ -1253,7 +1262,7 @@ static char resolveTrigraph(char c)
 
 static int yyread(char *buf,int max_size)
 {
-  int len = fread( buf, 1, max_size, yyin );
+  int len = fread( buf, 1, max_size, preYYin );
   if (len==0 && ferror( yyin ))
   {
     yy_fatal_error( "input in flex scanner failed" );
@@ -2175,14 +2184,27 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 					  {
 					    FileState *fs=g_includeStack.pop();
 					    //fileDefineCache->merge(g_yyFileName,fs->fileName);
-					    if (getFileFilter(fs->fileName.data()).isEmpty())
-					      fclose(fs->filePtr);
+					    if (fs->isPlainFile)
+					    {
+					      if (fs->filePtr && fclose(fs->filePtr)!=0)
+					      {
+						err("Error: could not close file %s: %s\n",fs->fileName.data(),strerror(errno));
+					      }
+				              fs->filePtr=0;
+					    }
 					    else
-					      portable_pclose(fs->filePtr);
+					    {
+					      if (fs->filePtr && portable_pclose(fs->filePtr)!=0)
+					      {
+						err("Error: could not close pipe: %s\n",strerror(errno));
+					      }
+				    	      fs->filePtr=0;
+					    }
 					    YY_BUFFER_STATE oldBuf = YY_CURRENT_BUFFER;
 					    yy_switch_to_buffer( fs->bufState );
 					    yy_delete_buffer( oldBuf );
 					    g_yyLineNr=fs->lineNr;
+                                            preYYin = fs->oldYYin;
 					    setFileName(fs->fileName.copy());
 					    //fprintf(stderr,"######## FileName %s\n",g_yyFileName.data());
 					    
diff --git a/src/scanner.l b/src/scanner.l
index 7704ef8..58c43fc 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4700,7 +4700,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
 					  current->args += ' ';
 					  current->args += name;
     					}
-<ClassVar,Bases>\n/{BN}*		{
+<ClassVar,Bases>\n/{BN}*[^{,]		{
                                           if (!insideObjC) 
 					  {
 					    REJECT;
@@ -4708,7 +4708,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
 					  else
 					  {
 					    yyLineNr++;
-					    //unput('{');
+					    unput('{');
 					  }
 					}
 <ClassVar,Bases>"@end"			{ // empty ObjC interface
diff --git a/src/translator_tr.h b/src/translator_tr.h
new file mode 100644
index 0000000..131e1c4
--- /dev/null
+++ b/src/translator_tr.h
@@ -0,0 +1,1781 @@
+/******************************************************************************
+ *
+ * 
+ *
+ * Copyright (C) 1997-2008 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
+#ifndef TRANSLATOR_TR_H
+#define TRANSLATOR_TR_H
+
+/*! 
+ When defining a translator class for the new language, follow
+ the description in the documentation.  One of the steps says
+ that you should copy the translator_en.h (this) file to your
+ translator_xx.h new file.  Your new language should use the
+ Translator class as the base class.  This means that you need to
+ implement exactly the same (pure virtual) methods as the
+ TranslatorEnglish does.  Because of this, it is a good idea to
+ start with the copy of TranslatorEnglish and replace the strings
+ one by one.
+
+ It is not necessary to include "translator.h" or
+ "translator_adapter.h" here.  The files are included in the
+ language.cpp correctly.  Not including any of the mentioned
+ files frees the maintainer from thinking about whether the
+ first, the second, or both files should be included or not, and
+ why.  This holds namely for localized translators because their
+ base class is changed occasionaly to adapter classes when the
+ Translator class changes the interface, or back to the
+ Translator class (by the local maintainer) when the localized
+ translator is made up-to-date again.
+*/
+class TranslatorTurkish : public Translator
+{
+  public:
+
+    // --- Language control methods -------------------
+    
+    /*! Used for identification of the language. The identification 
+     * should not be translated. It should be replaced by the name 
+     * of the language in English using lower-case characters only
+     * (e.g. "czech", "japanese", "russian", etc.). It should be equal to 
+     * the identification used in language.cpp.
+     */
+    virtual QCString idLanguage()
+    { return "turkish"; }
+    
+    /*! Used to get the LaTeX command(s) for the language support. 
+     *  This method should return string with commands that switch
+     *  LaTeX to the desired language.  For example 
+     *  <pre>"\\usepackage[german]{babel}\n"
+     *  </pre>
+     *  or
+     *  <pre>"\\usepackage{polski}\n"
+     *  "\\usepackage[latin2]{inputenc}\n"
+     *  "\\usepackage[T1]{fontenc}\n"
+     *  </pre>
+     * 
+     * The English LaTeX does not use such commands.  Because of this
+     * the empty string is returned in this implementation.
+     */
+    virtual QCString latexLanguageSupportCommand()
+    {
+      return "";
+    }
+
+    /*! return the language charset. This will be used for the HTML output */
+    virtual QCString idLanguageCharset()
+    {
+      return "iso-8859-9";
+    }
+
+    // --- Language translation methods -------------------
+
+    /*! used in the compound documentation before a list of related fonksiyonlar. */
+    virtual QCString trRelatedFunctions()
+    { return "İlgili Fonksiyonlar"; }
+
+    /*! subscript for the related fonksiyonlar. */
+    virtual QCString trRelatedSubscript()
+    { return "(Not: Bu fonksiyonlar üye fonksiyon değildir.)"; }
+
+    /*! header that is put before the detailed description of files, classes and namespaces. */
+    virtual QCString trDetailedDescription()
+    { return "Ayrıntılı tanımlama"; }
+
+    /*! header that is put before the list of typedefs. */
+    virtual QCString trMemberTypedefDocumentation()
+    { return "Üye Typedef Dokümantasyonu"; }
+    
+    /*! header that is put before the list of enumerations. */
+    virtual QCString trMemberEnumerationDocumentation()
+    { return "Üye Enümerasyon Dokümantasyonu"; }
+    
+    /*! header that is put before the list of member fonksiyonlar. */
+    virtual QCString trMemberFunctionDocumentation()
+    { return "Üye Fonksiyon Dokümantasyonu"; }
+    
+    /*! header that is put before the list of member attributes. */
+    virtual QCString trMemberDataDocumentation()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Alan Dokümantasyonu"; 
+      }
+      else
+      {
+        return "Üye Veri Dokümantasyonu"; 
+      }
+    }
+
+    /*! this is the text of a link put after brief descriptions. */
+    virtual QCString trMore() 
+    { return "Ayrıntılar..."; }
+
+    /*! put in the class documentation */
+    virtual QCString trListOfAllMembers()
+    { return "Tüm üyelerin listesi."; }
+
+    /*! used as the title of the "list of all members" page of a class */
+    virtual QCString trMemberList()
+    { return "Üye Listesi"; }
+
+    /*! this is the first part of a sentence that is followed by a class name */
+    virtual QCString trThisIsTheListOfAllMembers()
+    { return "Şu sınıfın tüm üyelerinin listesidir: "; }
+
+    /*! this is the remainder of the sentence after the class name */
+    virtual QCString trIncludingInheritedMembers()
+    { return "  (kalıtımla gelen üyeleri de içerir)."; }
+    
+    /*! this is put at the author sections at the bottom of man pages.
+     *  parameter s is name of the project name.
+     */
+    virtual QCString trGeneratedAutomatically(const char *s)
+    { QCString result="Doxygen tarafından";
+      if (s) result+=s+(QCString)" için ";
+      result+=" kaynak koddan otomatik üretilmiştir."; 
+      return result;
+    }
+
+    /*! put after an enum name in the list of all members */
+    virtual QCString trEnumName()
+    { return "enum adı"; }
+    
+    /*! put after an enum value in the list of all members */
+    virtual QCString trEnumValue()
+    { return "enum değeri"; }
+    
+    /*! put after an undocumented member in the list of all members */
+    virtual QCString trDefinedIn()
+    { return "tanımlandığı yer"; }
+
+    // quick reference sections
+
+    /*! This is put above each page as a link to the list of all groups of 
+     *  compounds or files (see the \\group command).
+     */
+    virtual QCString trModules()
+    { return "Modüller"; }
+    
+    /*! This is put above each page as a link to the class hierarchy */
+    virtual QCString trClassHierarchy()
+    { return "Sınıf Hiyerarşisi"; }
+    
+    /*! This is put above each page as a link to the list of annotated classes */
+    virtual QCString trCompoundList()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Veri Yapıları";
+      }
+      else
+      {
+        return "Sınıf Listesi"; 
+      }
+    }
+    
+    /*! This is put above each page as a link to the list of documented files */
+    virtual QCString trFileList()
+    { return "Dosya Listesi"; }
+
+    /*! This is put above each page as a link to all members of compounds. */
+    virtual QCString trCompoundMembers()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Veri Alanları"; 
+      }
+      else
+      {
+        return "Sınıf Üyeleri"; 
+      }
+    }
+
+    /*! This is put above each page as a link to all members of files. */
+    virtual QCString trFileMembers()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Globaller"; 
+      }
+      else
+      {
+        return "Dosya Üyeleri"; 
+      }
+    }
+
+    /*! This is put above each page as a link to all related pages. */
+    virtual QCString trRelatedPages()
+    { return "İlgili Sayfalar"; }
+
+    /*! This is put above each page as a link to all examples. */
+    virtual QCString trExamples()
+    { return "Örnekler"; }
+
+    /*! This is put above each page as a link to the search engine. */
+    virtual QCString trSearch()
+    { return "Ara"; }
+
+    /*! This is an introduction to the class hierarchy. */
+    virtual QCString trClassHierarchyDescription()
+    { return "Bu kalıtım listesi tamamen olmasa da yaklaşık "
+             "olarak alfabetik sıraya konulmuştur:";
+    }
+
+    /*! This is an introduction to the list with all files. */
+    virtual QCString trFileListDescription(bool extractAll)
+    {
+      QCString result="Bu liste tüm ";
+      if (!extractAll) result+="dokümante edilmiş ";
+      result+="dosyaları kısa açıklamalarıyla göstermektedir:";
+      return result;
+    }
+
+    /*! This is an introduction to the annotated compound list. */
+    virtual QCString trCompoundListDescription()
+    { 
+      
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Kısa tanımlarıyla birlikte veri yapıları:"; 
+      }
+      else
+      {
+        return "Kısa tanımlarıyla sınıflar, yapılar (struct), "
+               "birleşimler(union) ve arayüzler:"; 
+      }
+    }
+
+    /*! This is an introduction to the page with all class members. */
+    virtual QCString trCompoundMembersDescription(bool extractAll)
+    {
+      QCString result="Bu liste tüm ";
+      if (!extractAll)
+      {
+        result+="dokümante edilmiş ";
+      }
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        result+="yapı(struct) ve birleşim(union) yapılarını içerir";
+      }
+      else
+      {
+        result+="sınıf üyelerini içerir";
+      }
+      result+=" ve ";
+      if (!extractAll) 
+      {
+        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+        {
+          result+="her alanı yapı(struct)/birleşim(union) dokümantasyonuna bağlar:";
+        }
+        else
+        {
+          result+="her üye için sınıf dokümantasyonuna bağlar:";
+        }
+      }
+      else 
+      {
+        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+        {
+          result+="ait olduğu yapı(struct)/birleşime(union) bağlar:";
+        }
+        else
+        {
+          result+="ait olduğu sınıfa bağlar:";
+        }
+      }
+      return result;
+    }
+
+    /*! This is an introduction to the page with all file members. */
+    virtual QCString trFileMembersDescription(bool extractAll)
+    {
+      QCString result="Bu liste tüm ";
+      if (!extractAll) result+="dokümante edilmiş ";
+      
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        result+="fonksiyonları, değişkenleri, makroları, enümerasyonları ve typedef\'leri içerir";
+      }
+      else
+      {
+        result+="dosya üyelerini içerir";
+      }
+      result+=" ve ";
+      if (extractAll) 
+        result+="ait olduğu dosyalar bağlar:";
+      else 
+        result+="dokümantasyona bağlar:";
+      return result;
+    }
+
+    /*! This is an introduction to the page with the list of all examples */
+    virtual QCString trExamplesDescription()
+    { return "Tüm örneklerin listesi aşağıdadır:"; }
+
+    /*! This is an introduction to the page with the list of related pages */
+    virtual QCString trRelatedPagesDescription()
+    { return "İlgili tüm dokümantasyon sayfalarının listesi aşağıdadır:"; }
+
+    /*! This is an introduction to the page with the list of class/file groups */
+    virtual QCString trModulesDescription()
+    { return "Tüm modüllerin listesi aşağıdadır:"; }
+
+    // index titles (the project name is prepended for these) 
+
+    /*! This is used in HTML as the title of index.html. */
+    virtual QCString trDocumentation()
+    { return "Dokümantasyonu"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * index of all groups.
+     */
+    virtual QCString trModuleIndex()
+    { return "Modül İndeksi"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * class hierarchy.
+     */
+    virtual QCString trHierarchicalIndex()
+    { return "Hiyerarşik İndeksi"; }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * annotated compound index.
+     */
+    virtual QCString trCompoundIndex()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      { 
+        return "Veri Yapıları İndeksi";
+      }
+      else
+      {
+        return "Sınıf İndeksi"; 
+      }
+    }
+
+    /*! This is used in LaTeX as the title of the chapter with the
+     * list of all files.
+     */
+    virtual QCString trFileIndex() 
+    { return "Dosya İndeksi"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all groups.
+     */
+    virtual QCString trModuleDocumentation()
+    { return "Modül Dokümantasyonu"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all classes, structs and unions.
+     */
+    virtual QCString trClassDocumentation()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Veri Yapıları Dokümantasyonu"; 
+      }
+      else
+      {
+        return "Sınıf Dokümantasyonu"; 
+      }
+    }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all files.
+     */
+    virtual QCString trFileDocumentation()
+    { return "Dosya Dokümantasyonu"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all examples.
+     */
+    virtual QCString trExampleDocumentation()
+    { return "Örnek Dokümantasyonu"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all related pages.
+     */
+    virtual QCString trPageDocumentation()
+    { return "Sayfa Dokümantasyonu"; }
+
+    /*! This is used in LaTeX as the title of the document */
+    virtual QCString trReferenceManual()
+    { return "Referans Kitabı"; }
+    
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of defines
+     */
+    virtual QCString trDefines()
+    { return "Makrolar"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of function prototypes
+     */
+    virtual QCString trFuncProtos()
+    { return "Fonksiyon Prototipleri"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of typedefs
+     */
+    virtual QCString trTypedefs()
+    { return "Typedef\'ler"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of enumerations
+     */
+    virtual QCString trEnumerations()
+    { return "Enümerasyonlar"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) functions
+     */
+    virtual QCString trFunctions()
+    { return "Fonksiyonlar"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) variables
+     */
+    virtual QCString trVariables()
+    { return "Değişkenler"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) variables
+     */
+    virtual QCString trEnumerationValues()
+    { return "Enümeratör"; }
+    
+    /*! This is used in the documentation of a file before the list of
+     *  documentation blocks for defines
+     */
+    virtual QCString trDefineDocumentation()
+    { return "Makro Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for function prototypes
+     */
+    virtual QCString trFunctionPrototypeDocumentation()
+    { return "Fonksiyon Prototip Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for typedefs
+     */
+    virtual QCString trTypedefDocumentation()
+    { return "Typedef Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration types
+     */
+    virtual QCString trEnumerationTypeDocumentation()
+    { return "Enümerasyon Tipi Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for functions
+     */
+    virtual QCString trFunctionDocumentation()
+    { return "Fonksiyon Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for variables
+     */
+    virtual QCString trVariableDocumentation()
+    { return "Değişken Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace/group before 
+     *  the list of links to documented compounds
+     */
+    virtual QCString trCompounds()
+    { 
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Veri Yapıları"; 
+      }
+      else
+      {
+        return "Sınıflar"; 
+      }
+    }
+
+    /*! This is used in the standard footer of each page and indicates when 
+     *  the page was generated 
+     */
+    virtual QCString trGeneratedAt(const char *date,const char *projName)
+    { 
+      QCString result=projName+(QCString)" için "+date;
+      if (projName) result+=(QCString)" tarihinde ";
+      result+=(QCString)" üreten: ";
+      return result;
+    }
+    /*! This is part of the sentence used in the standard footer of each page.
+     */
+    virtual QCString trWrittenBy()
+    {
+      return "yazan";
+    }
+
+    /*! this text is put before a class diagram */
+    virtual QCString trClassDiagram(const char *clName)
+    {
+      return clName+(QCString)" için kalıtım şeması:";
+    }
+    
+    /*! this text is generated when the \\internal command is used. */
+    virtual QCString trForInternalUseOnly()
+    { return "İç kullanıma ayrılmıştır."; }
+
+    /*! this text is generated when the \\warning command is used. */
+    virtual QCString trWarning()
+    { return "Uyarı"; }
+
+    /*! this text is generated when the \\version command is used. */
+    virtual QCString trVersion()
+    { return "Sürüm"; }
+
+    /*! this text is generated when the \\date command is used. */
+    virtual QCString trDate()
+    { return "Tarih"; }
+
+    /*! this text is generated when the \\return command is used. */
+    virtual QCString trReturns()
+    { return "Döndürdüğü değer"; }
+
+    /*! this text is generated when the \\sa command is used. */
+    virtual QCString trSeeAlso()
+    { return "Ayrıca Bakınız"; }
+
+    /*! this text is generated when the \\param command is used. */
+    virtual QCString trParameters()
+    { return "Parametreler"; }
+
+    /*! this text is generated when the \\exception command is used. */
+    virtual QCString trExceptions()
+    { return "İstisnalar"; }
+    
+    /*! this text is used in the title page of a LaTeX document. */
+    virtual QCString trGeneratedBy()
+    { return "Oluşturan"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990307
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! used as the title of page containing all the index of all namespaces. */
+    virtual QCString trNamespaceList()
+    { return "Namespace Listesi"; }
+
+    /*! used as an introduction to the namespace list */
+    virtual QCString trNamespaceListDescription(bool extractAll)
+    {
+      QCString result="Tüm ";
+      if (!extractAll) result+="dokümante edilmiş ";
+      result+="namespace\'lerin kısa tanımlarıyla listesi aşağıdadır:";
+      return result;
+    }
+
+    /*! used in the class documentation as a header before the list of all
+     *  friends of a class
+     */
+    virtual QCString trFriends()
+    { return "Arkadaşları"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990405
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! used in the class documentation as a header before the list of all
+     * related classes 
+     */
+    virtual QCString trRelatedFunctionDocumentation()
+    { return "Arkadaş Ve İlgili Fonksiyon Dokümantasyonu"; }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990425
+//////////////////////////////////////////////////////////////////////////
+
+    /*! used as the title of the HTML page of a class/struct/union */
+    virtual QCString trCompoundReference(const char *clName,
+                                    ClassDef::CompoundType compType,
+                                    bool isTemplate)
+    {
+      QCString result=(QCString)clName;
+      switch(compType)
+      {
+        case ClassDef::Class:      result+=" Sınıf"; break;
+        case ClassDef::Struct:     result+=" Yapı(Struct)"; break;
+        case ClassDef::Union:      result+=" Birleşim(Union)"; break;
+        case ClassDef::Interface:  result+=" Arayüz(Interface)"; break;
+        case ClassDef::Protocol:   result+=" Protokol"; break;
+        case ClassDef::Category:   result+=" Kategori"; break;
+        case ClassDef::Exception:  result+=" İstisna"; break;
+      }
+      if (isTemplate) result+=" Şablon";
+      result+=" Referans";
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a file */
+    virtual QCString trFileReference(const char *fileName)
+    {
+      QCString result=fileName;
+      result+=" Dosya Referansı"; 
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a namespace */
+    virtual QCString trNamespaceReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+=" Namespace Referansı";
+      return result;
+    }
+    
+    virtual QCString trPublicMembers()
+    { return "Public Üye Fonksiyonlar"; }
+    virtual QCString trPublicSlots()
+    { return "Public Slotlar"; }
+    virtual QCString trSignals()
+    { return "Sinyaller"; }
+    virtual QCString trStaticPublicMembers()
+    { return "Statik Public Üye Fonksiyonlar"; }
+    virtual QCString trProtectedMembers()
+    { return "Korumalı Üye Fonksiyonlar"; }
+    virtual QCString trProtectedSlots()
+    { return "Korumalı Slotlar"; }
+    virtual QCString trStaticProtectedMembers()
+    { return "Statik Korumalı Üye Fonksiyonlar"; }
+    virtual QCString trPrivateMembers()
+    { return "Özel Üye Fonksiyonlar"; }
+    virtual QCString trPrivateSlots()
+    { return "Özel Slotlar"; }
+    virtual QCString trStaticPrivateMembers()
+    { return "Statik Özel Üye Fonksiyonlar"; }
+    
+    /*! this function is used to produce a comma-separated list of items.
+     *  use generateMarker(i) to indicate where item i should be put.
+     */
+    virtual QCString trWriteList(int numEntries)
+    {
+      QCString result;
+      int i;
+      // the inherits list contain `numEntries' classes
+      for (i=0;i<numEntries;i++) 
+      {
+        // use generateMarker to generate placeholders for the class links!
+        result+=generateMarker(i); // generate marker for entry i in the list 
+                                   // (order is left to right)
+        
+        if (i!=numEntries-1)  // not the last entry, so we need a separator
+        {
+          if (i<numEntries-2) // not the fore last entry 
+            result+=", ";
+          else                // the fore last entry
+            result+=" ve ";
+        }
+      }
+      return result; 
+    }
+    
+    /*! used in class documentation to produce a list of base classes,
+     *  if class diagrams are disabled.
+     */
+    virtual QCString trInheritsList(int numEntries)
+    {
+      return "Şu sınıflardan türemiştir : "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in class documentation to produce a list of super classes,
+     *  if class diagrams are disabled.
+     */
+    virtual QCString trInheritedByList(int numEntries)
+    {
+      return "Şu sınıfların atasıdır : "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in member documentation blocks to produce a list of 
+     *  members that are hidden by this one.
+     */
+    virtual QCString trReimplementedFromList(int numEntries)
+    {
+      return "Şu üyeleri yeniden tanımlar : "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in member documentation blocks to produce a list of
+     *  all member that overwrite the implementation of this member.
+     */
+    virtual QCString trReimplementedInList(int numEntries)
+    {
+      return "Şu üyeler tarafından yeniden tanımlanmıştır : "+trWriteList(numEntries)+".";
+    }
+
+    /*! This is put above each page as a link to all members of namespaces. */
+    virtual QCString trNamespaceMembers()
+    { return "Namespace Üyeleri"; }
+
+    /*! This is an introduction to the page with all namespace members */
+    virtual QCString trNamespaceMemberDescription(bool extractAll)
+    { 
+      QCString result="Bu liste tüm ";
+      if (!extractAll) result+="dokümante edilmiş ";
+      result+="namespace üyelerini listeler ve ";
+      if (extractAll) 
+        result+="her üye için üye dokümantasyonuna bağlar:";
+      else 
+        result+="ait olduğu namespace\'lere bağlar:";
+      return result;
+    }
+    /*! This is used in LaTeX as the title of the chapter with the 
+     *  index of all namespaces.
+     */
+    virtual QCString trNamespaceIndex()
+    { return "Namespace İndeksi"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all namespaces.
+     */
+    virtual QCString trNamespaceDocumentation()
+    { return "Namespace Dokümantasyonu"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990522
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used in the documentation before the list of all
+     *  namespaces in a file.
+     */
+    virtual QCString trNamespaces()
+    { return "Namespace\'ler"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990728
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is put at the bottom of a class documentation page and is
+     *  followed by a list of files that were used to generate the page.
+     */
+    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
+        bool single)
+    { // here s is one of " Class", " Struct" or " Union"
+      // single is true implies a single file
+      QCString result=(QCString)"Bu ";
+      switch(compType)
+      {
+        case ClassDef::Class:      result+="sınıf"; break;
+        case ClassDef::Struct:     result+="yapı(struct)"; break;
+        case ClassDef::Union:      result+="birleşim(union)"; break;
+        case ClassDef::Interface:  result+="arayüz(interface)"; break;
+        case ClassDef::Protocol:   result+="protokol"; break;
+        case ClassDef::Category:   result+="kategori"; break;
+        case ClassDef::Exception:  result+="istisna"; break;
+      }
+      result+=" için dokümantasyon aşağıdaki dosya";
+      if (single) result+=""; else result+="lar";
+      result+="dan üretilmiştir:";
+      return result;
+    }
+
+    /*! This is in the (quick) index as a link to the alphabetical compound
+     * list.
+     */
+    virtual QCString trAlphabeticalList()
+    { return "Alfabetik Liste"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-990901
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used as the heading text for the retval command. */
+    virtual QCString trReturnValues()
+    { return "Döndürdüğü değerler"; }
+
+    /*! This is in the (quick) index as a link to the main page (index.html)
+     */
+    virtual QCString trMainPage()
+    { return "Ana Sayfa"; }
+
+    /*! This is used in references to page that are put in the LaTeX 
+     *  documentation. It should be an abbreviation of the word page.
+     */
+    virtual QCString trPageAbbreviation()
+    { return "sf."; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-991003
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trDefinedAtLineInSourceFile()
+    {
+      return "@1 dosyasının @0 numaralı satırında tanımlanmıştır.";
+    }
+    virtual QCString trDefinedInSourceFile()
+    {
+      return "@0 dosyasında tanımlanmıştır.";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 0.49-991205
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trDeprecated()
+    {
+      return "Kullanımdan kalkmıştır";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.0.0
+//////////////////////////////////////////////////////////////////////////
+
+    /*! this text is put before a collaboration diagram */
+    virtual QCString trCollaborationDiagram(const char *clName)
+    {
+      return clName+(QCString)" için işbirliği (collaboration) şeması:";
+    }
+    /*! this text is put before an include dependency graph */
+    virtual QCString trInclDepGraph(const char *fName)
+    {
+      return fName+(QCString)" için içerme bağımlılık grafiği:";
+    }
+    /*! header that is put before the list of constructor/destructors. */
+    virtual QCString trConstructorDocumentation()
+    {
+      return "Constructor & Destructor Dokümantasyonu"; 
+    }
+    /*! Used in the file documentation to point to the corresponding sources. */
+    virtual QCString trGotoSourceCode()
+    {
+      return "Bu dosyanın kaynak koduna git.";
+    }
+    /*! Used in the file sources to point to the corresponding documentation. */
+    virtual QCString trGotoDocumentation()
+    {
+      return "Bu dosyanın dokümantasyonuna git.";
+    }
+    /*! Text for the \\pre command */
+    virtual QCString trPrecondition()
+    {
+      return "Ön şart";
+    }
+    /*! Text for the \\post command */
+    virtual QCString trPostcondition()
+    {
+      return "Son şart (Postcondition)";
+    }
+    /*! Text for the \\invariant command */
+    virtual QCString trInvariant()
+    {
+      return "Değişmez(Invariant)";
+    }
+    /*! Text shown before a multi-line variable/enum initialization */
+    virtual QCString trInitialValue()
+    {
+      return "İlk değer:";
+    }
+    /*! Text used the source code in the file index */
+    virtual QCString trCode()
+    {
+      return "kod";
+    }
+    virtual QCString trGraphicalHierarchy()
+    {
+      return "Grafiksel Sınıf Hiyerarşisi";
+    }
+    virtual QCString trGotoGraphicalHierarchy()
+    {
+      return "Grafiksel sınıf hiyerarşisine git";
+    }
+    virtual QCString trGotoTextualHierarchy()
+    {
+      return "Metinsel sınıf hiyerarşisine git";
+    }
+    virtual QCString trPageIndex()
+    {
+      return "Sayfa İndeksi";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.0
+//////////////////////////////////////////////////////////////////////////
+    
+    virtual QCString trNote()
+    {
+      return "Not";
+    }
+    virtual QCString trPublicTypes()
+    {
+      return "Public Tipler";
+    }
+    virtual QCString trPublicAttribs()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Veri Alanları";
+      }
+      else
+      {
+        return "Public Özellikler(attribute)";
+      }
+    }
+    virtual QCString trStaticPublicAttribs()
+    {
+      return "Statik Public Özellikler(attribute)";
+    }
+    virtual QCString trProtectedTypes()
+    {
+      return "Korumalı Tipler";
+    }
+    virtual QCString trProtectedAttribs()
+    {
+      return "Korumalı Özellikler(attribute)";
+    }
+    virtual QCString trStaticProtectedAttribs()
+    {
+      return "Statik Korumalı Attributes";
+    }
+    virtual QCString trPrivateTypes()
+    {
+      return "Özel Tipler";
+    }
+    virtual QCString trPrivateAttribs()
+    {
+      return "Özel Özellikler(attribute)";
+    }
+    virtual QCString trStaticPrivateAttribs()
+    {
+      return "Statik Özel Özellikler(attribute)";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.3
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a marker that is put before a \\todo item */
+    virtual QCString trTodo()
+    {
+      return "Yapılacak";
+    }
+    /*! Used as the header of the todo list */
+    virtual QCString trTodoList()
+    {
+      return "Yapılacaklar Listesi";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.4
+//////////////////////////////////////////////////////////////////////////
+
+    virtual QCString trReferencedBy()
+    {
+      return "Referans veren";
+    }
+    virtual QCString trRemarks()
+    {
+      return "Dipnotlar";
+    }
+    virtual QCString trAttention()
+    {
+      return "Dikkat";
+    }
+    virtual QCString trInclByDepGraph()
+    {
+      return "Bu şekil hangi dosyaların doğrudan ya da "
+             "dolaylı olarak bu dosyayı içerdiğini gösterir:";
+    }
+    virtual QCString trSince()
+    {
+      return "Şu zamandan beri";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.5
+//////////////////////////////////////////////////////////////////////////
+
+    /*! title of the graph legend page */
+    virtual QCString trLegendTitle()
+    {
+      return "Şekil Lejantı";
+    }
+    /*! page explaining how the dot graph's should be interpreted 
+     *  The %A in the text below are to prevent link to classes called "A".
+     */
+    virtual QCString trLegendDocs()
+    {
+      return 
+        "Bu dosya doxygen tarafından üretilen grafiklerin nasıl anlaşılacağını "
+        "açıklar.<p>\n"
+        "Aşağıdaki örneğe bakalım:\n"
+        "\\code\n"
+        "/*! Sadeleşme yüzünden görünmeyen sınıf */\n"
+        "class Invisible { };\n\n"
+        "/*! Sadeleşmiş sınıf, kalıtım ilişkisi gizli */\n"
+        "class Truncated : public Invisible { };\n\n"
+        "/* Doxygen yorumlarıyla dokümante edilmemiş sınıf */\n"
+        "class Undocumented { };\n\n"
+        "/*! Public kalıtımla türetilen sınıf */\n"
+        "class PublicBase : public Truncated { };\n\n"
+        "/*! Bir şablon sınıfı */\n"
+        "template<class T> class Templ { };\n\n"
+        "/*! Korumalı kalıtımla türetilen sınıf */\n"
+        "class ProtectedBase { };\n\n"
+        "/*! Özel kalıtımla türetilen sınıf */\n"
+        "class PrivateBase { };\n\n"
+        "/*! Türetilen sınıf tarafından kullanılan sınıf */\n"
+        "class Used { };\n\n"
+        "/*! Pekçok sınıftan türeyen bir sınıf */\n"
+        "class Inherited : public PublicBase,\n"
+        "                  protected ProtectedBase,\n"
+        "                  private PrivateBase,\n"
+        "                  public Undocumented,\n"
+        "                  public Templ<int>\n"
+        "{\n"
+        "  private:\n"
+        "    Used *m_usedClass;\n"
+        "};\n"
+        "\\endcode\n"
+        "Bu kod aşağıdaki şemayı oluşturur:"
+        "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+        "<p>\n"
+        "Yukarıdaki şemadaki kutular aşağıda açıklanmıştır:\n"
+        "<ul>\n"
+        "<li>%A dolu gri kutu şemanın ait olduğu yapı(struct) ya da sınıfı "
+        "gösterir.\n"
+        "<li>%A siyah çerçeveli bir kutu dokümante edilmiş bir yapı(struct) ya da sınıfı gösterir.\n"
+        "<li>%A gri çerçeveli bir kutu dokümante edilmemiş bir yapı(struct) ya da sınıfı gösterir.\n"
+        "<li>%A kırmızı çerçeveli bir kutu tüm kalıtım/içerme ilişkileri gösterilmemiş ve dokümante "
+        "edilmiş bir yapı(struct) ya da sınıfı gösterir. %A şema belirlenen sınırlara "
+        "sığmıyorsa sadeleştirilir.\n"
+        "</ul>\n"
+        "Okların anlamı aşağıdaki gibidir:\n"
+        "<ul>\n"
+        "<li>%A koyu mavi ok iki sınıf arasındaki public kalıtım ilişkisini "
+        "göstermekte kullanılır.\n"
+        "<li>%A koyu yeşil ok korumalı kalıtımı gösterir.\n"
+        "<li>%A koyu kırmızı ok özel kalıtımı gösterir.\n"
+        "<li>%A mor kesikli çizgi bir sınıfın diğeri tarafından içeriliyor ya da kullanılıyor "
+        "olduğunu gösterir. Ok işaret edilen sınıfın hangi değişken(ler) tarafından erişildiğini "
+        "gösteren etiketle işaretleniştir.\n"
+        "<li>%A Sarı kesikli çizgi şablondan üretilen bir sınıf ve ilgili şablon sınıfı "
+        "arasındaki ilişkiyi gösterir. Ok türeyen sınıfın şablon parametreleriyle "
+        "etiketlenmiştir.\n"
+        "</ul>\n";
+    }
+    /*! text for the link to the legend page */
+    virtual QCString trLegend()
+    {
+      return "lejant";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.0
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a test item */
+    virtual QCString trTest()
+    {
+      return "Test";
+    }
+    /*! Used as the header of the test list */
+    virtual QCString trTestList()
+    {
+      return "Test Listesi";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for KDE-2 IDL methods */
+    virtual QCString trDCOPMethods()
+    {
+      return "DCOP Üye Fonksiyonlar";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.2
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a section header for IDL properties */
+    virtual QCString trProperties()
+    {
+      return "Özellikler";
+    }
+    /*! Used as a section header for IDL property documentation */
+    virtual QCString trPropertyDocumentation()
+    {
+      return "Özellik Dokümantasyonu";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.4
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used for Java classes in the summary section of Java packages */
+    virtual QCString trClasses()
+    {
+      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+      {
+        return "Veri Yapıları";
+      }
+      else
+      {
+        return "Sınıflar";
+      }
+    }
+    /*! Used as the title of a Java package */
+    virtual QCString trPackage(const char *name)
+    {
+      return (QCString)"Paket "+name;
+    }
+    /*! Title of the package index page */
+    virtual QCString trPackageList()
+    {
+      return "Paket Listesi";
+    }
+    /*! The description of the package index page */
+    virtual QCString trPackageListDescription()
+    {
+      return "Paketler ve kısa tanımları (var ise):";
+    }
+    /*! The link name in the Quick links header for each page */
+    virtual QCString trPackages()
+    {
+      return "Paketler";
+    }
+    /*! Text shown before a multi-line define */
+    virtual QCString trDefineValue()
+    {
+      return "Değer:";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.5
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! Used as a marker that is put before a \\bug item */
+    virtual QCString trBug()
+    {
+      return "Hata";
+    }
+    /*! Used as the header of the bug list */
+    virtual QCString trBugList()
+    {
+      return "Hata Listesi";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.6
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as ansicpg for RTF file 
+     * 
+     * The following table shows the correlation of Charset name, Charset Value and 
+     * <pre>
+     * Codepage number:
+     * Charset Name       Charset Value(hex)  Codepage number
+     * ------------------------------------------------------
+     * DEFAULT_CHARSET           1 (x01)
+     * SYMBOL_CHARSET            2 (x02)
+     * OEM_CHARSET             255 (xFF)
+     * ANSI_CHARSET              0 (x00)            1252
+     * RUSSIAN_CHARSET         204 (xCC)            1251
+     * EE_CHARSET              238 (xEE)            1250
+     * GREEK_CHARSET           161 (xA1)            1253
+     * TURKISH_CHARSET         162 (xA2)            1254
+     * BALTIC_CHARSET          186 (xBA)            1257
+     * HEBREW_CHARSET          177 (xB1)            1255
+     * ARABIC _CHARSET         178 (xB2)            1256
+     * SHIFTJIS_CHARSET        128 (x80)             932
+     * HANGEUL_CHARSET         129 (x81)             949
+     * GB2313_CHARSET          134 (x86)             936
+     * CHINESEBIG5_CHARSET     136 (x88)             950
+     * </pre>
+     * 
+     */
+    virtual QCString trRTFansicp()
+    {
+      return "1254";
+    }
+    
+
+    /*! Used as ansicpg for RTF fcharset 
+     *  \see trRTFansicp() for a table of possible values.
+     */
+    virtual QCString trRTFCharSet()
+    {
+      return "162";
+    }
+
+    /*! Used as header RTF general index */
+    virtual QCString trRTFGeneralIndex()
+    {
+      return "İndeks";
+    }
+   
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trClass(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Sınıf" : "sınıf"));
+      if (!singular)  result+="lar";
+      return result; 
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trFile(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Dosya" : "dosya"));
+      if (!singular)  result+="lar";
+      return result; 
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trNamespace(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Namespace" : "namespace"));
+      if (!singular)  result+="\'ler";
+      return result; 
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trGroup(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Grup" : "grup"));
+      if (!singular)  result+="lar";
+      return result; 
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trPage(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Sayfa" : "sayfa"));
+      if (!singular)  result+="lar";
+      return result; 
+    }
+
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trMember(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Üye" : "üye"));
+      if (!singular)  result+="ler";
+      return result; 
+    }
+   
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trGlobal(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Global değişken" : "global değişken"));
+      if (!singular)  result+="ler";
+      return result; 
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.7
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is generated when the \\author command is used and
+     *  for the author section in man pages. */
+    virtual QCString trAuthor(bool first_capital, bool singular)
+    {                                                                         
+      QCString result((first_capital ? "Yazar" : "yazar"));
+      if (!singular)  result+="lar";
+      return result; 
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.11
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is put before the list of members referenced by a member
+     */
+    virtual QCString trReferences()
+    {
+      return "Referanslar";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.13
+//////////////////////////////////////////////////////////////////////////
+
+    /*! used in member documentation blocks to produce a list of 
+     *  members that are implemented by this one.
+     */
+    virtual QCString trImplementedFromList(int numEntries)
+    {
+      return "Şu üyeleri gerçekler: "+trWriteList(numEntries)+".";
+    }
+
+    /*! used in member documentation blocks to produce a list of
+     *  all members that implement this abstract member.
+     */
+    virtual QCString trImplementedInList(int numEntries)
+    {
+      return "Şu üyelerce gerçeklenir: "+trWriteList(numEntries)+".";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.16
+//////////////////////////////////////////////////////////////////////////
+
+    /*! used in RTF documentation as a heading for the Table
+     *  of Contents.
+     */
+    virtual QCString trRTFTableOfContents()
+    {
+      return "İçindekiler";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.17
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as the header of the list of item that have been 
+     *  flagged deprecated 
+     */
+    virtual QCString trDeprecatedList()
+    {
+      return "Kullanımdan Kalkanlar Listesl";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.18
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a header for declaration section of the events found in 
+     * a C# program
+     */
+    virtual QCString trEvents()
+    {
+      return "Olaylar";
+    }
+    /*! Header used for the documentation section of a class' events. */
+    virtual QCString trEventDocumentation()
+    {
+      return "Olay Dokümantasyonu";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used as a heading for a list of Java class types with package scope.
+     */
+    virtual QCString trPackageTypes()
+    { 
+      return "Paket Tipleri";
+    }
+    /*! Used as a heading for a list of Java class fonksiyonlar with package 
+     * scope. 
+     */
+    virtual QCString trPackageMembers()
+    { 
+      return "Paket Fonksiyonlar";
+    }
+    /*! Used as a heading for a list of static Java class fonksiyonlar with 
+     *  package scope.
+     */
+    virtual QCString trStaticPackageMembers()
+    { 
+      return "Static Pakat Fonksiyonları";
+    }
+    /*! Used as a heading for a list of Java class variables with package 
+     * scope.
+     */
+    virtual QCString trPackageAttribs()
+    { 
+      return "Packet Özellikleri(attribute)";
+    }
+    /*! Used as a heading for a list of static Java class variables with 
+     * package scope.
+     */
+    virtual QCString trStaticPackageAttribs()
+    { 
+      return "Statik Packet Özellikleri(attribute)";
+    }
+    
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! Used in the quick index of a class/file/namespace member list page 
+     *  to link to the unfiltered list of all members.
+     */
+    virtual QCString trAll()
+    {
+      return "Tümü";
+    }
+    /*! Put in front of the call graph for a function. */
+    virtual QCString trCallGraph()
+    {
+      return "Bu fonksiyon için çağırılma şeması:";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.3
+//////////////////////////////////////////////////////////////////////////
+
+    /*! When the search engine is enabled this text is put in the header 
+     *  of each page before the field where one can enter the text to search 
+     *  for. 
+     */
+    virtual QCString trSearchForIndex()
+    {
+      return "Arama yapılacak metin";
+    }
+    /*! This string is used as the title for the page listing the search
+     *  results.
+     */
+    virtual QCString trSearchResultsTitle()
+    {
+      return "Arama sonuçları";
+    }
+    /*! This string is put just before listing the search results. The
+     *  text can be different depending on the number of documents found.
+     *  Inside the text you can put the special marker $num to insert
+     *  the number representing the actual number of search results.
+     *  The @a numDocuments parameter can be either 0, 1 or 2, where the 
+     *  value 2 represents 2 or more matches. HTML markup is allowed inside
+     *  the returned string.
+     */
+    virtual QCString trSearchResults(int numDocuments)
+    {
+      if (numDocuments==0)
+      {
+        return "Üzgünüm, sorgunuzla eşleşen doküman bulunamadı.";
+      }
+      else if (numDocuments==1)
+      {
+        return "Sorgunuzla eşleşen <b>1</b> doküman bulundu.";
+      }
+      else 
+      {
+        return "Sorgunuzla eşleşen <b>$num</b> doküman bulundu. "
+               "Önce en iyi eşleşmeler gösteriliyor.";
+      }
+    }
+    /*! This string is put before the list of matched words, for each search 
+     *  result. What follows is the list of words that matched the query.
+     */
+    virtual QCString trSearchMatches()
+    {
+      return "Eşleşme:";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.8
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used in HTML as the title of page with source code for file filename
+     */
+    virtual QCString trSourceFile(QCString& filename)
+    {
+      return filename + " Kaynak Dosyası";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.9
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used as the name of the chapter containing the directory
+     *  hierarchy.
+     */
+    virtual QCString trDirIndex()
+    { return "Dizin Hiyerarşisi"; }
+
+    /*! This is used as the name of the chapter containing the documentation
+     *  of the directories.
+     */
+    virtual QCString trDirDocumentation()
+    { return "Dizin Dokümantasyonu"; }
+
+    /*! This is used as the title of the directory index and also in the
+     *  Quick links of an HTML page, to link to the directory hierarchy.
+     */
+    virtual QCString trDirectories()
+    { return "Dizinler"; }
+
+    /*! This returns a sentences that introduces the directory hierarchy. 
+     *  and the fact that it is sorted alphabetically per level
+     */
+    virtual QCString trDirDescription()
+    { return "Bu dizin hiyerarşisi tamamen olmasa da yaklaşık "
+             "olarak alfabetik sıraya konulmuştur:";
+    }
+
+    /*! This returns the title of a directory page. The name of the
+     *  directory is passed via \a dirName.
+     */
+    virtual QCString trDirReference(const char *dirName)
+    { QCString result=dirName; result+=" Dizin Referansı"; return result; }
+
+    /*! This returns the word directory with or without starting capital
+     *  (\a first_capital) and in sigular or plural form (\a singular).
+     */
+    virtual QCString trDir(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Dizin" : "dizin"));
+      if (!singular) result+="ler";
+      return result; 
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.4.1
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This text is added to the documentation when the \\overload command
+     *  is used for a overloaded function.
+     */
+    virtual QCString trOverloadText()
+    {
+       return "Bu çok anlamlı (overloaded) bir üye fonksiyondur, "
+              "tamamlık açısından burada verilmektedir. Yukarıdaki fonksiyondan "
+              "sadece aldığı argüman(lar) açısından farklıdır.";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.4.6
+//////////////////////////////////////////////////////////////////////////
+
+    /*! This is used to introduce a caller (or called-by) graph */
+    virtual QCString trCallerGraph()
+    {
+      return "Bu fonksiyon için çağırılma şeması:";
+    }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for enumeration values
+     */
+    virtual QCString trEnumerationValueDocumentation()
+    { return "Enümerasyon Dokümantasyonu"; }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.5.4 (mainly for Fortran)
+//////////////////////////////////////////////////////////////////////////
+    
+    /*! header that is put before the list of member subprograms (Fortran). */
+    virtual QCString trMemberFunctionDocumentationFortran()
+    { return "Üye Fonksiyon/Subroutine Dokümantasyonu"; }
+
+    /*! This is put above each page as a link to the list of annotated data types (Fortran). */    
+    virtual QCString trCompoundListFortran()
+    { return "Veri Tipleri Listesi"; }
+
+    /*! This is put above each page as a link to all members of compounds (Fortran). */
+    virtual QCString trCompoundMembersFortran()
+    { return "Veri Alanları"; }
+
+    /*! This is an introduction to the annotated compound list (Fortran). */
+    virtual QCString trCompoundListDescriptionFortran()
+    { return "Kısa tanımlarıyla veri tipleri:"; }
+
+    /*! This is an introduction to the page with all data types (Fortran). */
+    virtual QCString trCompoundMembersDescriptionFortran(bool extractAll)
+    {
+      QCString result="Bu liste tüm ";
+      if (!extractAll)
+      {
+        result+="dokümante edilmiş ";
+      }
+      result+="veri tiplerini içerir ve ";
+      if (!extractAll) 
+      {
+         result+="her üyeyi veri yapısı dokümantasyonuna bağlar:";
+      }
+      else 
+      {
+         result+="ait oldukları veri tiplerine bağlar:";
+      }
+      return result;
+    }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     * annotated compound index (Fortran).
+     */
+    virtual QCString trCompoundIndexFortran()
+    { return "Veri Tipi İndeksi"; }
+
+    /*! This is used in LaTeX as the title of the chapter containing
+     *  the documentation of all data types (Fortran).
+     */
+    virtual QCString trTypeDocumentation()
+    { return "Veri Tipi Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file as a header before the 
+     *  list of (global) subprograms (Fortran).
+     */
+    virtual QCString trSubprograms()
+    { return "Fonksiyonlar/Subroutine\'ler"; }
+
+    /*! This is used in the documentation of a file/namespace before the list 
+     *  of documentation blocks for subprograms (Fortran)
+     */
+    virtual QCString trSubprogramDocumentation()
+    { return "Fonksiyon/Subroutine Dokümantasyonu"; }
+
+    /*! This is used in the documentation of a file/namespace/group before 
+     *  the list of links to documented compounds (Fortran)
+     */
+     virtual QCString trDataTypes()
+    { return "Veri Tipleri"; }
+    
+    /*! used as the title of page containing all the index of all modules (Fortran). */
+    virtual QCString trModulesList()
+    { return "Modüller Listesi"; }
+
+    /*! used as an introduction to the modules list (Fortran) */
+    virtual QCString trModulesListDescription(bool extractAll)
+    {
+      QCString result="Bu liste tüm ";
+      if (!extractAll) result+="dokümante edilmiş ";
+      result+="modülleri kısa tanımlarıya içerir:";
+      return result;
+    }
+
+    /*! used as the title of the HTML page of a module/type (Fortran) */
+    virtual QCString trCompoundReferenceFortran(const char *clName,
+                                    ClassDef::CompoundType compType,
+                                    bool isTemplate)
+    {
+      QCString result=(QCString)clName;
+      switch(compType)
+      {
+        case ClassDef::Class:      result+=" Modül"; break;
+        case ClassDef::Struct:     result+=" Tip"; break;
+        case ClassDef::Union:      result+=" Birleşim(Union)"; break;
+        case ClassDef::Interface:  result+=" Arayüz"; break;
+        case ClassDef::Protocol:   result+=" Protokol"; break;
+        case ClassDef::Category:   result+=" Kategori"; break;
+        case ClassDef::Exception:  result+=" İstisna"; break;
+      }
+      if (isTemplate) result+=" Şablon";
+      result+=" Referans";
+      return result;
+    }
+    /*! used as the title of the HTML page of a module (Fortran) */
+    virtual QCString trModuleReference(const char *namespaceName)
+    {
+      QCString result=namespaceName;
+      result+=" Modül Referansı";        
+      return result;
+    }
+    
+    /*! This is put above each page as a link to all members of modules. (Fortran) */
+    virtual QCString trModulesMembers()
+    { return "Modül Üyeleri"; }
+
+    /*! This is an introduction to the page with all modules members (Fortran) */
+    virtual QCString trModulesMemberDescription(bool extractAll)
+    { 
+      QCString result="Bu liste tüm ";
+      if (!extractAll) result+="dokümante edilmiş ";
+      result+="modül üyelerini içerir ve ";
+      if (extractAll) 
+      {
+        result+="her üyeyi modül dokümantasyonuna bağlar:";
+      }
+      else 
+      {
+        result+="ait oldukları modüllere bağlar:";
+      }
+      return result;
+    }
+
+    /*! This is used in LaTeX as the title of the chapter with the 
+     *  index of all modules (Fortran).
+     */
+    virtual QCString trModulesIndex()
+    { return "Modüller Indeksi"; }
+    
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trModule(bool first_capital, bool singular)
+    {       
+      QCString result((first_capital ? "Modül" : "modül"));
+      if (!singular)  result+="ler";
+      return result; 
+    }
+    /*! This is put at the bottom of a module documentation page and is
+     *  followed by a list of files that were used to generate the page.
+     */
+    virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType,
+        bool single)
+    { // here s is one of " Module", " Struct" or " Union"
+      // single is true implies a single file
+      QCString result=(QCString)"Bu ";
+      switch(compType)
+      {
+        case ClassDef::Class:      result+="mdoül"; break;
+        case ClassDef::Struct:     result+="tip"; break;
+        case ClassDef::Union:      result+="birleşim(union)"; break;
+        case ClassDef::Interface:  result+="arayüz"; break;
+        case ClassDef::Protocol:   result+="protokol"; break;
+        case ClassDef::Category:   result+="kategori"; break;
+        case ClassDef::Exception:  result+="istisna"; break;
+      }
+      result+=" için dokümantasyon aşağıdaki dosya";
+      if (single) result+=":"; else result+="lar";
+      result="dan üretilmiştir:";
+      return result;
+    }
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trType(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Tip" : "tip"));
+      if (!singular)  result+="ler";
+      return result; 
+    }
+    /*! This is used for translation of the word that will possibly
+     *  be followed by a single name or by a list of names 
+     *  of the category.
+     */
+    virtual QCString trSubprogram(bool first_capital, bool singular)
+    { 
+      QCString result((first_capital ? "Alt program" : "alt program"));
+      if (!singular)  result+="lar";
+      return result; 
+    }
+
+    /*! C# Type Constraint list */
+    virtual QCString trTypeConstraints()
+    {
+      return "Tip Sınırlamaları";
+    }
+
+};
+
+#endif
diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj
index 9d8f226..0edc633 100644
--- a/winbuild/Doxygen.vcproj
+++ b/winbuild/Doxygen.vcproj
@@ -180,7 +180,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/LTCG"
-				AdditionalDependencies="qtools.lib libpng.lib zlib.lib iconv.lib"
+				AdditionalDependencies="qtools.lib libpng.lib zlib.lib iconv.lib shell32.lib"
 				OutputFile="..\bin\doxygen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/winbuild/Doxywizard.vcproj b/winbuild/Doxywizard.vcproj
index 34722cb..e211b1c 100644
--- a/winbuild/Doxywizard.vcproj
+++ b/winbuild/Doxywizard.vcproj
@@ -2,10 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="Doxywizard"
-	ProjectGUID="{6E404596-D6B6-41A5-8F25-C52921A7C1BF}"
-	RootNamespace="Doxywizard"
-	Keyword="Win32Proj"
+	Name="doxywizard"
+	ProjectGUID="{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}"
+	Keyword="Qt4VSv1.0"
 	>
 	<Platforms>
 		<Platform
@@ -13,34 +12,23 @@
 		/>
 	</Platforms>
 	<ToolFiles>
-		<ToolFile
-			RelativePath=".\moc.rules"
-		/>
-		<ToolFile
-			RelativePath=".\Lex.rules"
-		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\bin\Debug"
-			IntermediateDirectory="$(ConfigurationName)\Doxywizard"
+			OutputDirectory="."
+			IntermediateDirectory="obj\"
 			ConfigurationType="1"
-			CharacterSet="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="moc"
-			/>
-			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="Lex"
-			/>
-			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
@@ -48,39 +36,51 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(QTDIR)\include;..\src;."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;NODEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
+				Optimization="4"
+				AdditionalIncludeDirectories="&quot;..\..\..\Qt\4.4.3\include\QtCore&quot;,&quot;..\..\..\Qt\4.4.3\include\QtCore&quot;,&quot;..\..\..\Qt\4.4.3\include\QtGui&quot;,&quot;..\..\..\Qt\4.4.3\include\QtGui&quot;,&quot;..\..\..\Qt\4.4.3\include\QtXml&quot;,&quot;..\..\..\Qt\4.4.3\include\QtXml&quot;,&quot;..\..\..\Qt\4.4.3\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;c:\Qt\4.4.3\include\ActiveQt&quot;,&quot;..\addon\doxywizard\moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005"
+				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
+				GeneratePreprocessedFile="0"
+				ExceptionHandling="1"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="false"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="obj\"
+				ObjectFile="obj\"
+				ProgramDataBaseFileName=".\"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(QTDIR)\lib\qt-mt.lib $(QTDIR)\lib\qtmain.lib iconv.lib ws2_32.lib winmm.lib gdi32.lib imm32.lib advapi32.lib comdlg32.lib shell32.lib winspool.lib"
-				OutputFile="..\bin\Debug\doxywizard.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
+				IgnoreImportLibrary="true"
+				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
+				AdditionalDependencies="c:\Qt\4.4.3\lib\qtmaind.lib c:\Qt\4.4.3\lib\QtXmld.lib c:\Qt\4.4.3\lib\QtGuid.lib c:\Qt\4.4.3\lib\QtCored.lib kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib msimg32.lib"
+				OutputFile="debug\doxywizard.exe"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="c:\Qt\4.4.3\lib"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile=""
 				SubSystem="2"
-				TargetMachine="1"
+				LinkTimeCodeGeneration="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -109,25 +109,19 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\bin"
-			IntermediateDirectory="$(ConfigurationName)\Doxywizard"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="obj\"
 			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="moc"
-			/>
-			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="Lex"
-			/>
-			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
@@ -135,41 +129,54 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(QTDIR)\include;..\src;."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;NODEBUG"
+				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
+				Optimization="2"
+				AdditionalIncludeDirectories="&quot;..\..\..\Qt\4.4.3\include\QtCore&quot;,&quot;..\..\..\Qt\4.4.3\include\QtCore&quot;,&quot;..\..\..\Qt\4.4.3\include\QtGui&quot;,&quot;..\..\..\Qt\4.4.3\include\QtGui&quot;,&quot;..\..\..\Qt\4.4.3\include\QtXml&quot;,&quot;..\..\..\Qt\4.4.3\include\QtXml&quot;,&quot;..\..\..\Qt\4.4.3\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;c:\Qt\4.4.3\include\ActiveQt&quot;,&quot;..\addon\doxywizard\moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_NO_DEBUG,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
+				GeneratePreprocessedFile="0"
+				ExceptionHandling="1"
 				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="false"
+				RuntimeTypeInfo="true"
+				AssemblerListingLocation="obj\"
+				ObjectFile="obj\"
+				ProgramDataBaseFileName=".\"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4267"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_NO_DEBUG,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(QTDIR)\lib\qt-mt.lib $(QTDIR)\lib\qtmain.lib iconv.lib ws2_32.lib winmm.lib gdi32.lib imm32.lib advapi32.lib comdlg32.lib shell32.lib winspool.lib"
+				IgnoreImportLibrary="true"
+				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot; &quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
+				AdditionalDependencies="c:\Qt\4.4.3\lib\qtmain.lib c:\Qt\4.4.3\lib\QtXml.lib c:\Qt\4.4.3\lib\QtGui.lib c:\Qt\4.4.3\lib\QtCore.lib kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib msimg32.lib"
 				OutputFile="..\bin\doxywizard.exe"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="c:\Qt\4.4.3\lib"
 				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
+				IgnoreDefaultLibraryNames="libcmtd.lib"
 				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol=""
-				TargetMachine="1"
+				LinkTimeCodeGeneration="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -202,34 +209,10 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\src\config.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\config.l"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="Lex"
-						CommandLine="flex -PconfigYY [AllOptions] [AdditionalOptions] [inputs]"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="Lex"
-						CommandLine="flex -PconfigYY [AllOptions] [AdditionalOptions] [inputs]"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\addon\doxywizard\doxywizard.cpp"
 				>
 			</File>
@@ -254,98 +237,346 @@
 				>
 			</File>
 			<File
-				RelativePath=".\moc_doxywizard.cpp"
+				RelativePath="..\src\version.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\moc_expert.cpp"
+				RelativePath="..\addon\doxywizard\wizard.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\moc_input.cpp"
+				RelativePath="..\addon\doxywizard\config.h"
 				>
 			</File>
 			<File
-				RelativePath=".\moc_inputbool.cpp"
+				RelativePath="..\addon\doxywizard\doxywizard.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\doxywizard.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o moc\moc_doxywizard.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\doxywizard.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_doxywizard.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\doxywizard.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o moc\moc_doxywizard.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\doxywizard.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_doxywizard.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\moc_inputint.cpp"
+				RelativePath="..\addon\doxywizard\expert.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\expert.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o moc\moc_expert.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\expert.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_expert.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\expert.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o moc\moc_expert.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\expert.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_expert.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\moc_inputstring.cpp"
+				RelativePath="..\addon\doxywizard\helplabel.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\helplabel.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o moc\moc_helplabel.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\helplabel.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_helplabel.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\helplabel.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o moc\moc_helplabel.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\helplabel.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_helplabel.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\moc_inputstrlist.cpp"
+				RelativePath="..\addon\doxywizard\inputbool.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputbool.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o moc\moc_inputbool.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputbool.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputbool.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputbool.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o moc\moc_inputbool.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputbool.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputbool.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\portable.cpp"
+				RelativePath="..\addon\doxywizard\inputint.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputint.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o moc\moc_inputint.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputint.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputint.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputint.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o moc\moc_inputint.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputint.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputint.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\version.cpp"
+				RelativePath="..\addon\doxywizard\inputstring.h"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputstring.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o moc\moc_inputstring.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputstring.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputstring.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputstring.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o moc\moc_inputstring.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputstring.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputstring.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\addon\doxywizard\inputstrlist.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputstrlist.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o moc\moc_inputstrlist.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputstrlist.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputstrlist.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\inputstrlist.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o moc\moc_inputstrlist.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\inputstrlist.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_inputstrlist.cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\addon\doxywizard\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\addon\doxywizard\wizard.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\wizard.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o moc\moc_wizard.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\wizard.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_wizard.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="MOC ..\addon\doxywizard\wizard.h"
+						CommandLine="C:\Qt\4.4.3\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtCore&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtGui&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include\QtXml&quot; -I&quot;..\..\..\Qt\4.4.3\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;c:\Qt\4.4.3\include\ActiveQt&quot; -I&quot;..\addon\doxywizard\moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I..\..\..\Qt\4.4.3\mkspecs\win32-msvc2005 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o moc\moc_wizard.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\wizard.h;C:\Qt\4.4.3\bin\moc.exe"
+						Outputs="moc\moc_wizard.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			Name="Generated Files"
+			Filter="cpp;c;cxx;moc;h;def;odl;idl;res;"
+			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"
 			>
 			<File
-				RelativePath="..\addon\doxywizard\doxywizard.h"
+				RelativePath="config_lex.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\expert.h"
+				RelativePath="moc\moc_doxywizard.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\iconv.h"
+				RelativePath="moc\moc_expert.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\input.h"
+				RelativePath="moc\moc_helplabel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\inputbool.h"
+				RelativePath="moc\moc_inputbool.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\inputint.h"
+				RelativePath="moc\moc_inputint.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\inputstring.h"
+				RelativePath="moc\moc_inputstring.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\inputstrlist.h"
+				RelativePath="moc\moc_inputstrlist.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\portable.h"
+				RelativePath="moc\moc_wizard.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\qtbc.h"
+				RelativePath="rcc\qrc_doxywizard.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Lex / Yacc Files"
+			Filter="l;y"
+			UniqueIdentifier="{E12AE0D2-192F-4d59-BD23-7D3FA58D3183}"
+			ParseFiles="false"
+			>
 			<File
-				RelativePath="..\addon\doxywizard\version.h"
+				RelativePath="..\addon\doxywizard\config.l"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Lex ..\addon\doxywizard\config.l"
+						CommandLine="flex -Pconfig ..\addon\doxywizard\config.l &amp;&amp; 	 del config_lex.cpp &amp;&amp; 	 move lex.config.c config_lex.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\config.l;flex"
+						Outputs="config_lex.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Lex ..\addon\doxywizard\config.l"
+						CommandLine="flex -Pconfig ..\addon\doxywizard\config.l &amp;&amp; 	 del config_lex.cpp &amp;&amp; 	 move lex.config.c config_lex.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\config.l;flex"
+						Outputs="config_lex.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
-			Name="Resources"
+			Name="Resource Files"
+			Filter="qrc;*"
+			UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}"
+			ParseFiles="false"
 			>
 			<File
-				RelativePath="..\addon\doxywizard\doxywizard.res"
+				RelativePath="..\addon\doxywizard\doxywizard.qrc"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="RCC ..\addon\doxywizard\doxywizard.qrc"
+						CommandLine="C:\Qt\4.4.3\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\doxywizard.qrc;C:\Qt\4.4.3\bin\rcc.exe"
+						Outputs="rcc\qrc_doxywizard.cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="RCC ..\addon\doxywizard\doxywizard.qrc"
+						CommandLine="C:\Qt\4.4.3\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"
+						AdditionalDependencies="..\addon\doxywizard\doxywizard.qrc;C:\Qt\4.4.3\bin\rcc.exe"
+						Outputs="rcc\qrc_doxywizard.cpp"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>