Bug 750930 - Representation of arrows

6 files changed, 16 insertions, 124 deletions

diff --git a/qtools/Doxyfile b/qtools/Doxyfile
index 597001a..161a6d1 100644
--- a/qtools/Doxyfile
+++ b/qtools/Doxyfile
@@ -150,7 +150,7 @@ HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80
 HTML_TIMESTAMP         = YES
-HTML_DYNAMIC_SECTIONS  = YES
+HTML_DYNAMIC_SECTIONS  = NO
 HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = YES
 DOCSET_FEEDNAME        = "Doxygen generated docs"
@@ -175,7 +175,7 @@ QHG_LOCATION           =
 GENERATE_ECLIPSEHELP   = YES
 ECLIPSE_DOC_ID         = org.doxygen.qtools
 DISABLE_INDEX          = NO
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
@@ -292,8 +292,8 @@ UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = YES
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = YES
-CALLER_GRAPH           = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = svg
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index 3ec1b88..7249574 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -694,8 +694,6 @@ void FTVHelp::generateTreeViewImages()
   rm.copyResource("doc.luma",dname);
   rm.copyResource("folderopen.luma",dname);
   rm.copyResource("folderclosed.luma",dname);
-  rm.copyResource("arrowdown.luma",dname);
-  rm.copyResource("arrowright.luma",dname);
   rm.copyResource("splitbar.lum",dname);
 }
 
diff --git a/templates/html/arrowdown.luma b/templates/html/arrowdown.luma
deleted file mode 100644
index df7834c..0000000
--- a/templates/html/arrowdown.luma
+++ /dev/null
@@ -1,49 +0,0 @@
-# folder open icon
-# width & height
-16 22
-# luma data
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 152 152 152 152 152 152 152 152 152 255 255 255 255
-255 255 255 152 152 152 152 152 152 152 152 152 255 255 255 255
-255 255 255 255 152 152 152 152 152 152 152 255 255 255 255 255
-255 255 255 255 152 152 152 152 152 152 152 255 255 255 255 255
-255 255 255 255 255 152 152 152 152 152 255 255 255 255 255 255
-255 255 255 255 255 255 152 152 152 255 255 255 255 255 255 255
-255 255 255 255 255 255 152 152 152 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 152 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-# alpha data
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0 231 255 255 255 255 255 255 255 216   0   0   0   0
-  0   0   0  87 255 255 255 255 255 255 255  65   0   0   0   0
-  0   0   0   0 186 255 255 255 255 255 164   0   0   0   0   0
-  0   0   0   0  38 251 255 255 255 241  25   0   0   0   0   0
-  0   0   0   0   0 127 255 255 255 107   0   0   0   0   0   0
-  0   0   0   0   0   0 221 255 204   0   0   0   0   0   0   0
-  0   0   0   0   0   0  72 253  52   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0  77   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
diff --git a/templates/html/arrowright.luma b/templates/html/arrowright.luma
deleted file mode 100644
index 63209b0..0000000
--- a/templates/html/arrowright.luma
+++ /dev/null
@@ -1,49 +0,0 @@
-# folder open icon
-# width & height
-16 22
-# luma data
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 152 152 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 152 152 152 152 255 255 255 255 255 255 255 255 255
-255 255 255 152 152 152 152 152 255 255 255 255 255 255 255 255
-255 255 255 152 152 152 152 152 152 152 255 255 255 255 255 255
-255 255 255 152 152 152 152 152 152 152 152 255 255 255 255 255
-255 255 255 152 152 152 152 152 152 152 255 255 255 255 255 255
-255 255 255 152 152 152 152 152 255 255 255 255 255 255 255 255
-255 255 255 152 152 152 152 255 255 255 255 255 255 255 255 255
-255 255 255 152 152 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
-# alpha data
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0 223  75   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0 255 255 176  33   0   0   0   0   0   0   0   0   0
-  0   0   0 255 255 255 248 117   0   0   0   0   0   0   0   0
-  0   0   0 255 255 255 255 255 211  60   0   0   0   0   0   0
-  0   0   0 255 255 255 255 255 255 255  77   0   0   0   0   0
-  0   0   0 255 255 255 255 255 211  60   0   0   0   0   0   0
-  0   0   0 255 255 255 248 117   0   0   0   0   0   0   0   0
-  0   0   0 255 255 176  33   0   0   0   0   0   0   0   0   0
-  0   0   0 223  75   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
-  0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0
diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index dd88612..e609214 100644
--- a/templates/html/htmllayout.tpl
+++ b/templates/html/htmllayout.tpl
@@ -30,8 +30,6 @@
 {% resource 'doc.luma' %}
 {% resource 'folderopen.luma' %}
 {% resource 'folderclosed.luma' %}
-{% resource 'arrowdown.luma' %}
-{% resource 'arrowright.luma' %}
 {% resource 'splitbar.lum' %}
 
 {# general search resources #}
diff --git a/templates/html/navtree.js b/templates/html/navtree.js
index 287659a..e6d31b0 100644
--- a/templates/html/navtree.js
+++ b/templates/html/navtree.js
@@ -1,4 +1,6 @@
 var navTreeSubIndices = new Array();
+var arrowDown = '▼';
+var arrowRight = '►';
 
 function getData(varName)
 {
@@ -94,18 +96,17 @@ function createIndent(o,domNode,node,level)
   var n = node;
   while (n.parentNode) { level++; n=n.parentNode; }
   if (node.childrenData) {
-    var imgNode = document.createElement("img");
+    var imgNode = document.createElement("span");
+    imgNode.className = 'arrow';
     imgNode.style.paddingLeft=(16*level).toString()+'px';
-    imgNode.width  = 16;
-    imgNode.height = 22;
-    imgNode.border = 0;
+    imgNode.innerHTML=arrowRight;
     node.plus_img = imgNode;
     node.expandToggle = document.createElement("a");
     node.expandToggle.href = "javascript:void(0)";
     node.expandToggle.onclick = function() {
       if (node.expanded) {
         $(node.getChildrenUL()).slideUp("fast");
-        node.plus_img.src = node.relpath+"arrowright.png";
+        node.plus_img.innerHTML=arrowRight;
         node.expanded = false;
       } else {
         expandNode(o, node, false, false);
@@ -113,12 +114,10 @@ function createIndent(o,domNode,node,level)
     }
     node.expandToggle.appendChild(imgNode);
     domNode.appendChild(node.expandToggle);
-    imgNode.src = node.relpath+"arrowright.png";
   } else {
     var span = document.createElement("span");
-    span.style.display = 'inline-block';
+    span.className = 'arrow';
     span.style.width   = 16*(level+1)+'px';
-    span.style.height  = '22px';
     span.innerHTML = ' ';
     domNode.appendChild(span);
   }
@@ -268,11 +267,7 @@ function expandNode(o, node, imm, showRoot)
       } else {
         $(node.getChildrenUL()).slideDown("fast");
       }
-      if (node.isLast) {
-        node.plus_img.src = node.relpath+"arrowdown.png";
-      } else {
-        node.plus_img.src = node.relpath+"arrowdown.png";
-      }
+      node.plus_img.innerHTML = arrowDown;
       node.expanded = true;
     }
   }
@@ -341,7 +336,7 @@ function showNode(o, node, index, hash)
         getNode(o, node);
       }
       $(node.getChildrenUL()).css({'display':'block'});
-      node.plus_img.src = node.relpath+"arrowdown.png";
+      node.plus_img.innerHTML = arrowDown;
       node.expanded = true;
       var n = node.children[o.breadcrumbs[index]];
       if (index+1<o.breadcrumbs.length) {
@@ -478,10 +473,9 @@ function initNavTree(toroot,relpath)
   o.node.relpath = relpath;
   o.node.expanded = false;
   o.node.isLast = true;
-  o.node.plus_img = document.createElement("img");
-  o.node.plus_img.src = relpath+"arrowright.png";
-  o.node.plus_img.width = 16;
-  o.node.plus_img.height = 22;
+  o.node.plus_img = document.createElement("span");
+  o.node.plus_img.className = 'arrow';
+  o.node.plus_img.innerHTML = arrowRight;
 
   if (localStorageSupported()) {
     var navSync = $('#nav-sync');