lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-24 09:25:33 +02:00
Code Activity

welcomepage: re-add credits + changelog

Browse source 
Change-Id: Ib253521997c3271885f83c628e918bb26ae61a2c
This commit is contained in:
Sébastien Blin 2020-08-16 17:39:15 -04:00
parent 69f5dfcd2a
commit a84e5fdbdc
3 changed files with 28 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mainview/MainView.qml
View file

@ -43,7 +43,7 @@ Window {
property int mainViewWindowPreferredHeight: 600
property int sidePanelViewStackPreferredWidth: 250
property int mainViewStackPreferredWidth: 250
property int aboutPopUpPreferredWidth: 250
property int aboutPopUpPreferredWidth: 400
property int savedSidePanelViewMinWidth: 0
property int savedSidePanelViewMaxWidth: 0
@ -679,7 +679,7 @@ Window {
x: Math.round((mainViewWindow.width - width) / 2)
y: Math.round((mainViewWindow.height - height) / 2)
width: Math.max(mainViewWindow.width / 2, aboutPopUpPreferredWidth)
width: aboutPopUpPreferredWidth
height: aboutPopUpDialog.contentHeight
}

32
src/mainview/components/AboutPopUp.qml
View file

@ -241,22 +241,11 @@ Dialog {
anchors.fill: parent
HoverableButton {
MaterialButton {
id: changeLogButton
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: textMetricschangeLogButton.boundingRect.width + 20
Layout.preferredHeight: 30
radius: 10
fontPointSize: JamiTheme.textFontSize - 2
text: textMetricschangeLogButton.text
TextMetrics {
id: textMetricschangeLogButton
font: changeLogButton.font
text: qsTr("Change Log")
}
text: qsTr("Changelog")
color: projectCreditsScrollView.visible? JamiTheme.buttonTintedGreyInactive : JamiTheme.buttonTintedGrey
Layout.preferredWidth: 100
onClicked: {
if (changeLogOrCreditsStack.depth > 1) {
@ -265,16 +254,11 @@ Dialog {
}
}
HoverableButton {
MaterialButton {
id: creditsButton
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: changeLogButton.width
Layout.preferredHeight: 30
radius: 10
fontPointSize: JamiTheme.textFontSize - 2
text: qsTr("Credits")
text: qsTr("Credit")
color: projectCreditsScrollView.visible? JamiTheme.buttonTintedGrey : JamiTheme.buttonTintedGreyInactive
Layout.preferredWidth: 100
onClicked: {
if (changeLogOrCreditsStack.depth == 1) {

32
src/mainview/components/WelcomePage.qml
View file

@ -99,37 +99,27 @@ Rectangle {
Rectangle {
id: jamiRegisteredNameRect
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: welcomeRectComponentsGroup.width
Layout.preferredHeight: 65
Layout.bottomMargin: 5
visible: accountListModel.data(accountListModel.index(
0, 0),
260) === 1
ColumnLayout {
id: jamiRegisteredNameRectColumnLayout
spacing: 0
Text {
id: jamiRegisteredNameText
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: welcomeRectComponentsGroup.width
Layout.preferredHeight: 30
font.pointSize: JamiTheme.textFontSize + 1
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: textMetricsjamiRegisteredNameText.elidedText
TextMetrics {
id: textMetricsjamiRegisteredNameText
font: jamiRegisteredNameText.font
text: accountListModel.data(
accountListModel.index(
@ -138,17 +128,13 @@ Rectangle {
elide: Qt.ElideMiddle
}
}
HoverableButton {
id: copyRegisterednameButton
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: buttonPreferredSize
Layout.preferredHeight: buttonPreferredSize
radius: 30
source: "qrc:/images/icons/ic_content_copy.svg"
onClicked: {
ClientWrapper.utilsAdaptor.setText(
textMetricsjamiRegisteredNameText.text)
@ -159,6 +145,24 @@ Rectangle {
}
}
Button {
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
background: Rectangle {
color: "transparent"
}
anchors.bottomMargin: 12
contentItem: Text {
text: qsTr("About Jami")
color: "grey"
}
onClicked: {
aboutPopUpDialog.open()
}
}
CustomBorder {
commonBorder: false
lBorderwidth: 1