From 3e012c32d5e4d281310b4f1f08533d793dd741d4 Mon Sep 17 00:00:00 2001
From: lcoursodon <liam.coursodon@savoirfairelinux.com>
Date: Fri, 20 Oct 2023 13:36:09 -0400
Subject: [PATCH] Welcome view: set default title to false and resize logo
GitLab: #1334
Change-Id: I71930584b3f5e0925ba8f5f42fff669ff9237dd1
---
src/app/constant/JamiTheme.qml | 2 +-
src/app/mainview/components/WelcomeInfo.qml | 4 ++--
src/app/mainview/components/WelcomeLogo.qml | 4 ++--
src/app/mainview/components/WelcomePage.qml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/app/constant/JamiTheme.qml b/src/app/constant/JamiTheme.qml
index ed15e162d..5fd5dc583 100644
--- a/src/app/constant/JamiTheme.qml
+++ b/src/app/constant/JamiTheme.qml
@@ -543,7 +543,7 @@ Item {
property real welcomeRectTopMargin: 90
property real welcomePageSpacing: 13
property real welcomeGridWidth: 3 * JamiTheme.tipBoxWidth + 2 * JamiTheme.welcomePageSpacing
- property real welcomeHalfGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 2
+ property real welcomeThirdGridWidth: (welcomeGridWidth - JamiTheme.welcomePageSpacing) / 3
property real welcomeShortGridWidth: 2 * JamiTheme.tipBoxWidth + JamiTheme.welcomePageSpacing
readonly property string welcomeBg: darkTheme ? JamiResources.background_don_dark_jpg : JamiResources.background_don_white_jpg
property color welcomeBlockColor: darkTheme ? "#4D000000" : "#4DFFFFFF"
diff --git a/src/app/mainview/components/WelcomeInfo.qml b/src/app/mainview/components/WelcomeInfo.qml
index 338319704..05ff301e9 100644
--- a/src/app/mainview/components/WelcomeInfo.qml
+++ b/src/app/mainview/components/WelcomeInfo.qml
@@ -31,7 +31,7 @@ Item {
property color textColor: JamiTheme.textColor
property color idColor: JamiTheme.welcomeBlockColor
property color contentIdColor: JamiTheme.tintedBlue
- property bool hasTitle: true
+ property bool hasTitle: false
property bool hasDescription: true
property string title: JamiStrings.welcomeToJami
@@ -129,7 +129,7 @@ Item {
width: welcomeInfo.contentWidth
height: contentHeight
- font.pixelSize: JamiTheme.headerFontSize
+ font.pixelSize: JamiTheme.tipBoxContentFontSize
wrapMode: Text.WordWrap
diff --git a/src/app/mainview/components/WelcomeLogo.qml b/src/app/mainview/components/WelcomeLogo.qml
index ed68b6fe3..7ff02083b 100644
--- a/src/app/mainview/components/WelcomeLogo.qml
+++ b/src/app/mainview/components/WelcomeLogo.qml
@@ -36,11 +36,11 @@ Item {
width: getWidth()
function getWidth() {
- return JamiTheme.welcomeHalfGridWidth;
+ return JamiTheme.welcomeThirdGridWidth;
}
function getHeight() {
- return 120;
+ return 80;
}
CachedImage {
diff --git a/src/app/mainview/components/WelcomePage.qml b/src/app/mainview/components/WelcomePage.qml
index ba250884e..483177972 100644
--- a/src/app/mainview/components/WelcomePage.qml
+++ b/src/app/mainview/components/WelcomePage.qml
@@ -49,7 +49,7 @@ ListSelectionView {
property bool hasCustomUi: false
- property bool hasTitle: true
+ property bool hasTitle: false
property bool hasDescription: true
property bool hasCustomTitle: false
@@ -95,7 +95,7 @@ ListSelectionView {
function updateUiFlags() {
hasCustomUi = Object.keys(uiCustomization).length > 0;
- hasTitle = hasCustomUi ? uiCustomization.title !== "" : true;
+ hasTitle = hasCustomUi ? uiCustomization.title !== "" : false;
hasDescription = hasCustomUi ? uiCustomization.description !== "" : true;
title = hasCustomUi && uiCustomization.title !== undefined ? uiCustomization.title : JamiStrings.welcomeToJami;
description = hasCustomUi && uiCustomization.description !== undefined ? uiCustomization.description : JamiStrings.hereIsIdentifier;
--
GitLab