mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-04-24 23:18:34 +00:00
4532e278ac
- Split content type to be filtered by proxy lists. - Add a message in notification when receiving a conference invitation. - Change chat bubbles colors to match mobile application. - Change date display on messages to remove sections. It allows to be more coherent when sorting messages. - Change Chat Layout : outgoing messages to right, incoming messages to left. - Change bubble design to be squared when grouped. - Group messages on 1 second away from previous (and same sender). - Add a background color with radius to files in reply messages. - Make color corners on reply. - Fix filename to 2 lines in file download icon. - Add a background color on conference invitations. - Change conference title from bold to normal on invitations. - Rework chat message content layout to be used with grids and lists : files are now displayed in grid. - Remove cyclic dependencies with reply design (which was recursivly linked with ChatContent). - Fix center layouts that were not bind to the correct one. - Align pictures to center. - Fix hidden admin usernames in participant view.
128 lines
No EOL
4.4 KiB
C++
128 lines
No EOL
4.4 KiB
C++
/*
|
|
* Copyright (c) 2021 Belledonne Communications SARL.
|
|
*
|
|
* This file is part of linphone-desktop
|
|
* (see https://www.linphone.org).
|
|
*
|
|
* 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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <QQmlApplicationEngine>
|
|
|
|
#include "app/App.hpp"
|
|
|
|
#include "ContentProxyModel.hpp"
|
|
#include "utils/Utils.hpp"
|
|
|
|
#include "components/Components.hpp"
|
|
#include "components/chat/ChatModel.hpp"
|
|
#include "components/chat-events/ChatMessageModel.hpp"
|
|
#include "ContentListModel.hpp"
|
|
|
|
// =============================================================================
|
|
|
|
ContentProxyModel::ContentProxyModel (QObject * parent) : QSortFilterProxyModel(parent){
|
|
setContentListModel(CoreManager::getInstance()->getChatModel()->getContentListModel().get());
|
|
}
|
|
|
|
ChatMessageModel * ContentProxyModel::getChatMessageModel() const{
|
|
return nullptr;
|
|
}
|
|
|
|
void ContentProxyModel::setChatMessageModel(ChatMessageModel * message){
|
|
if(message){
|
|
setSourceModel(message->getContents().get());
|
|
sort(0);
|
|
}
|
|
emit chatMessageModelChanged();
|
|
}
|
|
|
|
void ContentProxyModel::setContentListModel(ContentListModel * model){
|
|
setSourceModel(model);
|
|
sort(0);
|
|
emit chatMessageModelChanged();
|
|
}
|
|
|
|
void ContentProxyModel::addFile(const QString& path){
|
|
ContentListModel* model = qobject_cast<ContentListModel*>(sourceModel());
|
|
model->addFile( QUrl::fromPercentEncoding(path.toUtf8()));
|
|
}
|
|
|
|
bool ContentProxyModel::filterAcceptsRow (
|
|
int sourceRow,
|
|
const QModelIndex &sourceParent
|
|
) const {
|
|
|
|
bool show = false;
|
|
|
|
if (mFilter == FilterContentType::All)
|
|
show = true;
|
|
else{
|
|
QModelIndex index = sourceModel()->index(sourceRow, 0, QModelIndex());
|
|
auto contentModel = sourceModel()->data(index).value<ContentModel*>();
|
|
|
|
if( mFilter == FilterContentType::Text && contentModel->isText())
|
|
show = true;
|
|
else if( mFilter == FilterContentType::Voice && contentModel->isVoiceRecording())
|
|
show = true;
|
|
else if( mFilter == FilterContentType::Conference && contentModel->getConferenceInfoModel())
|
|
show = true;
|
|
else if( mFilter == FilterContentType::File && !contentModel->isIcalendar() && (contentModel->isFile() || contentModel->isFileTransfer()|| contentModel->isFileEncrypted()) && !contentModel->isVoiceRecording() )
|
|
show = true;
|
|
}
|
|
return show;
|
|
}
|
|
|
|
bool ContentProxyModel::lessThan (const QModelIndex &left, const QModelIndex &right) const {
|
|
const ContentModel *contentA = sourceModel()->data(left).value<ContentModel *>();
|
|
const ContentModel *contentB = sourceModel()->data(right).value<ContentModel *>();
|
|
bool aIsForward = contentA->getChatMessageModel() && contentA->getChatMessageModel()->isForward();
|
|
bool aIsReply = contentA->getChatMessageModel() && contentA->getChatMessageModel()->isReply();
|
|
bool aIsVoiceRecording = contentA->isVoiceRecording();
|
|
bool aIsFile = contentA->isFile() || contentA->isFileEncrypted() || contentA->isFileTransfer();
|
|
bool aIsText = contentA->isText() ;
|
|
bool bIsForward = contentB->getChatMessageModel() && contentB->getChatMessageModel()->isForward();
|
|
bool bIsReply = contentB->getChatMessageModel() && contentB->getChatMessageModel()->isReply();
|
|
bool bIsVoiceRecording = contentB->isVoiceRecording();
|
|
bool bIsFile = contentB->isFile() || contentB->isFileEncrypted() || contentB->isFileTransfer();
|
|
bool bIsText = contentB->isText() ;
|
|
|
|
return !bIsForward && (aIsForward
|
|
|| !bIsReply && (aIsReply
|
|
|| !bIsVoiceRecording && (aIsVoiceRecording
|
|
|| !bIsFile && (aIsFile
|
|
|| aIsText && !bIsText
|
|
)
|
|
)
|
|
)
|
|
);
|
|
}
|
|
void ContentProxyModel::remove(ContentModel * model){
|
|
qobject_cast<ContentListModel*>(sourceModel())->remove(model);
|
|
}
|
|
|
|
void ContentProxyModel::clear(){
|
|
qobject_cast<ContentListModel*>(sourceModel())->clear();
|
|
}
|
|
|
|
ContentProxyModel::FilterContentType ContentProxyModel::getFilter() const{
|
|
return mFilter;
|
|
}
|
|
void ContentProxyModel::setFilter(const FilterContentType& contentType){
|
|
if(contentType != mFilter){
|
|
mFilter = contentType;
|
|
emit filterChanged();
|
|
invalidate();
|
|
}
|
|
} |