r21376 by craig -

scribus-commit scribus-commit at lists.scribus.net
Tue Jun 14 18:56:10 UTC 2016 

Author: craig
Date: Tue Jun 14 18:56:09 2016
New Revision: 21376

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21376
Log:
#14150/#14151: Some fixes for doxygen generation from ale

Modified:
    trunk/Scribus/devel-doc/Doxyfile
    trunk/Scribus/devel-doc/templates/header.html
    trunk/Scribus/devel-doc/templates/scribus.css

Modified: trunk/Scribus/devel-doc/Doxyfile
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21376&path=/trunk/Scribus/devel-doc/Doxyfile
==============================================================================
--- trunk/Scribus/devel-doc/Doxyfile	(original)
+++ trunk/Scribus/devel-doc/Doxyfile	Tue Jun 14 18:56:09 2016
@@ -38,7 +38,7 @@
 # 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.
 
-OUTPUT_DIRECTORY       = ../devel-doc
+OUTPUT_DIRECTORY       = html/
 
 # 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 
@@ -701,7 +701,7 @@
 # the style sheet file to the HTML output directory, so don't put your own 
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = templates/styles.css
+HTML_STYLESHEET        = styles.css
 
 # 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 
@@ -1287,6 +1287,15 @@
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------
+# Copy the css and template related files
+#---------------------------------------------------------------------------
+
+HTML_EXTRA_FILES = templates/scribus.css \
+                   images/logo3l.png \
+                   images/logo3m.png \
+                   images/logo3r.png
+
+#---------------------------------------------------------------------------
 # Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 

Modified: trunk/Scribus/devel-doc/templates/header.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21376&path=/trunk/Scribus/devel-doc/templates/header.html
==============================================================================
--- trunk/Scribus/devel-doc/templates/header.html	(original)
+++ trunk/Scribus/devel-doc/templates/header.html	Tue Jun 14 18:56:09 2016
@@ -8,7 +8,7 @@
 	<meta name="resource-type" content="document" />
 	<meta name="copyright" content="Copyright (c) 2004 by Scribus" />
 
-	<link rel="stylesheet" type="text/css" href="templates/scribus.css"/>
+	<link rel="stylesheet" type="text/css" href="scribus.css"/>
 	<link rel="icon" href="/favicon.ico" type="image/ico" />
         <link rel="SHORTCUT ICON" href="/favicon.ico" />
 	<title>Scribus Developer Documentation - API</title>
@@ -17,8 +17,8 @@
 <body>
 
 <div class="scheader">
-	<a class="logo" href="http://www.scribus.net"><img src="images/logo3l.png" alt="logo" border="0" class="logo" /></a>
-	<img src="images/logo3r.png" alt="logo-pen" border="0" class="logo2" />
+	<a class="logo" href="http://www.scribus.net"><img src="logo3l.png" alt="logo" border="0" class="logo" /></a>
+	<img src="logo3r.png" alt="logo-pen" border="0" class="logo2" />
 </div>
 
 	<h1 class="mainh1">Scribus Developer Documentation - API</h1>

Modified: trunk/Scribus/devel-doc/templates/scribus.css
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21376&path=/trunk/Scribus/devel-doc/templates/scribus.css
==============================================================================
--- trunk/Scribus/devel-doc/templates/scribus.css	(original)
+++ trunk/Scribus/devel-doc/templates/scribus.css	Tue Jun 14 18:56:09 2016
@@ -4,7 +4,7 @@
  */
 body {
     color: #000000;
-    background-color: #1e72a8;
+    /* background-color: #1e72a8; */
     padding: 0px;
     margin: 0px;
     font-family: Trebuchet, "Trebuchet MS", Tahoma, Verdana, Arial, Sans-Serif;
@@ -18,7 +18,7 @@
 }
 
 .scheader {
-	background:url(../images/logo3m.png) repeat-x;
+	background:url(logo3m.png) repeat-x;
 	margin: 0px;
 	padding: 0px;
 	margin-bottom: 1em;
@@ -91,7 +91,7 @@
 	font-size:12px;
 	font-weight:bold;
 	text-decoration: none;
-} 
+}
 a.qindex:hover, a.qindexHL:hover {
 	background: #cbb072;
 }
@@ -176,4 +176,3 @@
     border-right: 0px;
     border-bottom: 0px;
 }
-

More information about the scribus-commit mailing list