aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2016-04-26 11:00:32 +0200
committerMartijn Kaijser <martijn@xbmc.org>2016-04-26 11:00:32 +0200
commit2b24c9b2acba6d04bff1d04037d46410c55b34bd (patch)
tree506c482cd155d7c9a32e42c885947a396a35e861
parent160b7b3e86a723f198a30d42b6991be88a64feb7 (diff)
parent5a30deab8cb698904c0b955b82cb30440582645c (diff)
Merge pull request #9685 from AlwinEsch/fix-doxygen-parts
[doxygen] Fix and improve doxygen parts
-rw-r--r--.codedocs3
-rw-r--r--doxygen_resources/Doxyfile.doxy3
-rw-r--r--xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile7
-rw-r--r--xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox5
-rw-r--r--xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox5
5 files changed, 11 insertions, 12 deletions
diff --git a/.codedocs b/.codedocs
index 2306ad6c05..82d9dbf071 100644
--- a/.codedocs
+++ b/.codedocs
@@ -67,7 +67,8 @@ ALIASES = "table_start=<table width= 100% style= border bgcolor=
"table_h3{3}=<tr bgcolor= 576f9f><th width= 30% align=left>\1</th><th width= 10% align=left>\2</th><th width= 60% align=left>\3</th></tr>" \
"table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>" \
"python_func{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
- "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly"
+ "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+ "doc_header{1}=\htmlonly <h3><span style=\"text-decoration: underline;\"><span style=\"font-style: italic;\"><span style=\"color: rgb(102, 102, 102);\">\1</span></span></span></h3> \endhtmlonly"
# Hide undocumented class members.
HIDE_UNDOC_MEMBERS =
diff --git a/doxygen_resources/Doxyfile.doxy b/doxygen_resources/Doxyfile.doxy
index 70d3dc4994..fe500d27c7 100644
--- a/doxygen_resources/Doxyfile.doxy
+++ b/doxygen_resources/Doxyfile.doxy
@@ -245,7 +245,8 @@ ALIASES = "table_start=<table width= 100% style= border bgcolor=
"table_h3{3}=<tr bgcolor= 576f9f><th width= 30% align=left>\1</th><th width= 10% align=left>\2</th><th width= 60% align=left>\3</th></tr>" \
"table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>" \
"python_func{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
- "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly"
+ "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+ "doc_header{1}=\htmlonly <h3><span style=\"text-decoration: underline;\"><span style=\"font-style: italic;\"><span style=\"color: rgb(102, 102, 102);\">\1</span></span></span></h3> \endhtmlonly"
# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
index 64b9cd1789..2ff2458339 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
@@ -243,7 +243,10 @@ ALIASES = "table_start=<table width= 100% style= border bgcolor=
"table_h2_l{2}=<tr bgcolor= 576f9f><th width= 40% align=left>\1</th><th width= 60% align=left>\2</th></tr>" \
"table_row2_l{2}=<tr bgcolor=white><td width= 40% align=left>\1</td><td width= 60% align=left>\2</td></tr>" \
"table_h3{3}=<tr bgcolor= 576f9f><th width= 30% align=left>\1</th><th width= 10% align=left>\2</th><th width= 60% align=left>\3</th></tr>" \
- "table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>"
+ "table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>" \
+ "python_func{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+ "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+ "doc_header{1}=\htmlonly <h3><span style=\"text-decoration: underline;\"><span style=\"font-style: italic;\"><span style=\"color: rgb(102, 102, 102);\">\1</span></span></span></h3> \endhtmlonly"
# This tag can be used to specify a number of word-keyword mappings (TCL only).
# A mapping has the form "name=value". For example adding "class=itcl::class"
@@ -806,7 +809,7 @@ INPUT = main.txt \
../../../guilib/GUIVideoControl.dox \
../../../guilib/GUIVisualisationControl.dox \
../../../guilib/GUIWrappingListContainer.dox \
- ../../../guilib/_Controls.txt \
+ ../../../guilib/_Controls.dox \
../../../interfaces/builtins/AddonBuiltins.cpp \
../../../interfaces/builtins/AndroidBuiltins.cpp \
../../../interfaces/builtins/ApplicationBuiltins.cpp \
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox
index 9da9161634..481a0db8d6 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox
@@ -1,10 +1,7 @@
/*!
\page general_parts General Development parts
-\brief \htmlonly
- <h3><span style="text-decoration: underline;"><span style="font-style: italic;"><span
- style="color: rgb(102, 102, 102);">General Add-On Development parts</span></span></span></h3>
- \endhtmlonly
+\brief \doc_header{ General Add-On Development parts }
\subpage modules__General__List_of_gui_access
\subpage page_List_of_built_in_functions
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox
index 7ab93d3971..4bb26fbe63 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Skin/skin.dox
@@ -1,10 +1,7 @@
/*!
\page skin_parts Skin Development
-\brief \htmlonly
- <h3><span style="text-decoration: underline;"><span style="font-style: italic;"><span
- style="color: rgb(102, 102, 102);">Skin Add-On Development</span></span></span></h3>
- \endhtmlonly
+@brief \doc_header{ Skin Add-On Development }
Kodi includes a GUI library that allows you to skin/change everything you see.
The images, sizes and positions of controls, colours, fonts, text, through to