From 144fcf7d44f01e71fb9817b2c96bd4e2e511ce12 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 20 Feb 2020 10:28:29 +0100 Subject: [PATCH] - Update About to GPLv3 - Add temporary Flip on preview - Add Application vendor name in configurations --- src/app/main.cpp | 2 -- src/config.h.cmake | 1 + ui/views/App/Calls/Incall.qml | 6 +++--- ui/views/App/Main/Dialogs/About.qml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index f5e277863..12f8b8866 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -23,8 +23,6 @@ // ============================================================================= int main (int argc, char *argv[]) { - QApplication::setOrganizationName("Belledonne-Communications"); - QApplication::setOrganizationDomain("linphone.org"); AppController controller(argc, argv); //QLoggingCategory::setFilterRules("*.debug=true;qml=false"); App *app = controller.getApp(); diff --git a/src/config.h.cmake b/src/config.h.cmake index 02462415f..5d0a5dcf2 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -23,6 +23,7 @@ #cmakedefine APPLICATION_DESCRIPTION "${APPLICATION_DESCRIPTION}" #cmakedefine APPLICATION_ID "${APPLICATION_ID}" #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" +#cmakedefine APPLICATION_VENDOR "${APPLICATION_VENDOR}" #cmakedefine ENABLE_UPDATE_CHECK 1 #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" diff --git a/ui/views/App/Calls/Incall.qml b/ui/views/App/Calls/Incall.qml index e48dfb5e4..b54b0a084 100644 --- a/ui/views/App/Calls/Incall.qml +++ b/ui/views/App/Calls/Incall.qml @@ -381,9 +381,9 @@ Rectangle { height: CallStyle.actionArea.userVideo.height width: CallStyle.actionArea.userVideo.width // Function to use if we want to manually Flip horizontally the preview without MSOGL -// transform: Matrix4x4 { -// matrix: Qt.matrix4x4(-1, 0, 0, CallStyle.actionArea.userVideo.width, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1) -// } + transform: Matrix4x4 { + matrix: Qt.matrix4x4(-1, 0, 0, CallStyle.actionArea.userVideo.width, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1) + } active: incall.width >= CallStyle.actionArea.lowWidth && incall.call.videoEnabled && !_fullscreen sourceComponent: cameraPreview diff --git a/ui/views/App/Main/Dialogs/About.qml b/ui/views/App/Main/Dialogs/About.qml index 24bea58b1..af3709b29 100644 --- a/ui/views/App/Main/Dialogs/About.qml +++ b/ui/views/App/Main/Dialogs/About.qml @@ -104,7 +104,7 @@ DialogPlus { elide: Text.ElideRight font.pointSize: AboutStyle.copyrightBlock.license.pointSize - text: 'GNU General Public License V2\n\u00A9 2010-' + + text: 'GNU General Public License V3\n\u00A9 2010-' + (new Date().toLocaleDateString(Qt.locale(), 'yyyy')) + ' Belledonne Communications'