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
f7bc95d4
Commit
f7bc95d4
authored
1 year ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
logsview: fix ugly theme
Change-Id: Ic38b7c322f0ffe9690a11294683d2d605d7f128e GitLab:
#1153
parent
dc53aa88
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/settingsview/components/LogsView.qml
+89
-102
89 additions, 102 deletions
src/app/settingsview/components/LogsView.qml
with
89 additions
and
102 deletions
src/app/settingsview/components/LogsView.qml
+
89
−
102
View file @
f7bc95d4
...
...
@@ -85,136 +85,123 @@ Window {
}
hasOpened
=
true
;
}
color
:
JamiTheme
.
backgroundColor
ColumnLayout
{
anchors.fill
:
parent
spacing
:
0
R
ectangle
{
id
:
button
RectangleBackground
R
owLayout
{
id
:
button
s
Layout.alignment
:
Qt
.
AlignHCenter
Layout.fillWidth
:
true
Layout.preferredHeight
:
JamiTheme
.
preferredFieldHeight
*
2
border.width
:
0
color
:
JamiTheme
.
backgroundColor
radius
:
JamiTheme
.
modalPopupRadius
RowLayout
{
id
:
buttons
anchors.centerIn
:
parent
ToggleSwitch
{
id
:
startStopToggle
Layout.fillWidth
:
true
Layout.leftMargin
:
JamiTheme
.
preferredMarginSize
Layout.rightMargin
:
JamiTheme
.
preferredMarginSize
checked
:
false
labelText
:
JamiStrings
.
logsViewDisplay
onSwitchToggled
:
{
logging
=
!
logging
;
if
(
logging
)
{
isStopped
=
false
;
root
.
cancelPressed
=
false
;
monitor
(
true
);
}
else
{
isStopped
=
true
;
root
.
cancelPressed
=
true
;
monitor
(
false
);
}
}
}
MaterialButton
{
id
:
clearButton
Layout.alignment
:
Qt
.
AlignHCenter
Layout.topMargin
:
JamiTheme
.
preferredMarginSize
Layout.bottomMargin
:
JamiTheme
.
preferredMarginSize
ToggleSwitch
{
id
:
startStopToggle
preferredWidth
:
itemWidth
/
widthDivisor
buttontextHeightMargin
:
JamiTheme
.
buttontextHeightMargin
Layout.fillWidth
:
true
Layout.leftMargin
:
JamiTheme
.
preferredMarginSize
Layout.rightMargin
:
JamiTheme
.
preferredMarginSize
secondary
:
true
color
:
JamiTheme
.
buttonTintedBlack
hoveredColor
:
JamiTheme
.
buttonTintedBlackHovered
pressedColor
:
JamiTheme
.
buttonTintedBlackPressed
text
:
JamiStrings
.
logsViewClear
autoAccelerator
:
true
checked
:
false
labelText
:
JamiStrings
.
logsViewDisplay
onClicked
:
{
logsText
.
clear
();
logging
=
false
;
startStopToggle
.
checked
=
false
;
onSwitchToggled
:
{
logging
=
!
logging
;
if
(
logging
)
{
isStopped
=
false
;
root
.
cancelPressed
=
false
;
monitor
(
true
);
}
else
{
isStopped
=
true
;
root
.
cancelPressed
=
true
;
UtilsAdapter
.
logList
=
[];
monitor
(
false
);
}
}
}
MaterialButton
{
id
:
copyButton
MaterialButton
{
id
:
clearButton
Layout.alignment
:
Qt
.
AlignHCenter
Layout.topMargin
:
JamiTheme
.
preferredMarginSize
Layout.bottomMargin
:
JamiTheme
.
preferredMarginSize
preferredWidth
:
itemWidth
/
widthDivisor
buttontextHeightMargin
:
JamiTheme
.
buttontextHeightMargin
secondary
:
true
color
:
JamiTheme
.
buttonTintedBlack
hoveredColor
:
JamiTheme
.
buttonTintedBlackHovered
pressedColor
:
JamiTheme
.
buttonTintedBlackPressed
text
:
JamiStrings
.
logsViewClear
autoAccelerator
:
true
onClicked
:
{
logsText
.
clear
();
logging
=
false
;
startStopToggle
.
checked
=
false
;
root
.
cancelPressed
=
true
;
UtilsAdapter
.
logList
=
[];
monitor
(
false
);
}
}
Layout.alignment
:
Qt
.
AlignHCenter
MaterialButton
{
id
:
copyButton
preferredWidth
:
itemWidth
/
widthDivisor
buttontextHeightMargin
:
JamiTheme
.
buttontextHeightMargin
Layout.alignment
:
Qt
.
AlignHCenter
color
:
JamiTheme
.
buttonTintedBlack
hoveredColor
:
JamiTheme
.
buttonTintedBlackHovered
pressedColor
:
JamiTheme
.
buttonTintedBlackPressed
preferredWidth
:
itemWidth
/
widthDivisor
buttontextHeightMargin
:
JamiTheme
.
buttontextHeightMargin
secondary
:
true
text
:
JamiStrings
.
logsViewCopy
autoAccelerator
:
true
color
:
JamiTheme
.
buttonTintedBlack
hoveredColor
:
JamiTheme
.
buttonTintedBlackHovered
pressedColor
:
JamiTheme
.
buttonTintedBlackPressed
onClicked
:
{
logsText
.
selectAll
();
logsText
.
copy
();
logsText
.
deselect
();
copiedToolTip
.
open
();
}
secondary
:
true
text
:
JamiStrings
.
logsViewCopy
autoAccelerator
:
true
ToolTip
{
id
:
copiedToolTip
onClicked
:
{
logsText
.
selectAll
();
logsText
.
copy
();
logsText
.
deselect
();
copiedToolTip
.
open
();
}
height
:
JamiTheme
.
preferredFieldHeight
TextArea
{
text
:
JamiStrings
.
logsViewCopied
color
:
JamiTheme
.
textColor
}
background
:
Rectangle
{
color
:
JamiTheme
.
primaryBackgroundColor
}
ToolTip
{
id
:
copiedToolTip
height
:
JamiTheme
.
preferredFieldHeight
TextArea
{
text
:
JamiStrings
.
logsViewCopied
color
:
JamiTheme
.
textColor
}
background
:
Rectangle
{
color
:
JamiTheme
.
primaryBackgroundColor
}
}
}
MaterialButton
{
id
:
reportButton
MaterialButton
{
id
:
reportButton
Layout.alignment
:
Qt
.
AlignHCenter
Layout.topMargin
:
JamiTheme
.
preferredMarginSize
Layout.bottomMargin
:
JamiTheme
.
preferredMarginSize
Layout.rightMargin
:
JamiTheme
.
preferredMarginSize
Layout.alignment
:
Qt
.
AlignHCenter
Layout.topMargin
:
JamiTheme
.
preferredMarginSize
Layout.bottomMargin
:
JamiTheme
.
preferredMarginSize
Layout.rightMargin
:
JamiTheme
.
preferredMarginSize
preferredWidth
:
itemWidth
/
widthDivisor
buttontextHeightMargin
:
JamiTheme
.
buttontextHeightMargin
preferredWidth
:
itemWidth
/
widthDivisor
buttontextHeightMargin
:
JamiTheme
.
buttontextHeightMargin
color
:
JamiTheme
.
buttonTintedBlack
hoveredColor
:
JamiTheme
.
buttonTintedBlackHovered
pressedColor
:
JamiTheme
.
buttonTintedBlackPressed
text
:
JamiStrings
.
logsViewReport
secondary
:
true
autoAccelerator
:
true
color
:
JamiTheme
.
buttonTintedBlack
hoveredColor
:
JamiTheme
.
buttonTintedBlackHovered
pressedColor
:
JamiTheme
.
buttonTintedBlackPressed
text
:
JamiStrings
.
logsViewReport
secondary
:
true
autoAccelerator
:
true
onClicked
:
Qt
.
openUrlExternally
(
"
https://jami.net/bugs-and-improvements/
"
)
}
onClicked
:
Qt
.
openUrlExternally
(
"
https://jami.net/bugs-and-improvements/
"
)
}
}
...
...
@@ -235,7 +222,7 @@ Window {
font.hintingPreference
:
Font
.
PreferNoHinting
readOnly
:
true
color
:
JamiTheme
.
black
Color
color
:
JamiTheme
.
text
Color
wrapMode
:
TextArea
.
Wrap
selectByMouse
:
true
...
...
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