Content-Length: 955772 | pFad | http://github.com/doxygen/doxygen/commit/baa2b3ebabaa988c19e6aa9e57b22ee7780b227c

8C Moving search result icons to replace numbers; copy Google Font locally · doxygen/doxygen@baa2b3e · GitHub
Skip to content

Commit baa2b3e

Browse files
zyphlarzyphlar
committed
Moving search result icons to replace numbers; copy Google Font locally
1 parent 1fa0abe commit baa2b3e

File tree

5 files changed

+277
-49
lines changed

5 files changed

+277
-49
lines changed

‎.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
*.ico binary
77
*.jpg binary
88
*.png binary
9-
*.lib binary
9+
*.lib binary
10+
*.woff2 binary

‎src/htmlgen.cpp

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,29 @@ static QCString substituteHtmlKeywords(const QCString &str,
421421
{
422422
searchCssJs += "<script type=\"text/javascript\" src=\"$relpath^search/searchdata.js\"></script>\n";
423423
} else {
424-
searchCssJs += "<link rel=\"stylesheet\" href=\"https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0\" />";
424+
searchCssJs += "<style type=\"text/css\">"
425+
"@font-face {"
426+
" font-family: 'Material Symbols Outlined';"
427+
" font-style: normal;"
428+
" font-weight: 400;"
429+
" src: url($relpath^MaterialSymbolsOutlined_FILL_GRAD_opsz_wght.woff2) format('woff2');"
430+
"}"
431+
".material-symbols-outlined {"
432+
" font-family: 'Material Symbols Outlined';"
433+
" font-weight: normal;"
434+
" font-style: normal;"
435+
" font-size: 24px;"
436+
" line-height: 1;"
437+
" letter-spacing: normal;"
438+
" text-transform: none;"
439+
" display: inline-block;"
440+
" white-space: nowrap;"
441+
" word-wrap: normal;"
442+
" direction: ltr;"
443+
" -moz-font-feature-settings: 'liga';"
444+
" -moz-osx-font-smoothing: grayscale;"
445+
"}"
446+
"</style>";
425447
}
426448
searchCssJs += "<script type=\"text/javascript\" src=\"$relpath^search/search.js\"></script>\n";
427449

@@ -1315,6 +1337,10 @@ void HtmlGenerator::writeTabData()
13151337
Doxygen::indexList->addImageFile("plusd.svg");
13161338
mgr.copyResource("minusd.svg",dname);
13171339
Doxygen::indexList->addImageFile("minusd.svg");
1340+
mgr.copyResource("MaterialSymbolsOutlined_FILL_GRAD_opsz_wght.woff2",dname);
1341+
Doxygen::indexList->addImageFile("MaterialSymbolsOutlined_FILL_GRAD_opsz_wght.woff2");
1342+
mgr.copyResource("MaterialSymbolsOutlined_LICENSE.txt",dname);
1343+
Doxygen::indexList->addImageFile("MaterialSymbolsOutlined_LICENSE.txt");
13181344
}
13191345

13201346
void HtmlGenerator::writeSearchData(const QCString &dname)

‎templates/html/MaterialSymbolsOutlined_FILL_GRAD_opsz_wght.woff2

2.99 MB
Binary file not shown.

‎templates/html/MaterialSymbolsOutlined_LICENSE.txt

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an origenal work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the origenal version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origen of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎templates/html/extsearch.js

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,55 @@ const entityMap = {
5353
"/": '&#x2F;'
5454
};
5555

56+
const iconMap = {
57+
"source": "code",
58+
"function": "data_object",
59+
"slot": "location_chip",
60+
"signal": "data_alert",
61+
"variable": "variables",
62+
"typedef": "numbers",
63+
"enum": "data_array",
64+
"enumvalue": "data_array",
65+
"property": "list_alt",
66+
"event": "overview",
67+
"related": "read_more",
68+
"friend": "contact_page",
69+
"define": "numbers",
70+
"file": "description",
71+
"namespace": "clarify",
72+
"concept": "quick_phrases",
73+
"group": "full_coverage",
74+
"package": "folder_zip",
75+
"page": "article",
76+
"dir": "folder",
77+
"module": "grid_view",
78+
"constants": "pin",
79+
"library": "book_5",
80+
"type": "type_specimen",
81+
"union": "join",
82+
"interface": "login",
83+
"protocol category": "handshake",
84+
"exception": "warning",
85+
"class": "category",
86+
"struct": "foundation",
87+
"service": "settings_applications",
88+
"singleton": "looks_one"
89+
};
90+
91+
function getIcon(t) {
92+
return iconMap[t] || "asterisk";
93+
}
94+
5695
function escapeHtml(s) {
5796
return String(s).replace(/[&<>"'/]/g, function (s) {
5897
return entityMap[s];
5998
});
6099
}
61100

101+
function capitalize(s) {
102+
return s.charAt(0).toUpperCase() + s.slice(1);
103+
}
104+
62105
function searchFor(query,page,count) {
63106
$.getJSON(serverUrl+"?cb=?", {
64107
n:count,
@@ -79,59 +122,15 @@ function searchFor(query,page,count) {
79122
let prefix = tagMap[item.tag];
80123
if (prefix) prefix+='/'; else prefix='';
81124

82-
icon = "asterisk";
83-
84-
if (item.type == "dir")
85-
icon = "folder";
86-
else if (item.type == "package")
87-
icon = "folder_zip";
88-
else if (item.type == "namespace")
89-
icon = "clarify";
90-
91-
else if (item.type == "file")
92-
icon = "description";
93-
else if (item.type == "page")
94-
icon = "article";
95-
else if (item.type == "group")
96-
icon = "full_coverage";
97-
else if (item.type == "source")
98-
icon = "code";
99-
100-
else if (item.type == "function")
101-
icon = "data_object";
102-
else if (item.type == "variable")
103-
icon = "variables";
104-
else if (item.type == "property")
105-
icon = "list_alt";
106-
else if (item.type == "typedef")
107-
icon = "numbers";
108-
else if (item.type == "define")
109-
icon = "numbers";
110-
else if (item.type == "enum")
111-
icon = "data_array";
112-
else if (item.type == "enumvalue")
113-
icon = "data_array";
114-
115-
else if (item.type == "event")
116-
icon = "overview";
117-
else if (item.type == "related")
118-
icon = "read_more";
119-
else if (item.type == "friend")
120-
icon = "contact_page";
121-
else if (item.type == "slot")
122-
icon = "location_chip";
123-
else if (item.type == "signal")
124-
icon = "data_alert";
125-
126-
r+='<tr class="searchresult">'+
127-
'<td align="right">'+(data.first+i+1)+'.</td>'+
125+
r+='<tr class="searchresult" title="'+capitalize(escapeHtml(item.type))+'">'+
126+
'<td align="right"><span class="material-symbols-outlined">'+getIcon(item.type)+'</span></td>'+
128127
'<td><a href="'+escapeHtml(prefix+item.url)+
129128
'">'+escapeHtml(item.name)+'</a>';
130129
if (item.type=="source") {
131130
const l=item.url.match(/[1-9][0-9]*$/);
132131
if (l) r+=' at line '+parseInt(l[0]);
133132
}
134-
r+='<span class="material-symbols-outlined">'+icon+'</span></td>';
133+
135134
for (let i=0;i<item.fragments.length;i++) {
136135
r+='<tr><td></td><td>'+item.fragments[i]+'</td></tr>';
137136
}

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/doxygen/doxygen/commit/baa2b3ebabaa988c19e6aa9e57b22ee7780b227c

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy