diff --git a/src/controls/qml/Label.qml b/src/controls/qml/Label.qml index 31609ce..d848dc3 100644 --- a/src/controls/qml/Label.qml +++ b/src/controls/qml/Label.qml @@ -1,6 +1,7 @@ /**************************************************************************************** ** ** Copyright (C) 2013 Aleksi Suomalainen +** Copyright (C) 2023 Chupligin Sergey ** All rights reserved. ** ** You may use this file under the terms of BSD license as follows: diff --git a/src/controls/qml/ListView.qml b/src/controls/qml/ListView.qml index 5e87677..1e6b3e8 100644 --- a/src/controls/qml/ListView.qml +++ b/src/controls/qml/ListView.qml @@ -1,3 +1,34 @@ +/**************************************************************************************** +** +** Copyright (C) 2023 Chupligin Sergey +** All rights reserved. +** +** You may use this file under the terms of BSD license as follows: +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** * Neither the name of the author nor the +** names of its contributors may be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR +** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************************/ + import QtQuick 2.6 import QtQuick.Controls @@ -19,6 +50,12 @@ ListView { Text { id: sectionText text: section + FontLoader { + id: localFont + source: Theme.fontPath + } + font.family: localFont.font.family + font.styleName: localFont.font.styleName font.capitalization: Font.AllUppercase font.pixelSize: Theme.fontSizeSmall color: Theme.textColor diff --git a/src/controls/qml/TabButton.qml b/src/controls/qml/TabButton.qml index 2db9beb..f68a0e1 100644 --- a/src/controls/qml/TabButton.qml +++ b/src/controls/qml/TabButton.qml @@ -1,3 +1,34 @@ +/**************************************************************************************** +** +** Copyright (C) 2023 Chupligin Sergey +** All rights reserved. +** +** You may use this file under the terms of BSD license as follows: +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in the +** documentation and/or other materials provided with the distribution. +** * Neither the name of the author nor the +** names of its contributors may be used to endorse or promote products +** derived from this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR +** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************************/ + import QtQuick import QtQuick.Controls @@ -23,6 +54,12 @@ TabButton { } contentItem: Text { + FontLoader { + id: localFont + source: Theme.fontPath + } + font.family: localFont.font.family + font.styleName: localFont.font.styleName anchors.fill: parent color: (control.checked) ? Theme.accentColor : Theme.textColor text: control.text.toUpperCase() diff --git a/src/controls/qml/ToolButton.qml b/src/controls/qml/ToolButton.qml index 981ff5a..8dddae6 100644 --- a/src/controls/qml/ToolButton.qml +++ b/src/controls/qml/ToolButton.qml @@ -1,6 +1,6 @@ /**************************************************************************************** ** -** Copyright (C) 2019-2021 Chupligin Sergey +** Copyright (C) 2019-2023 Chupligin Sergey ** All rights reserved. ** ** You may use this file under the terms of BSD license as follows: @@ -77,6 +77,13 @@ Item { Text { id: counterText + FontLoader { + id: localFont + source: Theme.fontPath + } + font.family: localFont.font.family + font.styleName: localFont.font.styleName + text: toolButton.counterValue >= 100 ? "99+" : toolButton.counterValue color: Theme.textColor anchors.centerIn: parent