Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
a84e5fdb
Commit
a84e5fdb
authored
4 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
welcomepage: re-add credits + changelog
Change-Id: Ib253521997c3271885f83c628e918bb26ae61a2c
parent
69f5dfcd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/mainview/MainView.qml
+2
-2
2 additions, 2 deletions
src/mainview/MainView.qml
src/mainview/components/AboutPopUp.qml
+8
-24
8 additions, 24 deletions
src/mainview/components/AboutPopUp.qml
src/mainview/components/WelcomePage.qml
+18
-14
18 additions, 14 deletions
src/mainview/components/WelcomePage.qml
with
28 additions
and
40 deletions
src/mainview/MainView.qml
+
2
−
2
View file @
a84e5fdb
...
...
@@ -43,7 +43,7 @@ Window {
property
int
mainViewWindowPreferredHeight
:
600
property
int
sidePanelViewStackPreferredWidth
:
250
property
int
mainViewStackPreferredWidth
:
250
property
int
aboutPopUpPreferredWidth
:
25
0
property
int
aboutPopUpPreferredWidth
:
40
0
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
}
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/AboutPopUp.qml
+
8
−
24
View file @
a84e5fdb
...
...
@@ -241,22 +241,11 @@ Dialog {
anchors.fill
:
parent
Hoverable
Button
{
Material
Button
{
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 {
}
}
Hoverable
Button
{
Material
Button
{
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
)
{
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/WelcomePage.qml
+
18
−
14
View file @
a84e5fdb
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment