[Scummvm-git-logs] scummvm master -> 6b0cd31e76d6fa973a5c0604cfc07d7c870c2df7
sev-
noreply at scummvm.org
Tue May 21 20:02:07 UTC 2024
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aa3d6f3771 FONTS: Replaced OpenFontIcons.ttf with MaterialIcons-Regular.ttf
6b0cd31e76 DIRECTOR: DEBUGGER: Replaced all icons with Material Design icons and increased font size
Commit: aa3d6f37715c32fd84775a34a41a64ee268e226d
https://github.com/scummvm/scummvm/commit/aa3d6f37715c32fd84775a34a41a64ee268e226d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-21T21:59:46+02:00
Commit Message:
FONTS: Replaced OpenFontIcons.ttf with MaterialIcons-Regular.ttf
OpenFontIcons.ttf appeared to be badly broken, all SVG contain
strokes which does not render well on non-SVG rasters.
Changed paths:
A LICENSES/COPYING.Apache
A gui/themes/fonts/MaterialIcons-Regular.ttf
R gui/themes/fonts/OpenFontIcons.ttf
dists/engine-data/fonts.dat
gui/themes/fonts/README
gui/themes/fonts/version.txt
diff --git a/LICENSES/COPYING.Apache b/LICENSES/COPYING.Apache
new file mode 100644
index 00000000000..59feb34f6ae
--- /dev/null
+++ b/LICENSES/COPYING.Apache
@@ -0,0 +1,207 @@
+
+NOTE: This license file only applies to the fillowing files distributed
+along with our theme files:
+
+ * MaterialIcons-Regular.ttf
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/dists/engine-data/fonts.dat b/dists/engine-data/fonts.dat
index 30b463f5f91..36f2e110d36 100644
Binary files a/dists/engine-data/fonts.dat and b/dists/engine-data/fonts.dat differ
diff --git a/gui/themes/fonts/MaterialIcons-Regular.ttf b/gui/themes/fonts/MaterialIcons-Regular.ttf
new file mode 100644
index 00000000000..9d09b0feb85
Binary files /dev/null and b/gui/themes/fonts/MaterialIcons-Regular.ttf differ
diff --git a/gui/themes/fonts/OpenFontIcons.ttf b/gui/themes/fonts/OpenFontIcons.ttf
deleted file mode 100644
index 804fbc1cdc8..00000000000
Binary files a/gui/themes/fonts/OpenFontIcons.ttf and /dev/null differ
diff --git a/gui/themes/fonts/README b/gui/themes/fonts/README
index 1b1c5e53add..cd48829d239 100644
--- a/gui/themes/fonts/README
+++ b/gui/themes/fonts/README
@@ -1,6 +1,6 @@
These are fonts used in ScummVM. Most of them come from Xorg.
The GNU FreeFont files are distributed under the license in COPYING.FREEFONT.
-The OpenFontIcons (https://github.com/traverseda/OpenFontIcons) files are distributed under the license in COPYING.MIT.
+The Material Design Icons (https://github.com/google/material-design-icons) files are distributed under Apache 2.0 license
Also other potentially usable fonts are stored here as well.
diff --git a/gui/themes/fonts/version.txt b/gui/themes/fonts/version.txt
index 2e0e38c63a6..c044b1a3269 100644
--- a/gui/themes/fonts/version.txt
+++ b/gui/themes/fonts/version.txt
@@ -1 +1 @@
-1.9
+1.10
Commit: 6b0cd31e76d6fa973a5c0604cfc07d7c870c2df7
https://github.com/scummvm/scummvm/commit/6b0cd31e76d6fa973a5c0604cfc07d7c870c2df7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-21T22:01:23+02:00
Commit Message:
DIRECTOR: DEBUGGER: Replaced all icons with Material Design icons and increased font size
Changed paths:
engines/director/debugtools.cpp
diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 656600487ad..7310508dfa6 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -820,20 +820,20 @@ static const char *toString(ScriptType scriptType) {
static const char *toIcon(CastType castType) {
static const char *castTypes[] = {
"", // Empty
- "\ue075", // Bitmap // image
- "\ue062", // FilmLoop // film
- "\ue0e1", // Text // type
- "\ue055", // Palette // droplet
- "\ue075", // Picture // image
- "\ue0f1", // Sound // volume-2
- "\ue0cb", // Button // square
- "\ue058", // Shape // edit
- "\ue062", // Movie // film
- "\ue0ee", // DigitalVideo // video
- "\ue05d", // Script // feather
- "\ue060", // RTE // file-text
+ "\uf79e", // Bitmap // backround_dot_large
+ "\ue8da", // FilmLoop // theaters
+ "\uf6f1", // Text // match_case
+ "\ue40a", // Palette // palette
+ "\uefa2", // Picture // imagesmode
+ "\ue050", // Sound // volume_up
+ "\uf4ab", // Button // slab_serif
+ "\ue602", // Shape // shapes
+ "\ue02c", // Movie // movie
+ "\uf49a", // DigitalVideo // animated_images
+ "\uf0c8", // Script // forms_apps_script
+ "\uf4f1", // RTE // brand_family
"?", // ???
- "\ue00a"};// Transition // aperture
+ "\uf50c"};// Transition // transition_fade
if (castType < 0 || castType > kCastTransition)
return "";
return castTypes[(int)castType];
@@ -930,16 +930,16 @@ static void showCast() {
if (ImGui::Begin("Cast", &_state->_w.cast)) {
// display a toolbar with: grid/list/filters buttons + name filter
- if (ImGui::Button("\ue07e")) { // list
+ if (ImGui::Button("\ue896")) { // list
_state->_cast._listView = true;
}
ImGui::SameLine();
- if (ImGui::Button("\ue06e")) { // grid
+ if (ImGui::Button("\ue9b0")) { // grid_view
_state->_cast._listView = false;
}
ImGui::SameLine();
- if (ImGui::Button("\ue063")) { // filter
+ if (ImGui::Button("\uef4f")) { // filter_alt
ImGui::OpenPopup("filters_popup");
}
ImGui::SameLine();
@@ -1095,7 +1095,7 @@ static void displayVariable(Common::String &name) {
ImDrawList *dl = ImGui::GetWindowDrawList();
ImVec2 pos = ImGui::GetCursorScreenPos();
- ImVec2 eyeSize = ImGui::CalcTextSize("\ue05b "); // eye
+ ImVec2 eyeSize = ImGui::CalcTextSize("\ue8f4 "); // visibility
ImVec2 textSize = ImGui::CalcTextSize(name.c_str());
ImGui::InvisibleButton("Line", ImVec2(textSize.x + eyeSize.x, textSize.y));
@@ -1113,7 +1113,7 @@ static void displayVariable(Common::String &name) {
color = disp_color_hover;
}
- dl->AddText(pos, color, "\ue05b "); // eye
+ dl->AddText(pos, color, "\ue8f4 "); // visibility
dl->AddText(ImVec2(pos.x + eyeSize.x, pos.y), var_color, name.c_str());
}
@@ -1458,12 +1458,12 @@ static void displayScripts() {
ImGui::SetNextWindowSize(ImVec2(240, 240), ImGuiCond_FirstUseEver);
if (ImGui::Begin("Script", &_state->_functions._showScript)) {
- if (ImGui::Button("\ue025")) { // Lingo // box
+ if (ImGui::Button("\uf569")) { // Lingo // package_2
_state->_functions._showByteCode = false;
}
ImGui::SetItemTooltip("Lingo");
ImGui::SameLine();
- if (ImGui::Button("\ue079")) { // Bytecode // layers
+ if (ImGui::Button("\uf500")) { // Bytecode // stacks
_state->_functions._showByteCode = true;
}
ImGui::SetItemTooltip("Bytecode");
@@ -1717,12 +1717,12 @@ enum { kModeMember, kModeBehavior, kModeLocation, kModeInk, kModeBlend, kModeExt
kChTempo, kChPalette, kChTransition, kChSound1, kChSound2, kChScript };
const char *modes[] = { "Member", "Behavior", "Location", "Ink", "Blend", "Extended" };
const char *modes2[] = {
- "\ue038", "Tempo", // clock
- "\ue055", "Palette", // droplet
- "\ue00a", "Transition", // aperture
- "\ue0f01","Sound 1", // volume-1
- "\ue0f02","Sound 2", // volume-1
- "\ue05d", "Script", // feather
+ "\ue425", "Tempo", // timer
+ "\ue40a", "Palette", // palette
+ "\uf50c", "Transition", // transition_fade
+ "\ue0501","Sound 1", // volume_up
+ "\ue0502","Sound 2", // volume_up
+ "\uf0c8", "Script", // forms_apps_script
};
static void displayScoreChannel(int ch, int mode, int modeSel) {
@@ -1919,10 +1919,10 @@ static void showScore() {
ImGui::BeginChild("Range", ImVec2(100.0f, 20.0f));
if (castMember) {
- ImGui::Text("\ue033"); ImGui::SameLine(); // chevrons-left
+ ImGui::Text("\uf816"); ImGui::SameLine(); // line_start_circle
ImGui::Text("?"); ImGui::SameLine();
ImGui::SetItemTooltip("Start Frame");
- ImGui::Text("\ue034"); ImGui::SameLine(); // chevrons-right
+ ImGui::Text("\uf819"); ImGui::SameLine(); // line_end_square
ImGui::Text("?"); ImGui::SameLine();
ImGui::SetItemTooltip("End Frame");
}
@@ -1936,13 +1936,13 @@ static void showScore() {
ImGui::BeginChild("Flags", ImVec2(200.0f, 20.0f));
if (castMember) {
- ImGui::Checkbox("\ue080", &sprite->_enabled); ImGui::SameLine(); // lock
+ ImGui::Checkbox("\ue897", &sprite->_enabled); ImGui::SameLine(); // lock
ImGui::SetItemTooltip("enabled");
- ImGui::Checkbox("\ue057", &sprite->_editable); ImGui::SameLine(); // edit-3
+ ImGui::Checkbox("\ue745", &sprite->_editable); ImGui::SameLine(); // edit_note
ImGui::SetItemTooltip("editable");
- ImGui::Checkbox("\ue096", &sprite->_moveable); ImGui::SameLine(); // move
+ ImGui::Checkbox("\uf712", &sprite->_moveable); ImGui::SameLine(); // move_selection_right
ImGui::SetItemTooltip("moveable");
- ImGui::Checkbox("\ue0dd", &sprite->_trails); // trending-up
+ ImGui::Checkbox("\uea14", &sprite->_trails); // dynamic_feed
ImGui::SetItemTooltip("trails");
}
ImGui::PopStyleColor();
@@ -2115,10 +2115,10 @@ void onImGuiInit() {
icons_config.PixelSnapH = false;
icons_config.OversampleH = 3;
icons_config.OversampleV = 3;
- icons_config.GlyphOffset = {0, 3};
+ icons_config.GlyphOffset = {0, 5};
static const ImWchar icons_ranges[] = {0xE000, 0xF8FF, 0};
- ImGui::addTTFFontFromArchive("OpenFontIcons.ttf", 13.f, &icons_config, icons_ranges);
+ ImGui::addTTFFontFromArchive("MaterialIcons-Regular.ttf", 16.f, &icons_config, icons_ranges);
_state = new ImGuiState();
More information about the Scummvm-git-logs
mailing list