lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

settings: add troubleshooting dialog

Browse source 
Add a dialog to get logs from daemon.

Gitlab: #406
Change-Id: I25dd7084165660e0a03c4694d0225bbcf0f1a9d6
This commit is contained in:
Trevor Tabah 2021-05-19 16:34:56 -04:00 • committed by Sébastien Blin
parent 4c767495c5
commit 3142776c32
9 changed files with 471 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qml.qrc
View file

@ -143,5 +143,7 @@
<file>src/commoncomponents/MaterialToolTip.qml</file>
<file>src/mainview/components/ParticipantCallInStatusDelegate.qml</file>
<file>src/mainview/components/ParticipantCallInStatusView.qml</file>
<file>src/settingsview/components/TroubleshootSettings.qml</file>
<file>src/settingsview/components/LogsView.qml</file>
</qresource>
</RCC>

17
src/constant/JamiStrings.qml
View file

@ -320,9 +320,26 @@ Item {
property string networkDisconnected: qsTr("Network disconnected")
property string genericError: qsTr("Something went wrong")
//Troubleshoot Settings
property string troubleshootTitle: qsTr("Troubleshoot")
property string troubleshootButton: qsTr("Open logs")
property string troubleshootText: qsTr("Get logs")
// Recording Settings
property string tipRecordFolder: qsTr("Select a record directory")
// View Logs
property string logsViewTitle: qsTr("Debug")
property string logsViewShowStats: qsTr("Show Stats")
property string logsViewStart: qsTr("Start")
property string logsViewStop: qsTr("Stop")
property string logsViewCopy: qsTr("Copy")
property string logsViewReport: qsTr("Report Bug")
property string logsViewClear: qsTr("Clear")
property string logsViewCancel: qsTr("Cancel")
property string logsViewCopied: qsTr("Copied to clipboard!")
property string logsViewDisplay: qsTr("Receive Logs")
// ImportFromBackupPage
property string archive: qsTr("Archive")
property string openFile: qsTr("Open file")

6
src/lrcinstance.cpp
View file

@ -463,3 +463,9 @@ LRCInstance::finish()
renderer_.reset();
lrc_.reset();
}
void
LRCInstance::monitor(bool continuous)
{
lrc_->monitor(continuous);
}

2
src/lrcinstance.h
View file

@ -120,6 +120,8 @@ public:
QString getContentDraft(const QString& convUid, const QString& accountId);
void setContentDraft(const QString& convUid, const QString& accountId, const QString& content);
void monitor(bool continous);
bool hasActiveCall(bool withVideo = false);
void pushlastConference(const QString& confId, const QString& callId);
QString poplastConference(const QString& confId);

14
src/settingsadapter.cpp
View file

@ -26,7 +26,13 @@ SettingsAdapter::SettingsAdapter(AppSettingsManager* settingsManager,
QObject* parent)
: QmlAdapterBase(instance, parent)
, settingsManager_(settingsManager)
{}
{
QObject::connect(&lrcInstance_->behaviorController(),
&lrc::api::BehaviorController::debugMessageReceived,
this,
&SettingsAdapter::debugMessageReceived,
Qt::ConnectionType::UniqueConnection);
}
QString
SettingsAdapter::getDir_Document()
@ -1100,3 +1106,9 @@ SettingsAdapter::isAllModeratorsEnabled(const QString& accountId)
{
return lrcInstance_->accountModel().isAllModerators(accountId);
}
void
SettingsAdapter::monitor(const bool& continuous)
{
lrcInstance_->monitor(continuous);
}

5
src/settingsadapter.h
View file

@ -228,6 +228,11 @@ public:
Q_INVOKABLE bool isLocalModeratorsEnabled(const QString& accountId);
Q_INVOKABLE bool isAllModeratorsEnabled(const QString& accountId);
Q_INVOKABLE void monitor(const bool& continuous);
Q_SIGNALS:
void debugMessageReceived(const QString& message);
private:
AppSettingsManager* settingsManager_;
};

11
src/settingsview/components/GeneralSettingsPage.qml
View file

@ -69,12 +69,23 @@ Rectangle {
// call recording setting panel
RecordingSettings {
Layout.fillWidth: true
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.rightMargin: JamiTheme.preferredMarginSize
itemWidth: preferredColumnWidth
}
// Trouble shooting setting panel
TroubleshootSettings {
Layout.fillWidth: true
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.rightMargin: JamiTheme.preferredMarginSize
Layout.bottomMargin: JamiTheme.preferredMarginSize
itemWidth: preferredColumnWidth
}
// update setting panel
UpdateSettings {
Layout.fillWidth: true

326
src/settingsview/components/LogsView.qml Normal file
View file

@ -0,0 +1,326 @@
/*
* Copyright (C) 2021 by Savoir-faire Linux
* Author: Trevor Tabah <trevor.tabah@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1
import QtQuick.Dialogs 1.2
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
import "../../commoncomponents"
Dialog {
id: root
property bool cancelPressed: false
property bool startedLogs: false
property bool isStopped: false
property int itemWidth: Math.min(root.width / 2 - 50, 350) * 1.5
property int widthDivisor: 4
property int selectBeginning
property int selectEnd
function findNthIndexInText(substring, n){
var i;
var t = logsText.text
var index = t.indexOf(substring)
for (i = 0; i < n - 1; i++){
index = t.indexOf(substring, index + 1)
}
return index
}
function monitor(continuous){
SettingsAdapter.monitor(continuous)
}
Connections{
target: SettingsAdapter
function onDebugMessageReceived(message){
var initialPosition = scroll.position
var oldContent = flickable.contentY
if (!root.cancelPressed){
logsText.append(message);
}
if (logsText.lineCount >= 10000){
var index = findNthIndexInText("\n", 10)
logsText.remove(0, index)
}
var approximateBottom = (1.0 - flickable.visibleArea.heightRatio);
if (!isStopped){
if (initialPosition < 0){
flickable.flick(0, -(100))
}
else if (initialPosition >= approximateBottom * .8){
flickable.contentY = flickable.contentHeight - flickable.height
flickable.flick(0, -(flickable.maximumFlickVelocity))
}
else{
flickable.contentY = oldContent
}
}
}
}
onVisibleChanged: {
logsText.clear()
copiedToolTip.close()
if (startStopToggle.checked){
startStopToggle.checked = false
startedLogs = false
}
root.cancelPressed = true
monitor(false)
}
title: JamiStrings.logsViewTitle
modality: Qt.NonModal
width: 800
height: 700
standardButtons: StandardButton.NoButton
ColumnLayout{
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.fillHeight: true
anchors.centerIn: parent
height: root.height
width: root.width
Rectangle{
id: buttonRectangleBackground
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
color: JamiTheme.backgroundColor
border.color: color
border.width: 0
height: JamiTheme.preferredFieldHeight*2
RowLayout{
id: buttons
Layout.alignment: Qt.AlignTop| Qt.AlignHCenter
anchors.centerIn: parent
ToggleSwitch {
id: startStopToggle
Layout.fillWidth: true
Layout.leftMargin: JamiTheme.preferredMarginSize
Layout.rightMargin: JamiTheme.preferredMarginSize
checked: false
labelText: JamiStrings.logsViewDisplay
fontPointSize: JamiTheme.settingsFontSize
onSwitchToggled: {
startedLogs = !startedLogs
if (startedLogs){
isStopped = false
root.cancelPressed = false
monitor(true)
}
else{
isStopped = true
root.cancelPressed = true
monitor(false)
}
}
}
MaterialButton{
id: showStatsButton
Layout.preferredHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: itemWidth/widthDivisor
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.bottomMargin: JamiTheme.preferredMarginSize
Layout.alignment: Qt.AlignHCenter
text: JamiStrings.logsViewShowStats
color: startedLogs ? JamiTheme.buttonTintedGreyInactive : JamiTheme.buttonTintedBlack
hoveredColor: startedLogs ? JamiTheme.buttonTintedGreyInactive : JamiTheme.buttonTintedBlackHovered
pressedColor: startedLogs ? JamiTheme.buttonTintedGreyInactive : JamiTheme.buttonTintedBlackPressed
outlined: true
onClicked:{
if (!startedLogs){
root.cancelPressed = false
monitor(false)
}
}
}
MaterialButton{
id: clearButton
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: itemWidth / widthDivisor
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.bottomMargin: JamiTheme.preferredMarginSize
outlined: true
color: JamiTheme.buttonTintedBlack
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
text: JamiStrings.logsViewClear
onClicked: {
logsText.clear()
startedLogs = false
startStopToggle.checked = false
root.cancelPressed = true
monitor(false)
}
}
MaterialButton{
id: copyButton
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: itemWidth/widthDivisor
color: JamiTheme.buttonTintedBlack
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
outlined: true
text: JamiStrings.logsViewCopy
onClicked:{
logsText.selectAll()
logsText.copy()
logsText.deselect()
copiedToolTip.open()
}
ToolTip {
id: copiedToolTip
height: JamiTheme.preferredFieldHeight
TextArea{
text: JamiStrings.logsViewCopied
color: JamiTheme.textColor
}
background: Rectangle{
color: JamiTheme.primaryBackgroundColor
}
}
}
MaterialButton{
id: reportButton
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: itemWidth/widthDivisor
Layout.preferredHeight: JamiTheme.preferredFieldHeight
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.bottomMargin: JamiTheme.preferredMarginSize
Layout.rightMargin: JamiTheme.preferredMarginSize
color: JamiTheme.buttonTintedBlack
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
text: JamiStrings.logsViewReport
outlined: true
onClicked: Qt.openUrlExternally("https://jami.net/bugs-and-improvements/")
}
}
}
Rectangle{
id: flickableRectangleBackground
property alias text: logsText.text
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.fillHeight: true
color: JamiTheme.primaryBackgroundColor
border.color: color
border.width: 6
height: root.height - buttonRectangleBackground.height
Flickable {
id: flickable
Layout.fillWidth: true
Layout.fillHeight: true
anchors.fill: flickableRectangleBackground
boundsBehavior: Flickable.StopAtBounds
TextArea.flickable: TextArea {
id: logsText
readOnly: true
text: ""
color: JamiTheme.textColor
wrapMode: TextArea.Wrap
selectByMouse: true
MouseArea{
anchors.fill: logsText
acceptedButtons: Qt.RightButton
hoverEnabled: true
onClicked:{
selectBeginning = logsText.selectionStart
selectEnd = logsText.selectionEnd
rightClickMenu.open()
logsText.select(selectBeginning, selectEnd)
}
Menu{
id: rightClickMenu
MenuItem{
text: JamiStrings.logsViewCopy
onTriggered:{
logsText.copy()
}
}
}
}
}
ScrollBar.vertical: ScrollBar {
id: scroll
}
}
}
}
}

89
src/settingsview/components/TroubleshootSettings.qml Normal file
View file

@ -0,0 +1,89 @@
/*
* Copyright (C) 2021 by Savoir-faire Linux
* Author: Trevor Tabah <trevor.tabah@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import net.jami.Constants 1.0
import "../../commoncomponents"
ColumnLayout{
id:root
property int itemWidth
LogsView{
id: logsView
}
Label{
Layout.fillWidth: true
text: JamiStrings.troubleshootTitle
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
}
RowLayout{
Text{
Layout.fillWidth: true
Layout.preferredHeight: 30
Layout.rightMargin: JamiTheme.preferredMarginSize
text: JamiStrings.troubleshootText
font.pointSize: JamiTheme.settingsFontSize
font.kerning: true
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
}
MaterialButton {
id: enableTroubleshootingButton
Layout.alignment: Qt.AlignRight
Layout.preferredHeight: JamiTheme.preferredFieldHeight
Layout.preferredWidth: itemWidth/1.5
color: JamiTheme.buttonTintedBlack
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
outlined: true
text: JamiStrings.troubleshootButton
onClicked: {
logsView.open()
}
}
}
}