diff --git a/internal/frontend/qml/Bridge_test.qml b/internal/frontend/qml/Bridge_test.qml index 2e41be8fb..b580ad8e2 100644 --- a/internal/frontend/qml/Bridge_test.qml +++ b/internal/frontend/qml/Bridge_test.qml @@ -262,7 +262,7 @@ Window { // add one user on start - var hasUserOnStart = true + var hasUserOnStart = false if (hasUserOnStart) { var newUserObject = root.userComponent.createObject(root) newUserObject.username = "LerooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooyJenkins@protonmail.com" diff --git a/internal/frontend/qml/Proton/ColorScheme.qml b/internal/frontend/qml/Proton/ColorScheme.qml index 07c14bdae..c29b2708a 100644 --- a/internal/frontend/qml/Proton/ColorScheme.qml +++ b/internal/frontend/qml/Proton/ColorScheme.qml @@ -88,4 +88,5 @@ QtObject { // Images property string welcome_img + property string logo_img } diff --git a/internal/frontend/qml/Proton/Style.qml b/internal/frontend/qml/Proton/Style.qml index f50ed537c..f5ea8fe71 100644 --- a/internal/frontend/qml/Proton/Style.qml +++ b/internal/frontend/qml/Proton/Style.qml @@ -106,6 +106,7 @@ QtObject { // Images welcome_img: "icons/img-welcome.png" + logo_img: "icons/product_logos.svg" } property ColorScheme lightProminentStyle: ColorScheme { @@ -180,6 +181,7 @@ QtObject { // Images welcome_img: "icons/img-welcome-dark.png" + logo_img: "icons/product_logos_dark.svg" } property ColorScheme darkStyle: ColorScheme { @@ -254,6 +256,7 @@ QtObject { // Images welcome_img: "icons/img-welcome-dark.png" + logo_img: "icons/product_logos_dark.svg" } property ColorScheme darkProminentStyle: ColorScheme { @@ -328,6 +331,7 @@ QtObject { // Images welcome_img: "icons/img-welcome-dark.png" + logo_img: "icons/product_logos_dark.svg" } property ColorScheme currentStyle: lightStyle diff --git a/internal/frontend/qml/WelcomeGuide.qml b/internal/frontend/qml/WelcomeGuide.qml index a56f06e92..d1efeb387 100644 --- a/internal/frontend/qml/WelcomeGuide.qml +++ b/internal/frontend/qml/WelcomeGuide.qml @@ -102,7 +102,7 @@ Item { Label { colorScheme: root.colorScheme id: longTextLabel - text: qsTr("Now you can securely access and manage Proton Mail messages in your favorite email client. Bridge runs in the background and encrypts and decrypts your messages seamlessly.") + text: qsTr("Add your Proton Mail account to securely access and manage your messages in your favorite email client. Bridge runs in the background and encrypts and decrypts your messages seamlessly.") Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true Layout.topMargin: 16 @@ -135,14 +135,14 @@ Item { Image { id: logoImage - source: "icons/product_logos.svg" + source: colorScheme.logo_img anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom anchors.topMargin: 48 anchors.bottomMargin: 48 - sourceSize.height: 22 - sourceSize.width: 132 + sourceSize.height: 25 + sourceSize.width: 200 } } } diff --git a/internal/frontend/qml/icons/img-welcome-dark.png b/internal/frontend/qml/icons/img-welcome-dark.png index 830c00af5..eff72885a 100644 Binary files a/internal/frontend/qml/icons/img-welcome-dark.png and b/internal/frontend/qml/icons/img-welcome-dark.png differ diff --git a/internal/frontend/qml/icons/img-welcome-dark.svg b/internal/frontend/qml/icons/img-welcome-dark.svg index 305e79939..79863d49f 100644 --- a/internal/frontend/qml/icons/img-welcome-dark.svg +++ b/internal/frontend/qml/icons/img-welcome-dark.svg @@ -1,14 +1,14 @@ + inkscape:current-layer="svg84" /> + y="0" /> - - - - + + + - - - - - - - - + + + + + + id="defs82"> + + + + + id="stop39" /> + id="stop41" /> + id="stop43" /> + id="stop45" /> + id="stop47" /> - - - + + + stop-color="#DDDBE3" + id="stop52" /> - + stop-color="white" + id="stop54" /> + + id="stop57" /> + id="stop59" /> + id="stop62" /> + stop-color="white" + id="stop64" /> - + stop-color="#ECAAFF" + id="stop67" /> + stop-color="#6A48F6" + id="stop69" /> + stop-color="#2AF091" + id="stop72" /> + stop-color="#00C5A1" + id="stop74" /> - - - - - + stop-color="#FFD66C" + id="stop77" /> - + stop-color="#FF8E4F" + id="stop79" /> + diff --git a/internal/frontend/qml/icons/img-welcome.png b/internal/frontend/qml/icons/img-welcome.png index 2f3050c9a..19e5ea793 100644 Binary files a/internal/frontend/qml/icons/img-welcome.png and b/internal/frontend/qml/icons/img-welcome.png differ diff --git a/internal/frontend/qml/icons/img-welcome.svg b/internal/frontend/qml/icons/img-welcome.svg index 0d1f93a0e..775402999 100644 --- a/internal/frontend/qml/icons/img-welcome.svg +++ b/internal/frontend/qml/icons/img-welcome.svg @@ -1,19 +1,22 @@ + inkscape:current-layer="svg84" /> - - - - + + + - - - - - - - - + + + + + + id="defs82"> + + + + + id="stop39" /> + id="stop41" /> + id="stop43" /> + id="stop45" /> + id="stop47" /> - - - + + + stop-color="#DDDBE3" + id="stop52" /> - + stop-color="white" + id="stop54" /> + + id="stop57" /> + id="stop59" /> + id="stop62" /> + stop-color="white" + id="stop64" /> - + stop-color="#ECAAFF" + id="stop67" /> + stop-color="#6A48F6" + id="stop69" /> + stop-color="#2AF091" + id="stop72" /> + stop-color="#00C5A1" + id="stop74" /> - - - - - + stop-color="#FFD66C" + id="stop77" /> - + stop-color="#FF8E4F" + id="stop79" /> + diff --git a/internal/frontend/qml/icons/product_logos.svg b/internal/frontend/qml/icons/product_logos.svg index b68781374..86a5be77a 100644 --- a/internal/frontend/qml/icons/product_logos.svg +++ b/internal/frontend/qml/icons/product_logos.svg @@ -1,15 +1,123 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/internal/frontend/qml/icons/product_logos_dark.svg b/internal/frontend/qml/icons/product_logos_dark.svg new file mode 100644 index 000000000..d4c092d55 --- /dev/null +++ b/internal/frontend/qml/icons/product_logos_dark.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +