mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-04-21 21:52:03 +02:00
misc remove the changelog
Gitlab: #155 Change-Id: I207190da48d0ab7bf94645a097a8078dd08a4566
This commit is contained in:
parent
f47ae0fa62
commit
c451195536
11 changed files with 2 additions and 166 deletions
14
changelog.md
14
changelog.md
|
@ -1,14 +0,0 @@
|
||||||
::: {style="margin:1.5em;"}
|
|
||||||
2020-10-09 {#section style="font-size:2.25em;"}
|
|
||||||
==========
|
|
||||||
|
|
||||||
New Features {#new-features style="font-size:2.0em;"}
|
|
||||||
------------
|
|
||||||
::: {style="font-size:1.5em"}
|
|
||||||
- Rendezvous points: easily create meeting points
|
|
||||||
- Control conference layout and see participant names
|
|
||||||
- New and improved user interface
|
|
||||||
- Better support for screen scaling (high DPI)
|
|
||||||
:::
|
|
||||||
------------
|
|
||||||
:::
|
|
1
qml.qrc
1
qml.qrc
|
@ -93,7 +93,6 @@
|
||||||
<file>src/mainview/components/VideoCallPage.qml</file>
|
<file>src/mainview/components/VideoCallPage.qml</file>
|
||||||
<file>src/mainview/components/CallAdvancedOptions.qml</file>
|
<file>src/mainview/components/CallAdvancedOptions.qml</file>
|
||||||
<file>src/mainview/components/ParticipantOverlay.qml</file>
|
<file>src/mainview/components/ParticipantOverlay.qml</file>
|
||||||
<file>src/mainview/components/ChangeLogScrollView.qml</file>
|
|
||||||
<file>src/mainview/components/ProjectCreditsScrollView.qml</file>
|
<file>src/mainview/components/ProjectCreditsScrollView.qml</file>
|
||||||
<file>src/mainview/components/AccountComboBoxPopup.qml</file>
|
<file>src/mainview/components/AccountComboBoxPopup.qml</file>
|
||||||
<file>src/mainview/components/ConversationSmartListViewItemDelegate.qml</file>
|
<file>src/mainview/components/ConversationSmartListViewItemDelegate.qml</file>
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
<file>images/icons/baseline-close-24px.svg</file>
|
<file>images/icons/baseline-close-24px.svg</file>
|
||||||
<file>images/icons/baseline-done-24px.svg</file>
|
<file>images/icons/baseline-done-24px.svg</file>
|
||||||
<file>images/icons/baseline-error_outline-24px.svg</file>
|
<file>images/icons/baseline-error_outline-24px.svg</file>
|
||||||
<file>changelog.html</file>
|
|
||||||
<file>projectcredits.html</file>
|
<file>projectcredits.html</file>
|
||||||
<file>images/ajax-loader.gif</file>
|
<file>images/ajax-loader.gif</file>
|
||||||
<file>images/default_avatar_overlay.svg</file>
|
<file>images/default_avatar_overlay.svg</file>
|
||||||
|
|
|
@ -36,7 +36,6 @@ Item {
|
||||||
property string companyDeclarationYear: "© 2015-2020 Savoir-faire Linux Inc."
|
property string companyDeclarationYear: "© 2015-2020 Savoir-faire Linux Inc."
|
||||||
property string slogan: "Together"
|
property string slogan: "Together"
|
||||||
property string declaration: qsTr("Jami is a free software for universal communication which respects the freedom and privacy of its users.")
|
property string declaration: qsTr("Jami is a free software for universal communication which respects the freedom and privacy of its users.")
|
||||||
property string changelog: qsTr("Changelog")
|
|
||||||
property string credits: qsTr("Credits")
|
property string credits: qsTr("Credits")
|
||||||
|
|
||||||
// AccountComboBox
|
// AccountComboBox
|
||||||
|
|
|
@ -30,18 +30,6 @@ ModalPopup {
|
||||||
|
|
||||||
property alias preferredHeight: aboutPopUpContentRectColumnLayout.implicitHeight
|
property alias preferredHeight: aboutPopUpContentRectColumnLayout.implicitHeight
|
||||||
|
|
||||||
ProjectCreditsScrollView {
|
|
||||||
id: projectCreditsScrollView
|
|
||||||
|
|
||||||
visible: false
|
|
||||||
}
|
|
||||||
|
|
||||||
ChangeLogScrollView {
|
|
||||||
id: changeLogScrollView
|
|
||||||
|
|
||||||
visible: false
|
|
||||||
}
|
|
||||||
|
|
||||||
contentItem: Rectangle {
|
contentItem: Rectangle {
|
||||||
id: contentRect
|
id: contentRect
|
||||||
|
|
||||||
|
@ -230,69 +218,13 @@ ModalPopup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
ProjectCreditsScrollView {
|
||||||
id: buttonGroupChangeLogAndCredits
|
id: projectCreditsScrollView
|
||||||
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
Layout.preferredWidth: contentRect.width
|
|
||||||
Layout.preferredHeight: 32
|
|
||||||
|
|
||||||
RowLayout {
|
|
||||||
id: buttonGroupChangeLogAndCreditsRowLayout
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
MaterialButton {
|
|
||||||
id: changeLogButton
|
|
||||||
text: JamiStrings.changelog
|
|
||||||
color: projectCreditsScrollView.visible? JamiTheme.buttonTintedGreyInactive :
|
|
||||||
JamiTheme.buttonTintedGrey
|
|
||||||
hoveredColor: JamiTheme.buttonTintedGreyHovered
|
|
||||||
pressedColor: JamiTheme.buttonTintedGreyPressed
|
|
||||||
|
|
||||||
Layout.alignment: Qt.AlignHCenter
|
|
||||||
Layout.preferredWidth: JamiTheme.preferredFieldWidth / 2
|
|
||||||
Layout.preferredHeight: JamiTheme.preferredFieldHeight
|
|
||||||
|
|
||||||
onClicked: {
|
|
||||||
if (changeLogOrCreditsStack.depth > 1) {
|
|
||||||
changeLogOrCreditsStack.pop()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MaterialButton {
|
|
||||||
id: creditsButton
|
|
||||||
text: JamiStrings.credits
|
|
||||||
color: projectCreditsScrollView.visible? JamiTheme.buttonTintedGrey :
|
|
||||||
JamiTheme.buttonTintedGreyInactive
|
|
||||||
hoveredColor: JamiTheme.buttonTintedGreyHovered
|
|
||||||
pressedColor: JamiTheme.buttonTintedGreyPressed
|
|
||||||
Layout.alignment: Qt.AlignHCenter
|
|
||||||
Layout.preferredWidth: JamiTheme.preferredFieldWidth / 2
|
|
||||||
Layout.preferredHeight: JamiTheme.preferredFieldHeight
|
|
||||||
|
|
||||||
onClicked: {
|
|
||||||
if (changeLogOrCreditsStack.depth == 1) {
|
|
||||||
changeLogOrCreditsStack.push(
|
|
||||||
projectCreditsScrollView)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StackView {
|
|
||||||
id: changeLogOrCreditsStack
|
|
||||||
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
Layout.alignment: Qt.AlignCenter
|
||||||
Layout.preferredWidth: contentRect.width - JamiTheme.preferredMarginSize * 2
|
Layout.preferredWidth: contentRect.width - JamiTheme.preferredMarginSize * 2
|
||||||
Layout.preferredHeight: 128
|
Layout.preferredHeight: 128
|
||||||
Layout.margins: JamiTheme.preferredMarginSize
|
Layout.margins: JamiTheme.preferredMarginSize
|
||||||
|
|
||||||
initialItem: changeLogScrollView
|
|
||||||
|
|
||||||
clip: true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MaterialButton {
|
MaterialButton {
|
||||||
|
|
|
@ -1,52 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2020 by Savoir-faire Linux
|
|
||||||
* Author: Mingrui Zhang <mingrui.zhang@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 net.jami.Models 1.0
|
|
||||||
import net.jami.Adapters 1.0
|
|
||||||
|
|
||||||
ScrollView {
|
|
||||||
id: changeLogScrollView
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
clip: true
|
|
||||||
|
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
|
||||||
|
|
||||||
TextEdit {
|
|
||||||
id: changeLogTextArea
|
|
||||||
|
|
||||||
width: changeLogScrollView.width
|
|
||||||
|
|
||||||
readOnly: true
|
|
||||||
wrapMode: Text.WordWrap
|
|
||||||
|
|
||||||
font.pointSize: JamiTheme.textFontSize + 1
|
|
||||||
text: UtilsAdapter.getChangeLog()
|
|
||||||
textFormat: TextEdit.RichText
|
|
||||||
}
|
|
||||||
|
|
||||||
background: Rectangle {
|
|
||||||
id: changeLogScrollViewBackground
|
|
||||||
|
|
||||||
radius: 5
|
|
||||||
border.color: JamiTheme.tabbarBorderColor
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -24,8 +24,6 @@ import net.jami.Adapters 1.0
|
||||||
ScrollView {
|
ScrollView {
|
||||||
id: projectCreditsScrollView
|
id: projectCreditsScrollView
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||||
|
|
|
@ -377,23 +377,6 @@ Utils::forceDeleteAsync(const QString& path)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
|
||||||
Utils::getChangeLog()
|
|
||||||
{
|
|
||||||
QString logs;
|
|
||||||
QFile changeLogFile(":/changelog.html");
|
|
||||||
if (!changeLogFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
|
||||||
qDebug().noquote() << " Change log file failed to load";
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
QTextStream in(&changeLogFile);
|
|
||||||
in.setCodec("UTF-8");
|
|
||||||
while (!in.atEnd()) {
|
|
||||||
logs += in.readLine();
|
|
||||||
}
|
|
||||||
return logs;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString
|
QString
|
||||||
Utils::getProjectCredits()
|
Utils::getProjectCredits()
|
||||||
{
|
{
|
||||||
|
|
|
@ -73,7 +73,6 @@ void showNotification(const QString& message,
|
||||||
std::function<void()> const& onClicked);
|
std::function<void()> const& onClicked);
|
||||||
QSize getRealSize(QScreen* screen);
|
QSize getRealSize(QScreen* screen);
|
||||||
void forceDeleteAsync(const QString& path);
|
void forceDeleteAsync(const QString& path);
|
||||||
QString getChangeLog();
|
|
||||||
QString getProjectCredits();
|
QString getProjectCredits();
|
||||||
void removeOldVersions();
|
void removeOldVersions();
|
||||||
|
|
||||||
|
|
|
@ -35,12 +35,6 @@ UtilsAdapter::UtilsAdapter(QObject* parent)
|
||||||
, clipboard_(QApplication::clipboard())
|
, clipboard_(QApplication::clipboard())
|
||||||
{}
|
{}
|
||||||
|
|
||||||
const QString
|
|
||||||
UtilsAdapter::getChangeLog()
|
|
||||||
{
|
|
||||||
return Utils::getChangeLog();
|
|
||||||
}
|
|
||||||
|
|
||||||
const QString
|
const QString
|
||||||
UtilsAdapter::getProjectCredits()
|
UtilsAdapter::getProjectCredits()
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,7 +34,6 @@ public:
|
||||||
explicit UtilsAdapter(QObject* parent = nullptr);
|
explicit UtilsAdapter(QObject* parent = nullptr);
|
||||||
~UtilsAdapter() = default;
|
~UtilsAdapter() = default;
|
||||||
|
|
||||||
Q_INVOKABLE const QString getChangeLog();
|
|
||||||
Q_INVOKABLE const QString getProjectCredits();
|
Q_INVOKABLE const QString getProjectCredits();
|
||||||
Q_INVOKABLE const QString getVersionStr();
|
Q_INVOKABLE const QString getVersionStr();
|
||||||
Q_INVOKABLE void setText(QString text);
|
Q_INVOKABLE void setText(QString text);
|
||||||
|
|
Loading…
Add table
Reference in a new issue