aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/studiowelcome
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-06-04 11:45:54 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-06-05 12:16:20 +0000
commit8e2e9662112cb09a7d6b3524c472d0978a4c4eb3 (patch)
treedca92aeb845bd97a03fc6421aa7d8cae76345c4e /src/plugins/studiowelcome
parent737a64aa2449ef6f5ca99b2f80acbff5ad9558d8 (diff)
StudioWelcome: Fix checkbox
Change-Id: I6dbbe507c91c6357aed70ddc8db923a712266234 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/studiowelcome')
-rw-r--r--src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml48
-rw-r--r--src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml26
2 files changed, 53 insertions, 21 deletions
diff --git a/src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml b/src/plugins/studiowelcome/qml/splashscreen/NoShowCheckbox.qml
new file mode 100644
index 0000000000..d2f7454f09
--- /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 338a6864b8..09c2e7757e 100644
--- a/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
+++ b/src/plugins/studiowelcome/qml/splashscreen/Welcome_splash.qml
@@ -182,31 +182,15 @@ 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
- }
-
- CheckBox {
+ NoShowCheckbox {
id: do_not_show_checkBox
- x: 7
- y: 421
- width: 34
- height: 40
- text: qsTr("")
+ x: -47
+ y: 430
+ padding: 0
scale: 0.5
- font.pointSize: 9
}
+
RowLayout {
x: 16
y: 254