summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-03-23 14:05:28 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-03-23 14:05:28 (GMT)
commit2a22c7d4e71eb324ac82ac638fce89f8b04afdf0 (patch)
tree787fc3151209c550346bf80579a98ea6cc0a0485 /src
parentea436bd659e022d6375dd37f651d4bb18a1c01db (diff)
parent9ba0c0ff85e954c32437af3014c8b54e2c7879bf (diff)
downloadDoxygen-2a22c7d4e71eb324ac82ac638fce89f8b04afdf0.zip
Doxygen-2a22c7d4e71eb324ac82ac638fce89f8b04afdf0.tar.gz
Doxygen-2a22c7d4e71eb324ac82ac638fce89f8b04afdf0.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r--src/config.h2
-rw-r--r--src/config.xml2
-rwxr-xr-xsrc/configgen.py30
3 files changed, 32 insertions, 2 deletions
diff --git a/src/config.h b/src/config.h
index 756e94e..505e4d1 100644
--- a/src/config.h
+++ b/src/config.h
@@ -165,7 +165,7 @@ class ConfigEnum : public ConfigOption
class ConfigString : public ConfigOption
{
public:
- enum WidgetType { String, File, Dir };
+ enum WidgetType { String, File, Dir, Image };
ConfigString(const char *name,const char *doc)
: ConfigOption(O_String)
{
diff --git a/src/config.xml b/src/config.xml
index 75b723d..1506b65 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -247,7 +247,7 @@ Go to the <a href="commands.html">next</a> section or return to the
</docs>
</option>
- <option type='string' id='PROJECT_LOGO' format='file' defval=''>
+ <option type='string' id='PROJECT_LOGO' format='image' defval=''>
<docs>
<![CDATA[
With the \c PROJECT_LOGO tag one can specify an logo or icon that is
diff --git a/src/configgen.py b/src/configgen.py
index 4023930..8ec0caa 100755
--- a/src/configgen.py
+++ b/src/configgen.py
@@ -201,6 +201,19 @@ def prepCDocs(node):
else:
if abspath == '1':
doc += "<br/>The file has to be specified with full path."
+ elif file =='image':
+ abspath = node.getAttribute('abspath')
+ if defval != '':
+ if abspath != '1':
+ doc += "<br/>The default image is: <code>%s</code>." % (
+ defval)
+ else:
+ doc += "<br/>%s: %s%s%s." % (
+ "The default image (with absolute path) is",
+ "<code>",defval,"</code>")
+ else:
+ if abspath == '1':
+ doc += "<br/>The image has to be specified with full path."
else: # format == 'string':
if defval != '':
doc += "<br/>The default value is: <code>%s</code>." % (
@@ -262,6 +275,8 @@ def parseOption(node):
print " cs->setDefaultValue(\"%s\");" % (defval)
if format == 'file':
print " cs->setWidgetType(ConfigString::File);"
+ elif format == 'image':
+ print " cs->setWidgetType(ConfigString::Image);"
elif format == 'dir':
print " cs->setWidgetType(ConfigString::Dir);"
if depends != '':
@@ -453,6 +468,21 @@ def parseOptionDoc(node, first):
if abspath == '1':
print ""
print "The file has to be specified with full path."
+ elif file =='image':
+ abspath = node.getAttribute('abspath')
+ if defval != '':
+ print ""
+ if abspath != '1':
+ print "The default image is: <code>%s</code>." % (
+ defval)
+ else:
+ print "%s: %s%s%s." % (
+ "The default image (with absolute path) is",
+ "<code>",defval,"</code>")
+ else:
+ if abspath == '1':
+ print ""
+ print "The image has to be specified with full path."
else: # format == 'string':
if defval != '':
print ""