1 diff -Naur doxygen-1.7.3_orig/src/docsets.cpp doxygen-1.7.3_new/src/docsets.cpp
2 --- doxygen-1.7.3_orig/src/docsets.cpp 2010-11-07 00:27:43.000000000 +0300
3 +++ doxygen-1.7.3_new/src/docsets.cpp 2011-04-08 15:35:42.000000000 +0400
5 err("Could not open file %s for writing\n",notes.data());
8 - QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
9 + QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
10 m_nts.setDevice(m_nf);
11 m_nts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
12 m_nts << "<DocSetNodes version=\"1.0\">" << endl;
13 diff -Naur doxygen-1.7.3_orig/src/doxygen.cpp doxygen-1.7.3_new/src/doxygen.cpp
14 --- doxygen-1.7.3_orig/src/doxygen.cpp 2010-12-21 23:41:44.000000000 +0300
15 +++ doxygen-1.7.3_new/src/doxygen.cpp 2011-04-08 15:33:52.000000000 +0400
18 QCString title=root->args.stripWhiteSpace();
19 if (title.isEmpty()) title=theTranslator->trMainPage();
20 - QCString name = Config_getBool("GENERATE_TREEVIEW")?"main":"index";
21 + QCString name = /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
27 //printf("Found main page! \n======\n%s\n=======\n",root->doc.data());
28 QCString title=root->args.stripWhiteSpace();
29 - QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
30 + QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
31 Doxygen::mainPage = new PageDef(root->fileName,root->startLine,
32 indexName, root->brief+root->doc+root->inbodyDocs,title);
33 //setFileNameForSections(root->anchors,"index",Doxygen::mainPage);
34 diff -Naur doxygen-1.7.3_orig/src/latexgen.cpp doxygen-1.7.3_new/src/latexgen.cpp
35 --- doxygen-1.7.3_orig/src/latexgen.cpp 2010-12-26 18:35:34.000000000 +0300
36 +++ doxygen-1.7.3_new/src/latexgen.cpp 2011-04-08 15:36:06.000000000 +0400
41 - QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
42 + QCString indexName= /*Config_getBool("GENERATE_TREEVIEW")?"main":*/ "index";
43 t << "}\n\\label{index}";
44 if (Config_getBool("PDF_HYPERLINKS")) t << "\\hypertarget{index}{}";
45 t << "\\input{" << indexName << "}\n";
46 diff -Naur doxygen-1.7.3_orig/src/resize.js doxygen-1.7.3_new/src/resize.js
47 --- doxygen-1.7.3_orig/src/resize.js 2010-12-12 21:53:19.000000000 +0300
48 +++ doxygen-1.7.3_new/src/resize.js 2011-04-08 19:04:50.000000000 +0400
50 var cookie_namespace = 'doxygen';
51 var sidenav,navtree,content,header;
52 +var navrows = new Array();
54 function readCookie(cookie)
58 function resizeWidth()
60 - var windowWidth = $(window).width() + "px";
61 + var windowWidth = $(window).width();
62 var sidenavWidth = $(sidenav).width();
63 content.css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
64 + for(var i = 1; i <= 4;i++) {
65 + if(navrows[i] != null)
66 + navrows[i].css({marginLeft:parseInt(sidenavWidth)+6+"px"}); //account for 6px-wide handle-bar
67 + navrows[i].css({width:windowWidth-parseInt(sidenavWidth) - 6 + "px"});
70 writeCookie('width',sidenavWidth, null);
73 function restoreWidth(navWidth)
75 - var windowWidth = $(window).width() + "px";
76 + var windowWidth = $(window).width();
77 content.css({marginLeft:parseInt(navWidth)+6+"px"});
78 sidenav.css({width:navWidth + "px"});
79 + for(var i = 1; i <= 4;i++) {
80 + if(navrows[i] != null)
81 + navrows[i].css({marginLeft:parseInt(navWidth)+6+"px"});
82 + navrows[i].css({width:windowWidth-parseInt(navWidth) - 6 + "px"});
86 function resizeHeight()
88 var headerHeight = header.height();
89 var footerHeight = footer.height();
91 + for(var i = 1; i <= 4;i++) {
92 + if(navrows[i] != null)
93 + navrowsH = navrowsH + navrows[i].height();
96 var windowHeight = $(window).height() - headerHeight - footerHeight;
97 + var treeH = windowHeight + navrowsH;
98 content.css({height:windowHeight + "px"});
99 - navtree.css({height:windowHeight + "px"});
100 - sidenav.css({height:windowHeight + "px",top: headerHeight+"px"});
101 + navtree.css({height:treeH +"px"});
102 + sidenav.css({height:treeH +"px", top: headerHeight+"px"});
105 function initResizable()
107 content = $("#doc-content");
108 navtree = $("#nav-tree");
109 footer = $("#nav-path");
110 + for(var i = 1; i <= 4;i++) {
111 + navrows[i] = $("#navrow"+i);
114 $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
115 $(window).resize(function() { resizeHeight(); });
116 var width = readCookie('width');
117 diff -Naur doxygen-1.7.3_orig/src/rtfgen.cpp doxygen-1.7.3_new/src/rtfgen.cpp
118 --- doxygen-1.7.3_orig/src/rtfgen.cpp 2010-06-17 15:49:09.000000000 +0400
119 +++ doxygen-1.7.3_new/src/rtfgen.cpp 2011-04-08 15:34:30.000000000 +0400
121 t << "{\\tc \\v " << substitute(Doxygen::mainPage->title(),"%","") << "}"<< endl;
123 t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \"";
124 - if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else t << "index";
125 + //if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else
127 t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
129 //case isPackageIndex: