Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

addon/doxywizard/expert.cpp

@@ -856,16 +856,9 @@ QString Expert::getDocsForNode(const QDomElement &child) const
   {
     if (!docs.endsWith(SA("<br/>"))) docs += SA("<br/>");
     docs+=SA("<br/>");
-    if (child.hasAttribute(SA("altdefval")))
-    {
-      docs+=SA(" ")+m_messages[SA("defsysdep")];
-    }
-    else
-    {
-      QString defval = child.attribute(SA("defval"));
-      QString valStr = (defval==SA("1")?SA("YES"):SA("NO"));
-      docs+=SA(" ")+m_messages[SA("defvalcode")].arg(valStr);
-    }
+    QString defval = child.attribute(SA("defval"));
+    QString valStr = (defval==SA("1")?SA("YES"):SA("NO"));
+    docs+=SA(" ")+m_messages[SA("defvalcode")].arg(valStr);
   }
   else if (type==SA("list"))
   {

doc/CMakeLists.txt

@@ -76,9 +76,11 @@ set(DOC_FILES
     doxygen_manual_chm.css
     doxygen_usage.dox
     doxywizard_expert.png
+    doxywizard_expert_search.png
     doxywizard_main.png
     doxywizard_menu_file.png
     doxywizard_menu_settings.png
+    doxywizard_language.png
     doxywizard_menu_help.png
     doxywizard_page1.png
     doxywizard_page2.png

doc/doxywizard_expert.png

@@ -130,21 +130,34 @@ is needed. This needs to be installed separately.
 
 The Expert tab is divided into a number of panes:
 <dl>
-<dt>Top left pane<dd>The Topics pane (i.e. sections in the
+<dt>Top pane<dd>The search input field
+<dt>Bottom left pane<dd>The Topics pane (i.e. sections in the
 configuration file) that are available. By clicking on a topic the
-corresponding settings will appear in the Right pane.
-<dt>Bottom left pane<dd>The help pane, this will be updated when one
-hovers over the name of a setting in the Right pane.
-<dt>Right pane<dd>The Settings pane, in this pane you will find the
-settings that are available for the selected topic. In case the name for a setting is colored
-red, the setting has a non-default value.
+corresponding settings will appear in the Bottom right pane. Each topic has a small tooltip
+with a small description.
+<dt>Bottom right pane<dd>The Settings pane, in this pane you will find the
+settings that are available for the selected topic / selected search. In case the name
+for a setting is colored red, the setting has a non-default value.
 In case a setting is grayed out, the setting is depending on another setting that is disabled.
-Which setting it depends on is indicated in the help pane on the bottom left.
+Which setting it depends on is indicated in the help information (below the setting or in case
+when "Hide documentation" s set in the tooltip of the settingo).
 </dl>
 
+
+Overview: 
 \image html doxywizard_expert.png "Some options from the Expert tab"
 \image latex doxywizard_expert.png "Some options from the Expert tab" width=15cm
 
+The search field:
+\image html doxywizard_expert_search.png "Search input field" 
+\image latex doxywizard_expert_search.png "Search input field" width=15cm
+
+The text entered in this field is searched in the name of the settings and in the documentation 
+of the settings, only the settings that match the search text will will be shown in the bottom left pane
+and in the bottom right pane. In the bottom right pane the found text will be highlighted (in case of 
+"Hide documentation" set the highlighting will take place in the tooltip.
+
+
 The representation of the input field depends on the type of the configuration option.
 <ul>
 <li>For each boolean option (those options that are answered with `YES` or
@@ -278,6 +291,13 @@ The file menu with a couple of useful items for loading and saving settings.
 <dt>Use current settings at startup<dd>Stores the current configuration settings as the
     default to use next time the GUI is started. You will be asked to
     confirm the action.
+<dt>Hide documentation<dd>When set a check-mark appears in front of the setting and in the bottom right panel
+    of the expert tab the documentation is not shown but shown as a toltip.
+<dt>Language<dd>Select the language in which the items in the doxywizard will be shown. A new window will appear
+    with the supported languages:<br>
+    \image html doxywizard_menu_settings.png "Language selection window"
+    \image latex doxywizard_language.png "Language selection window" width=6.7cm
+    Note: changing the language will automatically restart the application.
 <dt>Clear recent list<dd>Clears the "Open recent" list in the \ref dw_menu_file. This menu
     item is only accessible when there are recent files in the "Open recent" list.
 <dt>Run Doxygen<dd>Selecting this item is identical to switching to the \ref dw_run "Run" tab,

doc/doxywizard_expert_search.png

@@ -4434,8 +4434,6 @@ This setting is not only used for dot files but also for msc temporary files.
     <message name='possible'><![CDATA[Possible values are: ]]></message>
     <message name='defvaltxt'><![CDATA[The default value is: {0}.]]></message>
     <message name='defvalcode'><![CDATA[The default value is: <code>{0}</code>.]]></message>
-    <message name='defsysdep'><![CDATA[The default value is: system dependent]]></message>
-    <message name='sysdep'><![CDATA[system dependent]]></message>
     <message name='defdir'><![CDATA[The default directory is: <code>{0}</code>.]]></message>
     <message name='deffile'><![CDATA[The default file is: <code>{0}</code>.]]></message>
     <message name='deffileabs'><![CDATA[The default file (with absolute path) is <code>{0}</code>]]></message>

doc/doxywizard_language.png

@@ -165,7 +165,6 @@ def prepCDocs(node):
     type = node.getAttribute('type')
     format = node.getAttribute('format')
     defval = node.getAttribute('defval')
-    #adefval = node.getAttribute('altdefval')
     doc = ""
     if (type != 'obsolete'):
         for n in node.childNodes:
@@ -192,10 +191,7 @@ def prepCDocs(node):
             maxval = node.getAttribute('maxval')
             doc += "<br/>" + messages['minmaxdef'].format(minval, maxval, defval)
         elif (type == 'bool'):
-            if (node.hasAttribute('altdefval')):
-                doc += "<br/>" + messages['defvaltxt'].format(messages['sysdep'])
-            else:
-                doc += "<br/>" + messages['defvaltxt'].format("YES" if (defval == "1") else "NO")
+            doc += "<br/>" + messages['defvaltxt'].format("YES" if (defval == "1") else "NO")
         elif (type == 'list'):
             if format == 'string':
                 values = collectValues(node)
@@ -252,7 +248,6 @@ def parseOption(node):
     type = node.getAttribute('type')
     format = node.getAttribute('format')
     defval = node.getAttribute('defval')
-    adefval = node.getAttribute('altdefval')
     depends = node.getAttribute('depends')
     setting = node.getAttribute('setting')
     orgtype = node.getAttribute('orgtype')
@@ -261,9 +256,7 @@ def parseOption(node):
         print("#if %s" % (setting))
     print("  //----")
     if type == 'bool':
-        if len(adefval) > 0:
-            enabled = adefval
-        elif defval == '1':
+        if defval == '1':
             enabled = "TRUE"
         else:
             enabled = "FALSE"
@@ -559,7 +552,6 @@ def parseOptionDoc(node, first):
     type = node.getAttribute('type')
     format = node.getAttribute('format')
     defval = node.getAttribute('defval')
-    #adefval = node.getAttribute('altdefval')
     depends = node.getAttribute('depends')
     #setting = node.getAttribute('setting')
     doc = ""
@@ -607,10 +599,7 @@ def parseOptionDoc(node, first):
         elif (type == 'bool'):
             print("")
             print("")
-            if (node.hasAttribute('altdefval')):
-                print(messages['defvaltxt'].format(messages['sysdep']))
-            else:
-                print(messages['defvalcode'].format("YES" if (defval == "1") else "NO"))
+            print(messages['defvalcode'].format("YES" if (defval == "1") else "NO"))
             print("")
         elif (type == 'list'):
             if format == 'string':

doc/doxywizard_menu_settings.png

@@ -1830,8 +1830,6 @@
     <message name="possible"><![CDATA[Mögliche Werte sind: ]]></message>
     <message name="defvaltxt"><![CDATA[Der Standardwert ist: {0}.]]></message>
     <message name="defvalcode"><![CDATA[Der Standardwert ist: <code>{0}</code>.]]></message>
-    <message name="defsysdep"><![CDATA[Der Standardwert ist: systemabhängig.]]></message>
-    <message name="sysdep"><![CDATA[systemabhängig]]></message>
     <message name="defdir"><![CDATA[Das Standardverzeichnis ist: <code>{0}</code>.]]></message>
     <message name="deffile"><![CDATA[Die Standarddatei ist: <code>{0}</code>.]]></message>
     <message name="deffileabs"><![CDATA[Die Standarddatei (mit absolutem Pfad) ist: <code>{0}</code>.]]></message>