Fix logic and cleanup dead code

Author: doxygen

addon/doxywizard/CMakeLists.txt

@@ -150,7 +150,7 @@ optiontranslations.h
 qt_add_resources(doxywizard_RESOURCES_RCC doxywizard.qrc)
 
 # Generate localized config.qrc
-set(CONFIG_QRC_CONTENT "<!DOCTYPE RCC>\n<RCC version=\"1.0\">\n<qresource prefix=\"/\">\n")
+set(CONFIG_QRC_CONTENT "<!DOCTYPE RCC>\n<RCC version=\"1.0\">\n<qresource prefix=\"/config\">\n")
 string(APPEND CONFIG_QRC_CONTENT "  <file alias=\"config.xml\">${PROJECT_SOURCE_DIR}/src/config.xml</file>\n")
 file(GLOB LANG_CONFIG_FILES CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/src/translations/config_*.xml")
 foreach(lang_file ${LANG_CONFIG_FILES})
@@ -227,6 +227,7 @@ ${GENERATED_SRC_WIZARD}/config_doxyw.l.h
 ${GENERATED_SRC_WIZARD}/configdoc.cpp
 ${doxywizard_MOC}
 ${doxywizard_RESOURCES_RCC}
+${doxywizard_CONFIG_RESOURCES}
 ${doxywizard_TRANSLATION_RESOURCES}
 ${doxywizard_QM_FILES}
 ${PROJECT_SOURCE_DIR}/templates/icon/doxygen.rc

addon/doxywizard/README

@@ -1,3 +1,3 @@
 Doxywizard is a graphical front-end to read/edit/write doxygen configuration 
-files and to launch doxygen. It requires Qt version 4.3 or higher.
+files and to launch doxygen. It requires Qt version 5 or higher.
 

addon/doxywizard/doxywizard.qrc

@@ -1,6 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/">
-  <file alias="config.xml">../../src/config.xml</file>
   <file>images/add.svg</file>
   <file>images/del.svg</file>
   <file>images/file.svg</file>

addon/doxywizard/expert.cpp

@@ -270,18 +270,20 @@ void Expert::loadConfigXml()
 
   if (langCode != QLatin1String("en"))
   {
-    configPath = SA(":/config_") + langCode + SA(".xml");
+    configPath = SA(":/config/config_") + langCode + SA(".xml");
     QFile langFile(configPath);
     if (!langFile.exists())
     {
-      configPath = SA(":/config.xml");
+      configPath = SA(":/config/config.xml");
     }
   }
   else
   {
-    configPath = SA(":/config.xml");
+    configPath = SA(":/config/config.xml");
   }
 
+  if (m_configLoaded==configPath) return; // already loaded
+
   QFile file(configPath);
   QString err;
   int errLine,errCol;
@@ -301,6 +303,7 @@ void Expert::loadConfigXml()
     }
   }
   m_rootElement = configXml.documentElement();
+  m_configLoaded = configPath;
 }
 
 Expert::~Expert()
@@ -595,7 +598,7 @@ static QString getDocsForNode(const QDomElement &child)
     QString dependsOn = child.attribute(SA("depends"));
     if (!docs.endsWith(SA("<br/>"))) docs += SA("<br/>");
     docs += SA("<br/>");
-    docs+=SA(" ")+Expert::tr("This tag requires that the tag %1 is set to <code>YES</code>.").arg(SA("\\ref cfg_")+dependsOn.toLower()+SA(" \"")+dependsOn.toUpper()+SA("\""));
+    docs += SA(" ")+Expert::tr("This tag requires that the tag %1 is set to <code>YES</code>.").arg(SA("\\ref cfg_")+dependsOn.toLower()+SA(" \"")+dependsOn.toUpper()+SA("\""));
   }
 
   // Convert Doxygen markup to HTML
@@ -1154,5 +1157,7 @@ void Expert::retranslateUi()
   createTopics(m_rootElement);
 
   m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(0));
+
+  addConfigDocs(this);
 }
 

addon/doxywizard/expert.h

@@ -88,6 +88,7 @@ class Expert : public QSplitter, public DocIntf
     bool                     m_inShowHelp;
     QString                  m_header;
     TranslationManager      *m_translationManager;
+    QString                  m_configLoaded;
 };
 
 #endif

addon/doxywizard/input.h

@@ -35,7 +35,6 @@ class Input
     virtual void update() = 0;
     virtual Kind kind() const = 0;
     virtual QString docs() const = 0;
-    virtual void setDocs(const QString &docs) = 0;
     virtual QString id() const = 0;
     virtual QString templateDocs() const = 0;
     virtual void addDependency(Input *option) = 0;

addon/doxywizard/inputbool.h

@@ -33,7 +33,6 @@ class InputBool : public QObject, public Input
     void update();
     Kind kind() const { return Bool; }
     QString docs() const { return m_docs; }
-    void setDocs(const QString &docs) { m_docs = docs; }
     QString id() const { return m_id; }
     QString templateDocs() const { return m_tdocs; }
     void addDependency(Input *option) { m_dependencies+=option; }

addon/doxywizard/inputobsolete.h

@@ -23,7 +23,6 @@ class InputObsolete : public Input
     void update()                {}
     Kind kind() const            { return Obsolete; }
     QString docs() const         { return QString(); }
-    void setDocs(const QString &) {}
     QString id() const           { return m_id; }
     QString templateDocs() const { return QString(); }
     void addDependency(Input *)  {}

addon/doxywizard/inputstring.h

@@ -54,7 +54,6 @@ class InputString : public QObject, public Input
     Kind kind() const { return String; }
     StringMode stringMode() const { return m_sm; }
     QString docs() const { return m_docs; }
-    void setDocs(const QString &docs) { m_docs = docs; }
     QString id() const { return m_id; }
     QString templateDocs() const { return m_tdocs; }
     void addDependency(Input *) { Q_ASSERT(false); }

addon/doxywizard/inputstrlist.h

@@ -45,7 +45,6 @@ class InputStrList : public QObject, public Input
     void update();
     Kind kind() const { return StrList; }
     QString docs() const { return m_docs; }
-    void setDocs(const QString &docs) { m_docs = docs; }
     QString id() const { return m_id; }
     QString templateDocs() const { return m_tdocs; }
     void addDependency(Input *) { Q_ASSERT(false); }