From 8e2e9662112cb09a7d6b3524c472d0978a4c4eb3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 4 Jun 2019 11:45:54 +0200 Subject: [PATCH] StudioWelcome: Fix checkbox Change-Id: I6dbbe507c91c6357aed70ddc8db923a712266234 Reviewed-by: Tim Jenssen --- .../qml/splashscreen/NoShowCheckbox.qml | 48 +++++++++++++++++++ .../qml/splashscreen/Welcome_splash.qml | 28 +++-------- 2 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml diff --git a/src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml b/src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml new file mode 100644 index 00000000000..d2f7454f093 --- /dev/null +++ b/src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +import QtQuick 2.7 +import QtQuick.Timeline 1.0 +import QtQuick.Controls 2.12 +import welcome 1.0 + +CheckBox { + id: do_not_show_checkBox + width: 268 + height: 40 + text: qsTr("Don't show this again") + spacing: 12 + + + contentItem: Text { + text:do_not_show_checkBox.text + font.family: "titillium web" + color: "#ffffff" + font.pointSize: 24 + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignLeft + leftPadding: do_not_show_checkBox.indicator.width + do_not_show_checkBox.spacing + } +} diff --git a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml index 338a6864b83..09c2e7757e9 100644 --- a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml +++ b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml @@ -182,30 +182,14 @@ Image { } } - Text { - id: do_not_show_text - x: 42 - y: 432 - width: 143 - height: 31 - color: "#ffffff" - text: qsTr("Don't show this again") - font.wordSpacing: 0 - font.pixelSize: 12 - font.family: StudioFonts.titilliumWeb_light - wrapMode: Text.WordWrap + NoShowCheckbox { + id: do_not_show_checkBox + x: -47 + y: 430 + padding: 0 + scale: 0.5 } - CheckBox { - id: do_not_show_checkBox - x: 7 - y: 421 - width: 34 - height: 40 - text: qsTr("") - scale: 0.5 - font.pointSize: 9 - } RowLayout { x: 16