diff --git a/resources/images/Background_Don_dark.jpg b/resources/images/Background_Don_dark.jpg new file mode 100644 index 0000000000000000000000000000000000000000..edb106e47cb062df4aae3f638ae52eef4cbe4e49 Binary files /dev/null and b/resources/images/Background_Don_dark.jpg differ diff --git a/resources/images/Background_Don_white.jpg b/resources/images/Background_Don_white.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2928feaa108fb3cfbdc800ac00ceebc83148fa4b Binary files /dev/null and b/resources/images/Background_Don_white.jpg differ diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml index b66d734549357f2f611100cc2da7c052a83ce702..6986b7e30ed10472dce8ba0aa7416a07976922bf 100644 --- a/src/app/constant/JamiTheme.qml +++ b/src/app/constant/JamiTheme.qml @@ -532,6 +532,7 @@ Item { // WizardView Welcome Page property real welcomeLabelPointSize: 30 + property var welcomeLogo: darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg property real welcomeLogoWidth: 100 property real welcomeLogoHeight: 100 property real wizardButtonWidth: 400 @@ -543,7 +544,7 @@ Item { property real welcomeGridWidth: 3 * JamiTheme.tipBoxWidth + 2 * JamiTheme.welcomePageSpacing property real welcomeHalfGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 2 property real welcomeShortGridWidth: 2 * JamiTheme.tipBoxWidth + JamiTheme.welcomePageSpacing - readonly property string welcomeBg: darkTheme ? JamiResources.bg_darkmode_id_jami_png : JamiResources.bg_lightmode_id_jami_png + readonly property string welcomeBg: darkTheme ? JamiResources.background_don_dark_jpg : JamiResources.background_don_white_jpg property color welcomeBlockColor: darkTheme ? "#4D000000" : "#4DFFFFFF" // WizardView Advanced Account Settings diff --git a/src/app/mainview/components/WelcomeInfo.qml b/src/app/mainview/components/WelcomeInfo.qml index c13e252c5d755f5bf81b03a09d5ad8575f72c48a..33831970422782867377864ab1d159d4fec81a27 100644 --- a/src/app/mainview/components/WelcomeInfo.qml +++ b/src/app/mainview/components/WelcomeInfo.qml @@ -39,8 +39,6 @@ Item { property real contentWidth: welcomeInfo.width - 2 * JamiTheme.mainViewMargin - - function getHeight() { return bgRect.height; } @@ -70,7 +68,6 @@ Item { Loader { id: loader_identifierDescription Layout.alignment: Qt.AlignHCenter - Layout.preferredWidth: contentWidth Layout.preferredHeight: item ? item.contentHeight : 0 Layout.bottomMargin: loader_bottomIdentifier.item ? JamiTheme.mainViewMargin - 10 : 0 sourceComponent: { @@ -93,7 +90,6 @@ Item { sourceComponent: JamiIdentifier { backgroundColor: welcomeInfo.idColor contentColor: contentIdColor - } Layout.alignment: Qt.AlignHCenter Layout.preferredHeight: active ? item.getHeight() : 0 diff --git a/src/app/mainview/components/WelcomeLogo.qml b/src/app/mainview/components/WelcomeLogo.qml index 58bdf7a606e812965ed664578267341f9a842e17..ed68b6fe3c4a1dd41f136f2d6b1ba8630b50ea67 100644 --- a/src/app/mainview/components/WelcomeLogo.qml +++ b/src/app/mainview/components/WelcomeLogo.qml @@ -47,7 +47,7 @@ Item { id: cachedImgLogo objectName: "cachedImgLogo" downloadUrl: logoUrl - defaultImage: JamiResources.jami_logo_icon_svg + defaultImage: JamiTheme.welcomeLogo visible: welcomeLogo.visible height: parent.height * logoSize width: parent.width * logoSize