Commit 2ac288b7 authored by H. İbrahim Güngör's avatar H. İbrahim Güngör

Use Ubuntu Condensed font everywhere

Even though the previous font (Opensans Hebrew Condensed) was easy on
the eyes, it lacks most if the latin-ext glyphs, resulting some of the
locales simply unreadable.

I've tried EncodeSans, which looks like Ubuntu and has much more styles
(thin, condensed, compressed, narrow etc.), it is still wider than
Ubuntu and makes the words collapse each other for screens that have
small screen estates.
parent 87af89ff
This diff is collapsed.
......@@ -5,150 +5,147 @@
#include <string>
#include <map>
extern const size_t window_icon_256_png_size;
extern const unsigned char window_icon_256_png_data[];
extern const size_t arrow_svg_size;
extern const unsigned char arrow_svg_data[];
extern const size_t busy_0_svg_size;
extern const unsigned char busy_0_svg_data[];
extern const size_t busy_1_svg_size;
extern const unsigned char busy_1_svg_data[];
extern const size_t busy_2_svg_size;
extern const unsigned char busy_2_svg_data[];
extern const size_t busy_3_svg_size;
extern const unsigned char busy_3_svg_data[];
extern const size_t fontawesome_webfont_ttf_size;
extern const unsigned char fontawesome_webfont_ttf_data[];
extern const size_t splash_svg_size;
extern const unsigned char splash_svg_data[];
extern const size_t button_png_size;
extern const unsigned char button_png_data[];
extern const size_t checkbox_unchecked_svg_size;
extern const unsigned char checkbox_unchecked_svg_data[];
extern const size_t button_filled_png_size;
extern const unsigned char button_filled_png_data[];
extern const size_t checkbox_checked_svg_size;
extern const unsigned char checkbox_checked_svg_data[];
extern const size_t opensans_hebrew_condensed_regular_ttf_size;
extern const unsigned char opensans_hebrew_condensed_regular_ttf_data[];
extern const size_t checkbox_unchecked_svg_size;
extern const unsigned char checkbox_unchecked_svg_data[];
extern const size_t star_unfilled_svg_size;
extern const unsigned char star_unfilled_svg_data[];
extern const size_t fav_add_svg_size;
extern const unsigned char fav_add_svg_data[];
extern const size_t fav_remove_svg_size;
extern const unsigned char fav_remove_svg_data[];
extern const size_t on_svg_size;
extern const unsigned char on_svg_data[];
extern const size_t fontawesome_webfont_ttf_size;
extern const unsigned char fontawesome_webfont_ttf_data[];
extern const size_t frame_png_size;
extern const unsigned char frame_png_data[];
extern const size_t off_svg_size;
extern const unsigned char off_svg_data[];
extern const size_t slider_knob_svg_size;
extern const unsigned char slider_knob_svg_data[];
extern const size_t busy_0_svg_size;
extern const unsigned char busy_0_svg_data[];
extern const size_t on_svg_size;
extern const unsigned char on_svg_data[];
extern const size_t textinput_ninepatch_active_png_size;
extern const unsigned char textinput_ninepatch_active_png_data[];
extern const size_t option_arrow_svg_size;
extern const unsigned char option_arrow_svg_data[];
extern const size_t scroll_gradient_png_size;
extern const unsigned char scroll_gradient_png_data[];
extern const size_t frame_png_size;
extern const unsigned char frame_png_data[];
extern const size_t option_arrow_svg_size;
extern const unsigned char option_arrow_svg_data[];
extern const size_t busy_2_svg_size;
extern const unsigned char busy_2_svg_data[];
extern const size_t slider_knob_svg_size;
extern const unsigned char slider_knob_svg_data[];
extern const size_t opensans_hebrew_condensed_light_ttf_size;
extern const unsigned char opensans_hebrew_condensed_light_ttf_data[];
extern const size_t splash_svg_size;
extern const unsigned char splash_svg_data[];
extern const size_t button_png_size;
extern const unsigned char button_png_data[];
extern const size_t star_filled_svg_size;
extern const unsigned char star_filled_svg_data[];
extern const size_t button_filled_png_size;
extern const unsigned char button_filled_png_data[];
extern const size_t star_unfilled_svg_size;
extern const unsigned char star_unfilled_svg_data[];
extern const size_t textinput_ninepatch_png_size;
extern const unsigned char textinput_ninepatch_png_data[];
extern const size_t busy_1_svg_size;
extern const unsigned char busy_1_svg_data[];
extern const size_t textinput_ninepatch_active_png_size;
extern const unsigned char textinput_ninepatch_active_png_data[];
extern const size_t arrow_svg_size;
extern const unsigned char arrow_svg_data[];
extern const size_t window_icon_256_png_size;
extern const unsigned char window_icon_256_png_data[];
extern const size_t fav_add_svg_size;
extern const unsigned char fav_add_svg_data[];
extern const size_t ubuntu_condensed_ttf_size;
extern const unsigned char ubuntu_condensed_ttf_data[];
extern const size_t star_filled_svg_size;
extern const unsigned char star_filled_svg_data[];
extern const size_t help_button_a_svg_size;
extern const unsigned char help_button_a_svg_data[];
extern const size_t help_dpad_left_svg_size;
extern const unsigned char help_dpad_left_svg_data[];
extern const size_t help_button_b_svg_size;
extern const unsigned char help_button_b_svg_data[];
extern const size_t help_button_hotkey_svg_size;
extern const unsigned char help_button_hotkey_svg_data[];
extern const size_t help_button_l_svg_size;
extern const unsigned char help_button_l_svg_data[];
extern const size_t help_button_l2_svg_size;
extern const unsigned char help_button_l2_svg_data[];
extern const size_t help_button_l3_svg_size;
extern const unsigned char help_button_l3_svg_data[];
extern const size_t help_dpad_all_svg_size;
extern const unsigned char help_dpad_all_svg_data[];
extern const size_t help_button_r_svg_size;
extern const unsigned char help_button_r_svg_data[];
extern const size_t help_button_r2_svg_size;
extern const unsigned char help_button_r2_svg_data[];
extern const size_t help_button_r3_svg_size;
extern const unsigned char help_button_r3_svg_data[];
extern const size_t help_button_select_svg_size;
extern const unsigned char help_button_select_svg_data[];
extern const size_t help_button_l2_svg_size;
extern const unsigned char help_button_l2_svg_data[];
extern const size_t help_button_start_svg_size;
extern const unsigned char help_button_start_svg_data[];
extern const size_t help_dpad_up_svg_size;
extern const unsigned char help_dpad_up_svg_data[];
extern const size_t help_button_hotkey_svg_size;
extern const unsigned char help_button_hotkey_svg_data[];
extern const size_t help_dpad_updown_svg_size;
extern const unsigned char help_dpad_updown_svg_data[];
extern const size_t help_button_x_svg_size;
extern const unsigned char help_button_x_svg_data[];
extern const size_t help_dpad_right_svg_size;
extern const unsigned char help_dpad_right_svg_data[];
extern const size_t help_button_y_svg_size;
extern const unsigned char help_button_y_svg_data[];
extern const size_t help_dpad_all_svg_size;
extern const unsigned char help_dpad_all_svg_data[];
extern const size_t help_dpad_down_svg_size;
extern const unsigned char help_dpad_down_svg_data[];
extern const size_t help_dpad_left_svg_size;
extern const unsigned char help_dpad_left_svg_data[];
extern const size_t help_dpad_leftright_svg_size;
extern const unsigned char help_dpad_leftright_svg_data[];
extern const size_t help_button_a_svg_size;
extern const unsigned char help_button_a_svg_data[];
extern const size_t help_dpad_right_svg_size;
extern const unsigned char help_dpad_right_svg_data[];
extern const size_t help_button_r3_svg_size;
extern const unsigned char help_button_r3_svg_data[];
extern const size_t help_dpad_up_svg_size;
extern const unsigned char help_dpad_up_svg_data[];
extern const size_t help_dpad_updown_svg_size;
extern const unsigned char help_dpad_updown_svg_data[];
extern const size_t help_joystick_left_svg_size;
extern const unsigned char help_joystick_left_svg_data[];
extern const size_t help_button_r2_svg_size;
extern const unsigned char help_button_r2_svg_data[];
extern const size_t help_joystick_up_svg_size;
extern const unsigned char help_joystick_up_svg_data[];
extern const size_t help_button_y_svg_size;
extern const unsigned char help_button_y_svg_data[];
extern const size_t help_button_b_svg_size;
extern const unsigned char help_button_b_svg_data[];
extern const size_t help_button_l_svg_size;
extern const unsigned char help_button_l_svg_data[];
struct Res2hEntry {
const std::string relativeFileName;
const size_t size;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
#get res2h here: https://github.com/HorstBaerbel/res2h
res2h ./resources ./converted2 -s -h Resources2.h -u ResourceUtil2.cpp
res2h ./resources ./converted -s -h Resources.h -u ResourceUtil.cpp
......@@ -147,8 +147,7 @@ set(EMBEDDED_ASSET_SOURCES
${emulationstation-all_SOURCE_DIR}/data/converted/help_joystick_up_svg.cpp
${emulationstation-all_SOURCE_DIR}/data/converted/opensans_hebrew_condensed_regular_ttf.cpp
${emulationstation-all_SOURCE_DIR}/data/converted/opensans_hebrew_condensed_light_ttf.cpp
${emulationstation-all_SOURCE_DIR}/data/converted/ubuntu_condensed_ttf.cpp
${emulationstation-all_SOURCE_DIR}/data/converted/fontawesome_webfont_ttf.cpp
${emulationstation-all_SOURCE_DIR}/data/converted/arrow_svg.cpp
${emulationstation-all_SOURCE_DIR}/data/converted/option_arrow_svg.cpp
......
......@@ -15,8 +15,8 @@ class TextCache;
#define FONT_SIZE_MEDIUM ((unsigned int)(0.045f * Renderer::getScreenHeight()))
#define FONT_SIZE_LARGE ((unsigned int)(0.085f * Renderer::getScreenHeight()))
#define FONT_PATH_LIGHT ":/opensans_hebrew_condensed_light.ttf"
#define FONT_PATH_REGULAR ":/opensans_hebrew_condensed_regular.ttf"
#define FONT_PATH_LIGHT ":/ubuntu_condensed.ttf"
#define FONT_PATH_REGULAR ":/ubuntu_condensed.ttf"
typedef unsigned long UnicodeChar;
......
Regarding the Open Sans font (located in data/resources/ and data/converted):
Copyright 2010 Steve Matteson
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.
\ No newline at end of file
-------------------------------
UBUNTU FONT LICENCE Version 1.0
-------------------------------
PREAMBLE
This licence allows the licensed fonts to be used, studied, modified and
redistributed freely. The fonts, including any derivative works, can be
bundled, embedded, and redistributed provided the terms of this licence
are met. The fonts and derivatives, however, cannot be released under
any other licence. The requirement for fonts to remain under this
licence does not require any document created using the fonts or their
derivatives to be published under this licence, as long as the primary
purpose of the document is not to be a vehicle for the distribution of
the fonts.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this licence and clearly marked as such. This may
include source files, build scripts and documentation.
"Original Version" refers to the collection of Font Software components
as received under this licence.
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to
a new environment.
"Copyright Holder(s)" refers to all individuals and companies who have a
copyright ownership of the Font Software.
"Substantially Changed" refers to Modified Versions which can be easily
identified as dissimilar to the Font Software by users of the Font
Software comparing the Original Version with the Modified Version.
To "Propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification and with or without charging
a redistribution fee), making available to the public, and in some
countries other activities as well.
PERMISSION & CONDITIONS
This licence does not grant any rights under trademark law and all such
rights are reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of the Font Software, to propagate the Font Software, subject to
the below conditions:
1) Each copy of the Font Software must contain the above copyright
notice and this licence. These can be included either as stand-alone
text files, human-readable headers or in the appropriate machine-
readable metadata fields within text or binary files as long as those
fields can be easily viewed by the user.
2) The font name complies with the following:
(a) The Original Version must retain its name, unmodified.
(b) Modified Versions which are Substantially Changed must be renamed to
avoid use of the name of the Original Version or similar names entirely.
(c) Modified Versions which are not Substantially Changed must be
renamed to both (i) retain the name of the Original Version and (ii) add
additional naming elements to distinguish the Modified Version from the
Original Version. The name of such Modified Versions must be the name of
the Original Version, with "derivative X" where X represents the name of
the new work, appended to that name.
3) The name(s) of the Copyright Holder(s) and any contributor to the
Font Software shall not be used to promote, endorse or advertise any
Modified Version, except (i) as required by this licence, (ii) to
acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
their explicit written permission.
4) The Font Software, modified or unmodified, in part or in whole, must
be distributed entirely under this licence, and must not be distributed
under any other licence. The requirement for fonts to remain under this
licence does not affect any document created using the Font Software,
except any version of the Font Software extracted from a document
created using the Font Software may only be distributed under this
licence.
TERMINATION
This licence becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
DEALINGS IN THE FONT SOFTWARE.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment