Коммит 5098217b создал по автору sgakerru's avatar sgakerru
Просмотр файлов

Update `Splash.qml` for upstream state 

1. Remove unused TextMetrics object (https://invent.kde.org/plasma/plasma-workspace/-/commit/3825d20029d601ed1c1dd8f4b199acc3d9c269ba)

2. lookandfeel: make splash load faster (https://invent.kde.org/plasma/plasma-workspace/-/commit/03a58e06c694349ee14806b1cb3529e7d0fa7655)
владелец 8073738e
Скрыть пробелы
Построчно Рядом
ru.mos.os.dark.desktop/contents/splash/Splash.qml
Просмотр файла @ 5098217b
/*
* Copyright 2014 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
* or (at your option) any later version, as published by the Free
* Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
SPDX-FileCopyrightText: 2014 Marco Martin <mart@kde.org>
SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.5
import QtQuick.Window 2.2
import QtQuick 2.15
import org.kde.plasma.core 2.0 as PlasmaCore
Rectangle {
......@@ -49,21 +35,15 @@ Rectangle {
id: content
anchors.fill: parent
opacity: 0
TextMetrics {
id: units
text: "M"
property int gridUnit: boundingRect.height
property int largeSpacing: PlasmaCore.Units.gridUnit
property int smallSpacing: Math.max(2, gridUnit/4)
}
Image {
id: logo
//match SDDM/lockscreen avatar positioning
property real size: PlasmaCore.Units.gridUnit * 8
readonly property real size: PlasmaCore.Units.gridUnit * 8
anchors.centerIn: parent
asynchronous: true
source: "images/mos.svg"
sourceSize.width: size
......@@ -76,6 +56,7 @@ Rectangle {
//in the middle of the remaining space
y: parent.height - (parent.height - logo.y) / 2 - height/2
anchors.horizontalCenter: parent.horizontalCenter
asynchronous: true
source: "images/busywidget.svgz"
sourceSize.height: PlasmaCore.Units.gridUnit * 2
sourceSize.width: PlasmaCore.Units.gridUnit * 2
......@@ -101,13 +82,11 @@ Rectangle {
}
Text {
color: "#eff0f1"
// Work around Qt bug where NativeRendering breaks for non-integer scale factors
// https://bugreports.qt.io/browse/QTBUG-67007
renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
anchors.verticalCenter: parent.verticalCenter
text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "This is the first text the user sees while starting in the splash screen, should be translated as something short, is a form that can be seen on a product. Plasma is the project name so shouldn't be translated.", "Plasma made by KDE")
}
Image {
asynchronous: true
source: "images/kde.svgz"
sourceSize.height: PlasmaCore.Units.gridUnit * 2
sourceSize.width: PlasmaCore.Units.gridUnit * 2
......
ru.mos.os.light.desktop/contents/splash/Splash.qml
Просмотр файла @ 5098217b
/*
* Copyright 2014 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
* or (at your option) any later version, as published by the Free
* Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
SPDX-FileCopyrightText: 2014 Marco Martin <mart@kde.org>
SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.5
import QtQuick.Window 2.2
import QtQuick 2.15
import org.kde.plasma.core 2.0 as PlasmaCore
Rectangle {
......@@ -49,21 +35,15 @@ Rectangle {
id: content
anchors.fill: parent
opacity: 0
TextMetrics {
id: units
text: "M"
property int gridUnit: boundingRect.height
property int largeSpacing: PlasmaCore.Units.gridUnit
property int smallSpacing: Math.max(2, gridUnit/4)
}
Image {
id: logo
//match SDDM/lockscreen avatar positioning
property real size: PlasmaCore.Units.gridUnit * 8
readonly property real size: PlasmaCore.Units.gridUnit * 8
anchors.centerIn: parent
asynchronous: true
source: "images/mos.svg"
sourceSize.width: size
......@@ -76,6 +56,7 @@ Rectangle {
//in the middle of the remaining space
y: parent.height - (parent.height - logo.y) / 2 - height/2
anchors.horizontalCenter: parent.horizontalCenter
asynchronous: true
source: "images/busywidget.svgz"
sourceSize.height: PlasmaCore.Units.gridUnit * 2
sourceSize.width: PlasmaCore.Units.gridUnit * 2
......@@ -101,13 +82,11 @@ Rectangle {
}
Text {
color: "#eff0f1"
// Work around Qt bug where NativeRendering breaks for non-integer scale factors
// https://bugreports.qt.io/browse/QTBUG-67007
renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
anchors.verticalCenter: parent.verticalCenter
text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "This is the first text the user sees while starting in the splash screen, should be translated as something short, is a form that can be seen on a product. Plasma is the project name so shouldn't be translated.", "Plasma made by KDE")
}
Image {
asynchronous: true
source: "images/kde.svgz"
sourceSize.height: PlasmaCore.Units.gridUnit * 2
sourceSize.width: PlasmaCore.Units.gridUnit * 2
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать