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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
46e23542
Commit
46e23542
authored
1 year ago
by
Capucine Berthet
Committed by
Sébastien Blin
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
messageBar: display "showLess" when needed
GitLab:
#1309
GitLab:
#1125
Change-Id: I2b443750731170bebe3532338517e5e0e0ed594b
parent
1bbd8e31
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/constant/JamiStrings.qml
+1
-0
1 addition, 0 deletions
src/app/constant/JamiStrings.qml
src/app/mainview/components/MessageBar.qml
+3
-2
3 additions, 2 deletions
src/app/mainview/components/MessageBar.qml
with
4 additions
and
2 deletions
src/app/constant/JamiStrings.qml
+
1
−
0
View file @
46e23542
...
@@ -720,6 +720,7 @@ Item {
...
@@ -720,6 +720,7 @@ Item {
property
string
leaveAudioMessage
:
qsTr
(
"
Audio message
"
)
property
string
leaveAudioMessage
:
qsTr
(
"
Audio message
"
)
property
string
leaveVideoMessage
:
qsTr
(
"
Video message
"
)
property
string
leaveVideoMessage
:
qsTr
(
"
Video message
"
)
property
string
showMore
:
qsTr
(
"
Show more
"
)
property
string
showMore
:
qsTr
(
"
Show more
"
)
property
string
showLess
:
qsTr
(
"
Show less
"
)
property
string
bold
:
qsTr
(
"
Bold
"
)
property
string
bold
:
qsTr
(
"
Bold
"
)
property
string
italic
:
qsTr
(
"
Italic
"
)
property
string
italic
:
qsTr
(
"
Italic
"
)
...
...
This diff is collapsed.
Click to expand it.
src/app/mainview/components/MessageBar.qml
+
3
−
2
View file @
46e23542
...
@@ -98,6 +98,7 @@ RowLayout {
...
@@ -98,6 +98,7 @@ RowLayout {
showMoreButton
.
indicator
.
color
=
hovered
?
JamiTheme
.
chatViewFooterImgHoverColor
:
JamiTheme
.
chatViewFooterImgColor
;
showMoreButton
.
indicator
.
color
=
hovered
?
JamiTheme
.
chatViewFooterImgHoverColor
:
JamiTheme
.
chatViewFooterImgColor
;
showMoreButton
.
background
.
color
=
hovered
?
JamiTheme
.
hoveredButtonColor
:
JamiTheme
.
transparentColor
;
showMoreButton
.
background
.
color
=
hovered
?
JamiTheme
.
hoveredButtonColor
:
JamiTheme
.
transparentColor
;
}
}
toolTipMoreButton
.
text
=
sharePopup
.
opened
?
JamiStrings
.
showLess
:
JamiStrings
.
showMore
;
}
}
popup
:
SharePopup
{
popup
:
SharePopup
{
...
@@ -718,11 +719,10 @@ RowLayout {
...
@@ -718,11 +719,10 @@ RowLayout {
MaterialToolTip
{
MaterialToolTip
{
id
:
toolTip
id
:
toolTip
parent
:
showMoreTypoButton
parent
:
showMoreTypoButton
visible
:
showMoreTypoButton
.
hovered
&&
(
text
.
length
>
0
)
visible
:
showMoreTypoButton
.
hovered
&&
(
text
.
length
>
0
)
delay
:
Qt
.
styleHints
.
mousePressAndHoldInterval
delay
:
Qt
.
styleHints
.
mousePressAndHoldInterval
text
:
JamiStrings
.
showMore
text
:
markdownPopup
.
visible
?
JamiStrings
.
showLess
:
JamiStrings
.
showMore
}
}
background
:
Rectangle
{
background
:
Rectangle
{
...
@@ -747,6 +747,7 @@ RowLayout {
...
@@ -747,6 +747,7 @@ RowLayout {
}
}
popup
:
MarkdownPopup
{
popup
:
MarkdownPopup
{
id
:
markdownPopup
y
:
1.5
*
parent
.
height
y
:
1.5
*
parent
.
height
x
:
-
parent
.
width
*
2
x
:
-
parent
.
width
*
2
width
:
155
width
:
155
...
...
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