mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-28 17:29:19 +00:00
feat(app): provide a default font for all os
This commit is contained in:
parent
38ca7d5198
commit
bd570cba4c
15 changed files with 150 additions and 9 deletions
|
|
@ -27,6 +27,8 @@ set(EXECUTABLE_NAME linphone)
|
|||
set(TARGET_NAME linphone-qt)
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
|
||||
set(ASSETS_DIR assets)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
include(CheckCXXCompilerFlag)
|
||||
|
||||
|
|
@ -64,7 +66,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG -DQT_DECLARAT
|
|||
# Define packages, libs, sources, headers, resources and languages.
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Network Concurrent)
|
||||
set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent)
|
||||
|
||||
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
|
||||
include("${EP_linphone_CONFIG_DIR}/LinphoneConfig.cmake")
|
||||
|
|
@ -157,7 +159,7 @@ set(HEADERS
|
|||
|
||||
set(QRC_RESOURCES resources.qrc)
|
||||
|
||||
set(LANGUAGES_DIRECTORY assets/languages)
|
||||
set(LANGUAGES_DIRECTORY "${ASSETS_DIR}/languages")
|
||||
set(I18N_FILENAME i18n.qrc)
|
||||
set(LANGUAGES en fr)
|
||||
|
||||
|
|
@ -271,6 +273,6 @@ install(TARGETS ${TARGET_NAME}
|
|||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||
)
|
||||
|
||||
install(FILES "assets/linphonerc-factory"
|
||||
install(FILES "${ASSETS_DIR}/linphonerc-factory"
|
||||
DESTINATION "${CMAKE_INSTALL_DATADIR}/linphone"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
This Font Software is licensed under the SIL Open Font License,
|
||||
Version 1.1.
|
||||
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font
|
||||
creation efforts of academic and linguistic communities, and to
|
||||
provide a free and open framework in which fonts may be shared and
|
||||
improved in partnership with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply to
|
||||
any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software
|
||||
components as distributed by the Copyright Holder(s).
|
||||
|
||||
"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.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed,
|
||||
modify, redistribute, and sell modified and unmodified copies of the
|
||||
Font Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components, in
|
||||
Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. 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.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the
|
||||
corresponding Copyright Holder. This restriction only applies to the
|
||||
primary font name as presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created using
|
||||
the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license 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.
|
||||
BIN
linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf
Normal file
BIN
linphone-desktop/assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15
linphone-desktop/assets/fonts/NotoSans-hinted/README
Normal file
15
linphone-desktop/assets/fonts/NotoSans-hinted/README
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
This package is part of the noto project. Visit
|
||||
google.com/get/noto for more information.
|
||||
|
||||
Built on 2017-04-03 from the following noto repository:
|
||||
-----
|
||||
Repo: noto-fonts
|
||||
Tag: v2017-03-06-phase3-initial
|
||||
Date: 2017-03-06 15:25:38 GMT
|
||||
Commit:60aa0da2ee84b11e78725b4577edc2e80b009d56
|
||||
|
||||
Initial phase 3.
|
||||
|
||||
This is the first release of noto-fonts that includes phase 3 fonts in
|
||||
the hinted/unhinted subdirectories. The new fonts are Armenian,
|
||||
Cherokee, and Hebrew.
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
/***************************************************************************
|
||||
/*******************************************************************************
|
||||
* config.h.cmake
|
||||
* Copyright (C) 2017 Belledonne Communications, Grenoble France
|
||||
*
|
||||
****************************************************************************
|
||||
********************************************************************************
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
@ -18,6 +18,6 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
****************************************************************************/
|
||||
*******************************************************************************/
|
||||
|
||||
#cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,13 @@
|
|||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource prefix="/">
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSans-BoldItalic.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSans-Bold.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSans-Italic.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSans-Regular.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSansUI-BoldItalic.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSansUI-Bold.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSansUI-Italic.ttf</file>
|
||||
<file>assets/fonts/NotoSans-hinted/NotoSansUI-Regular.ttf</file>
|
||||
<file>assets/images/add_disabled.svg</file>
|
||||
<file>assets/images/add_hovered.svg</file>
|
||||
<file>assets/images/add_normal.svg</file>
|
||||
|
|
|
|||
|
|
@ -20,8 +20,13 @@
|
|||
* Author: Ronan Abhamon
|
||||
*/
|
||||
|
||||
#include <QDirIterator>
|
||||
#include <QFontDatabase>
|
||||
|
||||
#include "app/App.hpp"
|
||||
|
||||
#define DEFAULT_FONT "Noto Sans"
|
||||
|
||||
using namespace std;
|
||||
|
||||
// =============================================================================
|
||||
|
|
@ -71,9 +76,28 @@ int main (int argc, char *argv[]) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
app.initContentApp();
|
||||
// ---------------------------------------------------------------------------
|
||||
// Fonts.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Run!
|
||||
QDirIterator it(":", QDirIterator::Subdirectories);
|
||||
while (it.hasNext()) {
|
||||
QFileInfo info(it.next());
|
||||
|
||||
if (info.suffix() == "ttf") {
|
||||
QString path = info.absoluteFilePath();
|
||||
if (path.startsWith(":/assets/fonts/"))
|
||||
qDebug() << QFontDatabase::addApplicationFont(path);
|
||||
}
|
||||
}
|
||||
|
||||
app.setFont(QFont(DEFAULT_FONT));
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Init and run!
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
app.initContentApp();
|
||||
qInfo() << "Running app...";
|
||||
return app.exec();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ do
|
|||
basename="${filename##*/}"
|
||||
extension="${filename##*.}"
|
||||
|
||||
if [[ $extension == @(svg|png|jpg|js) ||
|
||||
if [[ $extension == @(svg|png|jpg|js|ttf) ||
|
||||
$basename == qmldir ||
|
||||
($extension == qml && $basename != *\.spec\.qml) ]]; then
|
||||
echo " <file>$filename</file>" >> $RESOURCES_FILE
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue